Changeset 18548 for branches/version-2_4/data/class

Timestamp:

2010/02/04 12:36:33 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

bzr:revno:

1909

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/Smarty/templates/default/shopping/payment.tpl [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2010-02-04 12:36:29.642999887 +0900

bzr:user-agent:

bzr2.0.4+bzr-svn1.0.1

svn:original-date:

2010-02-04T03:36:29.643000Z

Message:

merged r18547

• お支払い方法選択画面で、お支払いに画像を登録した場合レイアウトが崩れるバグ(#503)
  • comu-ver2 の内容に合わせて修正

File:

• branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

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

@@ -162 +162 @@
         // 支払い方法の取得
         $this->arrPayment = $this->lfGetPayment($total_pretax);
-        // 支払い方法の画像があるなしを取得（$tpl_img_show true:ある false:なし）
-        $this->tpl_img_show = $this->lfGetImgShow($this->arrPayment);
+        // 支払い方法の画像があるなしを取得（$img_show true:ある false:なし）
+        $this->img_show = $this->lfGetImgShow($this->arrPayment);
         // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));