Changeset 20122 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

Timestamp:

2011/02/09 16:59:25 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110209054704-w9inyl5j79vady69

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

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/Smarty/templates/mobile/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110209075921-fqrnsifl8w00n1tb

bzr:revno:

2850

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/Smarty/templates/mobile/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/Smarty/templates/sphone/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/SC_Customer.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84

bzr:timestamp:

2011-02-09 16:59:21.723000050 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-09T07:59:21.723000Z

Message:

#984([フロント]商品購入 リファクタリング)

• /shopping/complete.php

#1002(携帯アドレスが登録されていないユーザーが携帯アドレス登録画面に遷移しない)

• typo 修正

File:

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

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

@@ -78 +78 @@
         $objPurchase = new SC_Helper_Purchase_Ex();
 
-        $this->isMultiple = $objPurchase->isMultiple();
+        $this->is_multiple = $objPurchase->isMultiple();
 
         // 前のページで正しく登録手続きが行われた記録があるか判定
@@ -86 +86 @@
 
         // ユーザユニークIDの取得と購入状態の正当性をチェック
-        $uniqid = $objSiteSess->getUniqId();
-        $objPurchase->verifyChangeCart($uniqid, $objCartSess);
-        $this->tpl_uniqid = $uniqid;
+        $this->tpl_uniqid = $objSiteSess->getUniqId();
+        $objPurchase->verifyChangeCart($this->tpl_uniqid, $objCartSess);
 
         $this->cartKey = $objCartSess->getKey();
@@ -94 +93 @@
         // カート内商品のチェック
         $this->tpl_message = $objCartSess->checkProducts($this->cartKey);
-        if (strlen($this->tpl_message) >= 1) {
+        if (!SC_Utils_Ex::isBlank($this->tpl_message)) {
             SC_Response_Ex::sendRedirect(CART_URLPATH);
             exit;
@@ -100 +99 @@
 
         // カートの商品を取得
-        $this->cartItems = $objCartSess->getCartList($this->cartKey);
+        $this->arrShipping = $objPurchase->getShippingTemp();
+        $this->arrCartItems = $objCartSess->getCartList($this->cartKey);
         // 合計金額
         $this->tpl_total_inctax[$this->cartKey] = $objCartSess->getAllProductsTotal($this->cartKey);
@@ -108 +108 @@
         $this->tpl_total_point[$this->cartKey] = $objCartSess->getAllProductsPoint($this->cartKey);
 
-        // TODO リファクタリング
         // 一時受注テーブルの読込
-        $tmpData = $objPurchase->getOrderTemp($uniqid);
+        $arrOrderTemp = $objPurchase->getOrderTemp($this->tpl_uniqid);
 
         // カート集計を元に最終計算
-        // FIXME 使用ポイント, 手数料の扱い
-        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer, $tmpData['use_point'], $objPurchase->getShippingPref(), $tmpData['charge'], $tmpData['discount']));
+        $arrCalcResults = $objCartSess->calculate($this->cartKey, $objCustomer,
+                                                  $arrOrderTemp['use_point'],
+                                                  $objPurchase->getShippingPref(),
+                                                  $arrOrderTemp['charge'],
+                                                  $arrOrderTemp['discount']);
+        $this->arrForm = array_merge($arrOrderTemp, $arrCalcResults);
 
         // 会員ログインチェック
@@ -122 +125 @@
         }
 
-        // 決済区分を取得する
-        $payment_type = "";
-        if($objDb->sfColumnExists("dtb_payment", "memo01")){
-            // MEMO03に値が入っている場合には、モジュール追加されたものとみなす
-            $sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?";
-            $arrPayment = $objQuery->getAll($sql, array($arrData['payment_id']));
-            $payment_type = $arrPayment[0]["memo03"];
-        }
-        $this->payment_type = $payment_type;
-
-        $this->shipping = $objPurchase->getShippingTemp();
+        // 決済モジュールを使用するかどうか
+        $this->use_module = $this->useModule($this->arrForm['payment_id']);
 
         switch($this->getMode()) {
@@ -143 +137 @@
             break;
         case 'confirm':
-            // この時点で注文番号を確保しておく（クレジット、コンビニ決済で必要なため）
-            $arrData["order_id"] = $objQuery->nextval("dtb_order_order_id");
+            /*
+             * 決済モジュールで必要なため, 受注番号を取得
+             */
+            $this->arrForm["order_id"] = $objQuery->nextval("dtb_order_order_id");
 
             // 集計結果を受注一時テーブルに反映
-            $objPurchase->saveOrderTemp($uniqid, $arrData, $objCustomer);
+            $objPurchase->saveOrderTemp($this->tpl_uniqid, $this->arrForm,
+                                        $objCustomer);
+
             // 正常に登録されたことを記録しておく
             $objSiteSess->setRegistFlag();
 
-            // 決済方法により画面切替
-            if($payment_type != "") {
-                $_SESSION["payment_id"] = $arrData['payment_id'];
-
+            // 決済モジュールを使用する場合
+            if ($this->use_module) {
+                $_SESSION["payment_id"] = $this->arrForm['payment_id'];
                 $objPurchase->completeOrder(ORDER_PENDING);
                 SC_Response_Ex::sendRedirect(SHOPPING_MODULE_URLPATH);
-            }else{
-                // 受注を完了し, 購入完了ページへ
+            }
+            // 購入完了ページ
+            else {
                 $objPurchase->completeOrder(ORDER_NEW);
-                $objPurchase->sendOrderMail($arrData["order_id"]);
+                $objPurchase->sendOrderMail($this->arrForm["order_id"]);
                 SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH);
             }
@@ -168 +166 @@
             break;
         }
-        $this->arrData = $arrData;
     }
 
@@ -179 +176 @@
         parent::destroy();
     }
+
+    /**
+     * 決済モジュールを使用するかどうか.
+     *
+     * dtb_payment.memo03 に値が入っている場合は決済モジュールと見なす.
+     *
+     * @param integer $payment_id 支払い方法ID
+     * @return boolean 決済モジュールを使用する支払い方法の場合 true
+     */
+    function useModule($payment_id) {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $memo03 = $objQuery->get('memo03', 'dtb_payment', 'payment_id = ?',
+                                 array($payment_id));
+        return !SC_Utils_Ex::isBlank($memo03);
+    }
 }
 ?>