[Svn-src-all:1485] [version-2_5-dev 20377] #1049 ([フロント]商品購入（お支払方法指定）：配送業者が複数ある場合の不具合)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 24日 (木) 15:36:04 JST
Subversion committed to /home/svn/open 20377
http://svn.ec-cube.net/open_trac/changeset/20377
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-24 15:36:04 +0900 (木, 24 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1049 ([フロント]商品購入（お支払方法指定）：配送業者が複数ある場合の不具合)
* トランザクショントークンを unset しないよう修正
* ajax 通信時にもトランザクショントークンを送信するよう修正
#1032(フロントデザインリニューアル)
* 再注文, ログアウトボタンを修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
U branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl 2011-02-24 05:34:07 UTC (rev 20376)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl 2011-02-24 06:36:04 UTC (rev 20377)
@@ -35,7 +35,7 @@
</p>
<!--{if !$tpl_disable_logout}-->
<p class="btn">
- <a href="?" onclick="fnFormModeSubmit('login_form', 'logout', '', ''); return false;"><img src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_logout.jpg" alt="ログアウト" /></a>
+ <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_logout_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_logout.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_logout.jpg" onclick="fnFormModeSubmit('login_form', 'logout', '', ''); return false;" alt="ログアウト" />
</p>
<!--{/if}-->
<!--{else}-->
変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl 2011-02-24 05:34:07 UTC (rev 20376)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl 2011-02-24 06:36:04 UTC (rev 20377)
@@ -39,17 +39,14 @@
<span class="st">お届け日： </span><!--{$tpl_arrOrderData.deliv_date|h}-->
<!--{/if}-->
</p>
- <p class="btn">
- <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg','order_id');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg','order_id');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="この購入内容で再注文する" name="order_id" id="order_id" /></a>
- </p>
+ <form action="order.php" method="post">
+ <p class="btn">
+ <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->">
+ <input type="image" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg', this);" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg', this);" src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="この購入内容で再注文する" name="submit" value="この購入内容で再注文する" />
+ </p>
+ </form>
</div>
-<!-- <form action="order.php" method="post">
- <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id}-->">
- <input type="submit" name="submit" value="この購入内容で再注文する">
- </form>
--->
-
<table summary="購入商品詳細">
<colgroup width="15%"></colgroup>
<colgroup width="25%"></colgroup>
変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl 2011-02-24 05:34:07 UTC (rev 20376)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl 2011-02-24 06:36:04 UTC (rev 20377)
@@ -33,6 +33,7 @@
var data = {};
data.mode = 'select_deliv';
data.deliv_id = $(this).val();
+ data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->';
$.ajax({
type : 'POST',
url : location.pathname,
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2011-02-24 05:34:07 UTC (rev 20376)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2011-02-24 06:36:04 UTC (rev 20377)
@@ -33,6 +33,7 @@
var data = {};
data.mode = 'select_deliv';
data.deliv_id = $(this).val();
+ data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->';
$.ajax({
type : 'POST',
url : location.pathname,
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-24 05:34:07 UTC (rev 20376)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-24 06:36:04 UTC (rev 20377)
@@ -227,6 +227,19 @@
}
/**
+ * トランザクショントークンを unset しないようオーバーライド.
+ *
+ * @return void
+ */
+ function doValidToken() {
+ if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ if (!SC_Helper_Session_Ex::isValidToken(false)) {
+ SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR);
+ }
+ }
+ }
+
+ /**
* パラメータの初期化を行い, 初期値を設定する.
*
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
Svn-src-all メーリングリストの案内