Changeset 19872 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

Timestamp:

2011/01/11 22:31:49 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 16093@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DeliveryAddr.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_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110111133017-qkwxf5r153zqh0i9

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110111133146-xxt8xxsbcdj7rkzt

bzr:revno:

2601

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 ohkouchi@loop-az.jp-20110111133017-qkwxf5r153zqh0i9
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php ohkouchi@loop-az.jp-20110111133017-qkwxf5r153zqh0i9
data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110111133017-qkwxf5r153zqh0i9
data/class/pages/shopping/LC_Page_Shopping_Multiple.php ohkouchi@loop-az.jp-20110111133017-qkwxf5r153zqh0i9

bzr:timestamp:

2011-01-11 22:31:46.545000076 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-11T13:31:46.545000Z

Message:

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

• 非会員購入に対応

File:

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

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

@@ -73 +73 @@
         $this->objFormParam = new SC_FormParam();
 
-        $this->addrs = $this->getDelivAddrs($objCustomer);
+        $uniqid = $objSiteSess->getUniqId();
+
+        $this->addrs = $this->getDelivAddrs($objCustomer, $objPurchase, $uniqid);
         $this->items = $this->splitItems($objCartSess);
 
@@ -79 +81 @@
         $this->objFormParam->setParam($_POST);
 
-        $uniqid = $objSiteSess->getUniqId();
         $objPurchase->verifyChangeCart($uniqid, $objCartSess);
 
@@ -106 +107 @@
                     while ($params['cart_no' . $i] != null) {
                         $other_deliv_id = $params['shipping' . $i];
-                        if ($other_deliv_id != 0) {
-                            $otherDeliv = $objQuery->select("*", "dtb_other_deliv",
-                                                            "other_deliv_id = ?",
-                                                            array($other_deliv_id));
-                            foreach ($otherDeliv[0] as $key => $val) {
-                                $sqlval[$other_deliv_id]['shipping_' . $key] = $val;
+                        if ($objCustomer->isLoginSuccess()) {
+                            if ($other_deliv_id != 0) {
+                                $otherDeliv = $objQuery->select("*", "dtb_other_deliv",
+                                                                "other_deliv_id = ?",
+                                                                array($other_deliv_id));
+                                foreach ($otherDeliv[0] as $key => $val) {
+                                    $sqlval[$other_deliv_id]['shipping_' . $key] = $val;
+                                }
+                            } else {
+                                $objPurchase->copyFromCustomer($sqlval[0], $objCustomer,
+                                                               "shipping");
                             }
                         } else {
-                            $objPurchase->copyFromCustomer($sqlval[0], $objCustomer,
-                                                           "shipping");
                         }
                         $sqlval[$other_deliv_id]['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
@@ -182 +186 @@
      * 非会員の場合は, 「お届け先の指定」画面で入力した住所を取得する.
      */
-    function getDelivAddrs(&$objCustomer) {
+    function getDelivAddrs(&$objCustomer, &$objPurchase, $uniqid) {
         if ($objCustomer->isLoginSuccess()) {
             $addrs = $objCustomer->getCustomerAddress($_SESSION['customer']['customer_id']);
+            $results = array();
+            foreach ($addrs as $key => $val) {
+                $other_deliv_id = SC_Utils_Ex::isBlank($val['other_deliv_id']) ? 0 : $val['other_deliv_id'];
+                $results[$other_deliv_id] = $val['name01'] . $val['name02']
+                    . " " . $this->arrPref[$val['pref']] . $val['addr01'] . $val['addr02'];
+            }
         } else {
-            // TODO
-            $addrs = array();
-        }
-        $results = array();
-        foreach ($addrs as $key => $val) {
-            $other_deliv_id = SC_Utils_Ex::isBlank($val['other_deliv_id']) ? 0 : $val['other_deliv_id'];
-            $results[$other_deliv_id] = $val['name01'] . $val['name02']
-                . " " . $this->arrPref[$val['pref']] . $val['addr01'] . $val['addr02'];
+            $shipping = $objPurchase->getShippingTemp();
+            foreach ($shipping as $shipping_id => $val) {
+                $results[$shipping_id] = $val['shipping_name01'] . $val['shipping_name02']
+                    . " " . $this->arrPref[$val['shipping_pref']]
+                    . $val['shipping_addr01'] . $val['shipping_addr02'];
+            }
         }
         return $results;