Changeset 20697

Timestamp:

2011/03/17 23:25:50 (12 years ago)

Author:

nanasess

bzr:base-revision:

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

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

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110317142431-7kiukpsp388ya3h5

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110317142547-04vjlme99wbc31fz

bzr:revno:

3415

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-20110317142431-7kiukpsp388ya3h5
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php ohkouchi@loop-az.jp-20110317142431-7kiukpsp388ya3h5

bzr:timestamp:

2011-03-17 23:25:47.127000093 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-17T14:25:47.127000Z

Message:

#1167 (非会員購入時, 複数お届け先の住所追加ができない)

Location:

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

Files:

• helper/SC_Helper_Purchase.php (modified) (2 diffs)
• pages/mypage/LC_Page_Mypage_DeliveryAddr.php (modified) (2 diffs)

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

@@ -545 +545 @@
         $objQuery->delete($table, $where, array($order_id));
 
-         foreach ($arrParams as $arrShipping) {
+         foreach ($arrParams as $key => $arrShipping) {
 
             $arrValues = $objQuery->extractOnlyColsOf($table, $arrShipping);
@@ -558 +558 @@
             }
 
+            // 非会員購入の場合は shipping_id が存在しない
+            if (!isset($arrValues['shipping_id'])) {
+                $arrValues['shipping_id'] = $key;
+            }
             $arrValues['order_id'] = $order_id;
             $arrValues['create_date'] = 'Now()';

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php

@@ -129 +129 @@
                 break;
             case 'multiple':
-                // 複数配送先用？
+                // 複数配送先用
                 break;
             default :
@@ -215 +215 @@
     function lfRegistDataNonMember($objFormParam) {
         $arrRegistColumn = $objFormParam->getDbArray();
-
-        foreach ($arrRegistColumn as $data) {
-            $arrRegist['shipping_' . $data['column'] ] = $array[ $data['column'] ];
-        }
-        if (count($shipping) >= DELIV_ADDR_MAX) {
+        foreach ($arrRegistColumn as $key => $val) {
+            $arrRegist['shipping_' . $key ] = $val;
+        }
+        if (count($_SESSION['shipping']) >= DELIV_ADDR_MAX) {
             SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '別のお届け先最大登録数に達しています。');
         } else {