Changeset 19920 for branches/version-2_5-dev/data

Timestamp:

2011/01/15 21:29:14 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110114152640-oyr8511e1um7qqsm

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/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_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20110115122738-ci4z58a047yhmpok

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110115122909-wo6cr5i2y578ohwq

bzr:revno:

2649

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-20110115122738-ci4z58a047yhmpok
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110115122738-ci4z58a047yhmpok
data/class/pages/shopping/LC_Page_Shopping_Deliv.php nanasess@fsm.ne.jp-20110115122738-ci4z58a047yhmpok

bzr:timestamp:

2011-01-15 21:29:09.743999958 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-15T12:29:09.744000Z

Message:

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

• 会員で通常購入時, 別のお届け先を指定すると複数購入扱いになってしまうのを修正

Location:

branches/version-2_5-dev/data/class

Files:

• helper/SC_Helper_Purchase.php (modified) (2 diffs)
• pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (1 diff)
• pages/shopping/LC_Page_Shopping_Deliv.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

@@ -281 +281 @@
      * 受注情報($src)を $dest の order_* へコピーする.
      *
+     * TODO 汎用的にして SC_Utils へ移動
+     *
      * @param array $dest コピー先の配列
      * @param array $src コピー元の配列
@@ -294 +296 @@
                                          'addr01', 'addr02',
                                          'tel01', 'tel02', 'tel03')) {
+        if (!SC_Utils_Ex::isBlank($prefix)) {
+            $prefix = $prefix . '_';
+        }
+        if (!SC_Utils_Ex::isBlank($src_prefix)) {
+            $src_prefix = $src_prefix . '_';
+        }
         foreach ($keys as $key) {
             if (in_array($key, $keys)) {
-                $dest[$prefix . '_' . $key] = $src[$src_prefix . '_' . $key];
+                $dest[$prefix . $key] = $src[$src_prefix . $key];
             }
         }

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -703 +703 @@
         $result = $objQuery->update($table, $dest, "order_id = ?", array($order_id));
         if ($result == 0) {
+            $dest['order_id'] = $order_id;
             $result = $objQuery->insert($table, $dest);
         }

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

@@ -195 +195 @@
         case 'customer_addr':
             $sqlval = array();
+            $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
             // 会員登録住所がチェックされている場合
             if ($_POST['deliv_check'] == '-1') {
                 // 会員情報の住所を受注一時テーブルに書き込む
                 $objPurchase->copyFromCustomer($sqlval, $objCustomer, 'shipping');
-                $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
                 $objPurchase->saveShippingTemp($sqlval);
                 $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer);
@@ -211 +211 @@
             } elseif($_POST['deliv_check'] >= 1) {
                 if (SC_Utils_Ex::sfIsInt($_POST['deliv_check'])) {
-                    $deliv_count = $objQuery->count("dtb_other_deliv","customer_id=? and other_deliv_id = ?" ,array($objCustomer->getValue('customer_id'), $_POST['deliv_check']));
-                    if ($deliv_count != 1) {
+                    $otherDeliv = $objQuery->getRow("*", "dtb_other_deliv","customer_id = ? AND other_deliv_id = ?"
+                                                    ,array($objCustomer->getValue('customer_id'), $_POST['deliv_check']));
+                    if (SC_Utils_Ex::isBlank($otherDeliv)) {
                         SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
                     }
 
-                    $otherDeliv = $objQuery->select("*", "dtb_other_deliv",
-                                                    "other_deliv_id = ?",
-                                                    array($_POST['deliv_check']));
-                    $sqlval = $otherDeliv[0];
-                    $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
-                    $objPurchase->saveShippingTemp($sqlval, $_POST['deliv_check']);
+                    $objPurchase->copyFromOrder($sqlval, $otherDeliv, 'shipping', '');;
+                    $objPurchase->saveShippingTemp($sqlval);
                     $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer);
 
@@ -248 +245 @@
 
         default:
-            //$objPurchase->unsetShippingTemp();
+            $objPurchase->unsetShippingTemp();
             $arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
             if (empty($arrOrderTemp)) $arrOrderTemp = array("");