Changeset 19890 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php

Timestamp:

2011/01/12 17:44:52 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

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/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
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:

ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110112084449-61556v4whzcw36g3

bzr:revno:

2619

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
docs/eccube-diagram.jude ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd

bzr:timestamp:

2011-01-12 17:44:49.048000097 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-12T08:44:49.048000Z

Message:

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

• 非会員購入時, 別のお届け先を指定した場合に複数配送扱いになってしまうのを修正
• 非会員購入時, お届け先住所が保存されないのを修正
• ER図を修正

File:

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

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

@@ -162 +162 @@
             if(count($this->arrErr) == 0) {
                 // DBへのデータ登録
-                $this->lfRegistData($uniqid, $objPurchase, $objCustomer, $this->cartKey);
+                $this->lfRegistData($uniqid, $objPurchase, $objCustomer, $this->cartKey, true);
                 // 正常に登録されたことを記録しておく
                 $objSiteSess->setRegistFlag();
@@ -181 +181 @@
             // ※breakなし
         default:
-            $objPurchase->unsetShippingTemp();
             if(isset($_GET['from']) && $_GET['from'] == 'nonmember') {
                 $this->tpl_mainpage = 'shopping/nonmember_input.tpl';
@@ -189 +188 @@
             if (empty($arrOrderTemp)) $arrOrderTemp = array('order_email' => "",
                                                             'order_birth' => "");
-
+            $arrShippingTemp = $objPurchase->getShippingTemp();
             // DB値の取得
             $this->objFormParam->setParam($arrOrderTemp);
+            /*
+             * count($arrShippingTemp) > 1 は複数配送であり,
+             * $arrShippingTemp[0] は注文者が格納されている
+             */
+            if (count($arrShippingTemp) > 1) {
+                $this->objFormParam->setParam($arrShippingTemp[1]);
+            } else {
+                $this->objFormParam->setParam($arrShippingTemp[0]);
+            }
             $this->objFormParam->setValue('order_email02', $arrOrderTemp['order_email']);
             $this->objFormParam->setDBDate($arrOrderTemp['order_birth']);
+            $objPurchase->unsetShippingTemp();
         }
 
@@ -304 +313 @@
         $this->objFormParam->addParam("性別", "order_sex", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("職業", "order_job", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("別のお届け先", "deliv_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), "", false);
+        $this->objFormParam->addParam("別のお届け先", "deliv_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("お名前(姓)", "shipping_name01", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お名前(名)", "shipping_name02", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
@@ -321 +330 @@
 
     /* DBへデータの登録 */
-    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, $productTypeId) {
+    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, $productTypeId, $isMultiple = false) {
         $params = $this->objFormParam->getHashArray();
         $sqlval = $this->objFormParam->getDbArray();
@@ -349 +358 @@
             }
         }
-        $objPurchase->saveShippingTemp($order_val, 0);
-        if ($params['deliv_check'] == '1') {
-            $objPurchase->saveShippingTemp($shipping_val, 1);
+        if ($isMultiple) {
+            $objPurchase->saveShippingTemp($order_val, 0);
+            if ($params['deliv_check'] == '1') {
+                $objPurchase->saveShippingTemp($shipping_val, 1);
+            }
+        } else {
+            if ($params['deliv_check'] == '1') {
+                $objPurchase->saveShippingTemp($shipping_val, 0);
+            } else {
+                $objPurchase->saveShippingTemp($order_val, 0);
+            }
         }
         $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer);