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

Timestamp:

2011/01/16 01:20:36 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
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:

nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110115162029-azxvx5ryjasawo2x

bzr:revno:

2652

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/Smarty/templates/default/shopping/confirm.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds

bzr:timestamp:

2011-01-16 01:20:29.269999981 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-15T16:20:29.270000Z

Message:

#843(複数配送先の指定)

• お届け日/お届け時間が反映されるよう修正

File:

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

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

@@ -98 +98 @@
         $this->cartKey = $objCartSess->getKey();
 
+        // 配送時間を取得
+        $this->arrDelivTime = $objPurchase->getDelivTime($this->cartKey);
+
         // 会員ログインチェック
         if($this->objCustomer->isLoginSuccess()) {
@@ -146 +149 @@
             // 入力エラーなし
             if(count($this->arrErr) == 0) {
-                // DBへのデータ登録
+
+                foreach (array_keys($_SESSION['shipping']) as $key) {
+                    $timeId = $this->objFormParam->getValue('deliv_time_id' . $key);
+                    $_SESSION['shipping'][$key]['time_id'] = $timeId;
+                    $_SESSION['shipping'][$key]['shipping_time'] = $this->arrDelivTime[$timeId];
+                    // XXX 文字列を代入しておいてもDBで自動変換可能？
+                    $_SESSION['shipping'][$key]['shipping_date'] = $this->objFormParam->getValue('deliv_date' . $key);
+                }
                 $this->lfRegistData($uniqid, $objPurchase);
-                $_SESSION['shipping'][0]['time_id'] = $this->objFormParam->getValue('deliv_time_id');
-                $_SESSION['shipping'][0]['deliv_date'] = $this->objFormParam->getValue('deliv_date');
+
                 // 正常に登録されたことを記録しておく
                 $objSiteSess->setRegistFlag();
@@ -159 +168 @@
                 $uniqid = $objSiteSess->getUniqId();
                 // 受注一時テーブルからの情報を格納
-                $this->lfSetOrderTempData($uniqid);
+                $this->objFormParam->setParam($objPurchase->getOrderTemp($uniqid));
             }
             break;
@@ -177 +186 @@
         }
 
-        // 配送時間を取得
-        $this->arrDelivTime = $objPurchase->getDelivTime($this->cartKey);
-
         // 支払い方法の画像があるなしを取得（$img_show true:ある false:なし）
         $this->img_show = $this->lfGetImgShow($this->arrPayment);
-        // FIXME お届け日一覧の取得
-        $this->arrDelivDate = $this->lfGetDelivDate();
-
+        // お届け日一覧の取得
+        $this->arrDelivDate = $objPurchase->getDelivDate($objCartSess, $this->cartKey);
         $this->arrForm = $this->objFormParam->getFormParamList();
     }
@@ -262 +267 @@
         $objQuery = new SC_Query();
         $where = "payment_id = ?";
-        $arrRet = $objQuery->select("charge", "dtb_payment", $where, array($payment_id));
-        return (array($arrRet[0]['charge'], $arrRet[0]['deliv_id']));
+        $arrRet = $objQuery->getRow("charge, payment_method", "dtb_payment", $where, array($payment_id));
+        return (array($arrRet['charge'], $arrRet['payment_method']));
     }
 
@@ -275 +280 @@
 
         if (strlen($sqlval['payment_id']) >= 1) {
-            // FIXME list($sqlval['charge'], $sqlval['deliv_id']) = $this->lfGetPaymentInfo($sqlval['payment_id']);
+            list($sqlval['charge'], $sqlval['payment_method']) = $this->lfGetPaymentInfo($sqlval['payment_id']);
         }
 
@@ -286 +291 @@
     }
 
-    /* お届け日一覧を取得する */
-    function lfGetDelivDate() {
-        $objCartSess = new SC_CartSession();
-        $objQuery = new SC_Query();
-        // 商品IDの取得
-        $max = $objCartSess->getMax();
-        for($i = 1; $i <= $max; $i++) {
-            if($_SESSION[$objCartSess->key][$i]['id'][0] != "") {
-                $arrID['product_id'][$i] = $_SESSION[$objCartSess->key][$i]['id'][0];
-            }
-        }
-        if(count($arrID['product_id']) > 0) {
-            $id = implode(",", $arrID['product_id']);
-            //商品から発送目安の取得
-            $deliv_date = $objQuery->get("MAX(deliv_date_id)", "dtb_products", "product_id IN (".$id.")");
-            //発送目安
-            switch($deliv_date) {
-            //即日発送
-            case '1':
-                $start_day = 1;
-                break;
-            //1-2日後
-            case '2':
-                $start_day = 3;
-                break;
-            //3-4日後
-            case '3':
-                $start_day = 5;
-                break;
-            //1週間以内
-            case '4':
-                $start_day = 8;
-                break;
-            //2週間以内
-            case '5':
-                $start_day = 15;
-                break;
-            //3週間以内
-            case '6':
-                $start_day = 22;
-                break;
-            //1ヶ月以内
-            case '7':
-                $start_day = 32;
-                break;
-            //2ヶ月以降
-            case '8':
-                $start_day = 62;
-                break;
-            //お取り寄せ(商品入荷後)
-            case '9':
-                $start_day = "";
-                break;
-            default:
-                //お届け日が設定されていない場合
-                $start_day = "";
-                break;
-            }
-            //お届け可能日のスタート値から、お届け日の配列を取得する
-            $arrDelivDate = $this->lfGetDateArray($start_day, DELIV_DATE_END_MAX);
-        }
-        return $arrDelivDate;
-    }
-
-    //お届け可能日のスタート値から、お届け日の配列を取得する
-    function lfGetDateArray($start_day, $end_day) {
-        $masterData = new SC_DB_MasterData();
-        $arrWDAY = $masterData->getMasterData("mtb_wday");
-        //お届け可能日のスタート値がセットされていれば
-        if($start_day >= 1) {
-            $now_time = time();
-            $max_day = $start_day + $end_day;
-            // 集計
-            for ($i = $start_day; $i < $max_day; $i++) {
-                // 基本時間から日数を追加していく
-                $tmp_time = $now_time + ($i * 24 * 3600);
-                list($y, $m, $d, $w) = split(" ", date("y m d w", $tmp_time));
-                $val = sprintf("%02d/%02d/%02d(%s)", $y, $m, $d, $arrWDAY[$w]);
-                $arrDate[$val] = $val;
-            }
-        } else {
-            $arrDate = false;
-        }
-        return $arrDate;
-    }
-
     //一時受注テーブルからの情報を格納する
-    function lfSetOrderTempData($uniqid) {
-        $objQuery = new SC_Query();
-        $col = "payment_id, use_point, message, point_check ";
-        $from = "dtb_order_temp";
-        $where = "order_temp_id = ?";
-        $arrRet = $objQuery->select($col, $from, $where, array($uniqid));
-        // DB値の取得
-        $this->objFormParam->setParam($arrRet[0]);
+    function lfSetOrderTempData($uniqid, &$objPurchase) {
+        $arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
+        $this->objFormParam->setParam($arrOrderTemp);
         return $this->objFormParam;
     }
@@ -395 +309 @@
         return $img_show;
     }
-
-    /* 配送時間の配列を生成 */
-    function lfSetDelivTime() {
-        $objDb = new SC_Helper_DB_Ex();
-        $objJson = new Services_JSON;
-
-        // 配送時間の取得
-        $arrRet = $objDb->sfGetDelivTime($this->cartKey);
-        // JSONエンコード
-        echo $objJson->encode($arrRet);
-        exit;
-    }
 }
 ?>