Changeset 20377


Ignore:
Timestamp:
2011/02/24 15:36:04 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20376
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
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:

ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110224063541-fs1w4lyp7v2afy5b
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 ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
data/Smarty/templates/default/mypage/history.tpl ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
data/Smarty/templates/default/shopping/payment.tpl ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110224063401-l9wisvwliwwyg3o9
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:
5 edited

Legend:

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

    r20340 r20377  
    3636                    <!--{if !$tpl_disable_logout}--> 
    3737                <p class="btn"> 
    38                     <a href="?" onclick="fnFormModeSubmit('login_form', 'logout', '', ''); return false;"><img src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_logout.jpg" alt="ログアウト" /></a> 
     38                    <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="ログアウト" /> 
    3939                </p> 
    4040                    <!--{/if}--> 
  • branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl

    r20340 r20377  
    4040                <!--{/if}--> 
    4141            </p> 
    42             <p class="btn"> 
    43                 <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> 
    44             </p> 
     42            <form action="order.php" method="post"> 
     43              <p class="btn"> 
     44                <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->"> 
     45                <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="この購入内容で再注文する" /> 
     46              </p> 
     47            </form> 
    4548        </div> 
    46  
    47 <!--        <form action="order.php" method="post"> 
    48             <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id}-->"> 
    49             <input type="submit" name="submit" value="この購入内容で再注文する"> 
    50         </form> 
    51 --> 
    5249 
    5350        <table summary="購入商品詳細"> 
  • branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl

    r20340 r20377  
    3434            data.mode = 'select_deliv'; 
    3535            data.deliv_id = $(this).val(); 
     36            data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->'; 
    3637            $.ajax({ 
    3738                type : 'POST', 
  • branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl

    r20116 r20377  
    3434            data.mode = 'select_deliv'; 
    3535            data.deliv_id = $(this).val(); 
     36            data['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = '<!--{$transactionid}-->'; 
    3637            $.ajax({ 
    3738                type : 'POST', 
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r20344 r20377  
    225225    function destroy() { 
    226226        parent::destroy(); 
     227    } 
     228 
     229    /** 
     230     * トランザクショントークンを unset しないようオーバーライド. 
     231     * 
     232     * @return void 
     233     */ 
     234    function doValidToken() { 
     235        if ($_SERVER["REQUEST_METHOD"] == "POST") { 
     236            if (!SC_Helper_Session_Ex::isValidToken(false)) { 
     237                SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR); 
     238            } 
     239        } 
    227240    } 
    228241 
Note: See TracChangeset for help on using the changeset viewer.