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

Timestamp:

2011/03/15 20:58:58 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110315105126-vmzyt0zzleo4o32t

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/Smarty/templates/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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-20110315115537-3ed83ki0om9cx9u1

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110315115854-q35ywgm2xkdhufev

bzr:revno:

3375

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/mobile/shopping/payment.tpl ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1

bzr:timestamp:

2011-03-15 20:58:54.572000027 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-15T11:58:54.572000Z

Message:

#1141 (複数お届け先がある場合に、お届け日・お届け時間が正常に指定できない)

• shipping_id を, select[name] で使用するよう修正

複数配送購入の場合, 受注詳細に商品コードが登録されなかったのを修正

File:

• branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (9 diffs)

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

@@ -83 +83 @@
         // カートの情報を取得
         $this->arrShipping =& $objPurchase->getShippingTemp();
-        $shipping_vol = count($this->arrShipping);
 
         $this->is_multiple = $objPurchase->isMultiple();
@@ -131 +130 @@
          */
         case 'select_deliv':
-            $this->setFormParams($objFormParam, $_POST, true, $shipping_vol);
+            $this->setFormParams($objFormParam, $_POST, true, $this->arrShipping);
 
             $arrErr = $objFormParam->checkError();
@@ -154 +153 @@
         case 'confirm':
             // パラメータ情報の初期化
-            $this->setFormParams($objFormParam, $_POST, false, $shipping_vol);
+            $this->setFormParams($objFormParam, $_POST, false, $this->arrShipping);
 
             $deliv_id = $objFormParam->getValue('deliv_id');
@@ -190 +189 @@
         default:
             // FIXME 前のページから戻ってきた場合は別パラメータ(mode)で処理分岐する必要があるのかもしれない
-            $this->setFormParams($objFormParam, $arrOrderTemp, false, $shipping_vol);
+            $this->setFormParams($objFormParam, $arrOrderTemp, false, $this->arrShipping);
 
             if (!$this->is_single_deliv) {
@@ -202 +201 @@
                 $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id);
                 $this->arrPayment = $arrSelectedDeliv['arrPayment'];
-                // XXX セッションからデフォルト値を取得する必要あり
                 $this->arrDelivTime = $arrSelectedDeliv['arrDelivTime'];
                 $this->img_show = $arrSelectedDeliv['img_show'];
@@ -232 +230 @@
      * @param array $arrParam 設定する値の配列
      * @param boolean $deliv_only deliv_id チェックのみの場合 true
-     * @param integer $shipping_vol 配送数
-     */
-    function setFormParams(&$objFormParam, $arrParam, $deliv_only, $shipping_vol) {
-        $this->lfInitParam($objFormParam, $deliv_only, $shipping_vol);
+     * @param array $arrShipping 配送先情報の配列
+     */
+    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping) {
+        $this->lfInitParam($objFormParam, $deliv_only, $arrShipping);
         $objFormParam->setParam($arrParam);
         $objFormParam->convParam();
@@ -245 +243 @@
      * @param SC_FormParam $objFormParam SC_FormParam インスタンス
      * @param boolean $deliv_only deliv_id チェックのみの場合 true
-     * @param integer $shipping_vol 配送数
-     * @return void
-     */
-    function lfInitParam(&$objFormParam, $deliv_only, $shipping_vol) {
+     * @param array $arrShipping 配送先情報の配列
+     * @return void
+     */
+    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) {
         $objFormParam->addParam("配送業者", "deliv_id", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
 
@@ -257 +255 @@
             $objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2');
 
-            for ($i = 0; $i < $shipping_vol; $i++) {
-                $objFormParam->addParam("お届け時間", "deliv_time_id" . $i, INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-                $objFormParam->addParam("お届け日", "deliv_date" . $i, STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
+            foreach ($arrShipping as $val) {
+                $objFormParam->addParam("お届け時間", "deliv_time_id" . $val['shipping_id'], INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+                $objFormParam->addParam("お届け日", "deliv_date" . $val['shipping_id'], STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
             }
         }
@@ -316 +314 @@
          */
         foreach (array_keys($_SESSION['shipping']) as $key) {
-
-            $time_id = $objFormParam->getValue('deliv_time_id' . $key);
-
+            $shipping_id = $_SESSION['shipping'][$key]['shipping_id'];
+            $time_id = $objFormParam->getValue('deliv_time_id' . $shipping_id);
             $_SESSION['shipping'][$key]['deliv_id'] = $deliv_id;
             $_SESSION['shipping'][$key]['time_id'] = $time_id;
             $_SESSION['shipping'][$key]['shipping_time'] = $arrDelivTime[$time_id];
-            $_SESSION['shipping'][$key]['shipping_date'] = $objFormParam->getValue('deliv_date' . $key);
+            $_SESSION['shipping'][$key]['shipping_date'] = $objFormParam->getValue('deliv_date' . $shipping_id);
         }
     }