Changeset 18529


Ignore:
Timestamp:
2010/02/02 11:40:45 (12 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100202021931-o2x576wi07m5hvk6
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

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/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:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100202024041-986jxcpp6l2zrxje
bzr:revno:
1899
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/Smarty/templates/default/shopping/payment.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
data/class/pages/shopping/LC_Page_Shopping_Payment.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
bzr:timestamp:
2010-02-02 11:40:41.948999882 +0900
bzr:user-agent:
bzr2.0.4+bzr-svn1.0.1
svn:original-date:
2010-02-02T02:40:41.949000Z
Message:

merged r18481

  • お支払い方法選択画面で、お支払いに画像を登録した場合レイアウトが崩れるバグ(#503)
Location:
branches/version-2_4/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/Smarty/templates/default/shopping/payment.tpl

    r18521 r18529  
    4343          <tr> 
    4444            <th>選択</th> 
    45             <th colspan="<!--{if $img_show == false}-->2<!--{else}-->3<!--{/if}-->">お支払方法</th> 
     45            <th colspan="<!--{if $tpl_img_show == false}-->1<!--{else}-->2<!--{/if}-->">お支払方法</th> 
    4646          </tr> 
    4747          <!--{section name=cnt loop=$arrPayment}--> 
     
    5252              <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|escape}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label> 
    5353            </td> 
     54            <td> 
    5455            <!--{if $arrPayment[cnt].payment_image != ""}--> 
    55                 <td> 
    56                     <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrPayment[cnt].payment_image}-->" /> 
    57                 </td> 
    58             <!--{elseif $img_show == true}--> 
    59                 <td></td> 
     56              <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrPayment[cnt].payment_image}-->" /> 
    6057            <!--{/if}--> 
     58            </td> 
    6159          </tr> 
    6260          <!--{/section}--> 
  • branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r18521 r18529  
    162162        // 支払い方法の取得 
    163163        $this->arrPayment = $this->lfGetPayment($total_pretax); 
    164         // 支払い方法の画像があるなしを取得($img_show true:ある false:なし) 
    165         $this->img_show = $this->lfGetImgShow($this->arrPayment); 
     164        // 支払い方法の画像があるなしを取得($tpl_img_show true:ある false:なし) 
     165        $this->tpl_img_show = $this->lfGetImgShow($this->arrPayment); 
    166166        // お届け時間の取得 
    167167        $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id')); 
Note: See TracChangeset for help on using the changeset viewer.