Changeset 20377

Timestamp:

2011/02/24 15:36:04 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20376

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/default/frontparts/bloc/login.tpl 19795@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Ffrontparts%2Fbloc%2Flogin.tpl
data/Smarty/templates/default/mypage/history.tpl 15743@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmypage%2Fhistory.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3105

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/frontparts/bloc/login.tpl [email protected]
data/Smarty/templates/default/mypage/history.tpl [email protected]
data/Smarty/templates/default/shopping/payment.tpl [email protected]
data/Smarty/templates/sphone/shopping/payment.tpl [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-02-24 15:35:41.367000103 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-24T06:35:41.367000Z

Message:

#1049 ([フロント]商品購入（お支払方法指定）：配送業者が複数ある場合の不具合)

• トランザクショントークンを unset しないよう修正
• ajax 通信時にもトランザクショントークンを送信するよう修正

#1032(フロントデザインリニューアル)

• 再注文, ログアウトボタンを修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/default/frontparts/bloc/login.tpl (modified) (1 diff)
• Smarty/templates/default/mypage/history.tpl (modified) (1 diff)
• Smarty/templates/default/shopping/payment.tpl (modified) (1 diff)
• Smarty/templates/sphone/shopping/payment.tpl (modified) (1 diff)
• class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl

@@ -36 +36 @@
                     <!--{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}-->

branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl

@@ -40 +40 @@
                 <!--{/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="購入商品詳細">

branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl

@@ -34 +34 @@
             data.mode = 'select_deliv';
             data.deliv_id = $(this).val();
+            data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->';
             $.ajax({
                 type : 'POST',

branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl

@@ -34 +34 @@
             data.mode = 'select_deliv';
             data.deliv_id = $(this).val();
+            data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->';
             $.ajax({
                 type : 'POST',

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -225 +225 @@
     function destroy() {
         parent::destroy();
+    }
+
+    /**
+     * トランザクショントークンを unset しないようオーバーライド.
+     *
+     * @return void
+     */
+    function doValidToken() {
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+            if (!SC_Helper_Session_Ex::isValidToken(false)) {
+                SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR);
+            }
+        }
     }