Changeset 19872 for branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.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/helper/SC_Helper_Purchase.php (modified) (1 diff)

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

@@ -218 +218 @@
      */
     function saveShippingTemp(&$src, $otherDelivId = 0) {
-        $_SESSION['shipping'][$otherDelivId] = array_merge($_SESSION['shipping'][$otherDelivId], $src);
+        if (empty($_SESSION['shipping'][$otherDelivId])) {
+            $_SESSION['shipping'][$otherDelivId] = $src;
+        } else {
+            $_SESSION['shipping'][$otherDelivId] = array_merge($_SESSION['shipping'][$otherDelivId], $src);
+        }
     }