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

Timestamp:

2011/01/10 16:57:29 (13 years ago)

Author:

nanasess

bzr:base-revision:

nanasess@fsm.ne.jp-20110110045915-6b02oxleldtyw7ee

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
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
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110110075706-tq0uswsfrsetr0rq

bzr:revno:

2590

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
data/class/pages/shopping/LC_Page_Shopping.php nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
data/class/pages/shopping/LC_Page_Shopping_Confirm.php nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
data/class/pages/shopping/LC_Page_Shopping_Deliv.php nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20110110075529-5iceg1qu15cmyr60

bzr:timestamp:

2011-01-10 16:57:06.664000034 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-10T07:57:06.664000Z

Message:

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

• お届け先の指定を修正

File:

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

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

@@ -77 +77 @@
         $objQuery = new SC_Query();
         $objDb = new SC_Helper_DB_Ex();
+        $objPurchase = new SC_Helper_Purchase_Ex();
 
         // 前のページで正しく登録手続きが行われた記録があるか判定
@@ -82 +83 @@
 
         // ユーザユニークIDの取得と購入状態の正当性をチェック
-        $uniqid = SC_Utils_Ex::sfCheckNormalAccess($objSiteSess, $objCartSess);
+        $uniqid = $objSiteSess->getUniqId();
+        $objPurchase->verifyChangeCart($uniqid, $objCartSess);
         $this->tpl_uniqid = $uniqid;
 
-        //ダウンロード商品判定
-        $this->cartdown = $objDb->chkCartDown($objCartSess);
-
-
-        $this->cartKey = $_SESSION['cartKey'];
+        $this->cartKey = $objCartSess->getKey();
 
         // カート内商品のチェック
@@ -108 +106 @@
         // TODO リファクタリング
         // 一時受注テーブルの読込
-        $tmpData = $objDb->sfGetOrderTemp($uniqid);
+        $tmpData = $objPurchase->getOrderTemp($uniqid);
 
         // カート集計を元に最終計算
@@ -144 +142 @@
             $arrData["order_id"] = $objQuery->nextval("dtb_order_order_id");
 
-            // セッション情報を保持
-            $arrData['session'] = serialize($_SESSION);
-
             // 集計結果を受注一時テーブルに反映
             unset($arrData[0]); // FIXME
             unset($arrData[1]);
-            $objDb->sfRegistTempOrder($uniqid, $arrData);
+            $objPurchase->saveOrderTemp($uniqid, $arrData, $objCustomer);
             // 正常に登録されたことを記録しておく
             $objSiteSess->setRegistFlag();
@@ -157 +152 @@
             if($payment_type != "") {
                 $_SESSION["payment_id"] = $arrData['payment_id'];
-                $objPurchase = new SC_Helper_Purchase_Ex();
+
                 $objPurchase->completeOrder(ORDER_PENDING);
                 $this->objDisplay->redirect($this->getLocation(SHOPPING_MODULE_URL_PATH));
             }else{
                 // 受注を完了し, 購入完了ページへ
-                $objPurchase = new SC_Helper_Purchase_Ex();
                 $objPurchase->completeOrder(ORDER_NEW);
                 $objPurchase->sendOrderMail($arrData["order_id"]);