Changeset 21016

Timestamp:

2011/07/05 19:29:09 (13 years ago)

Author:

habu

Message:

#1394(会員住所以外のお届け先を指定しても情報が反映されない)

Location:

branches/version-2_11-dev

Files:

• data/class/helper/SC_Helper_Purchase.php (modified) (3 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Confirm.php (modified) (2 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)
• test/class/helper/Helper_AllTests.php (modified) (2 diffs)
• test/class/helper/SC_Helper_Purchase_Test.php (added)
• test/class/helper/SC_Helper_Session_Test.php (modified) (1 diff)

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

@@ -75 +75 @@
         $orderId = $this->registerOrderComplete($orderTemp, $objCartSession,
                                                 $cartkey);
-        $shippingTemp =& $this->getShippingTemp(true);
+        $isMultiple = SC_Helper_Purchase::isMultiple();
+        $shippingTemp =& $this->getShippingTemp( $isMultiple );
         foreach ($shippingTemp as $shippingId => $val) {
             $this->registerShipmentItem($orderId, $shippingId,
@@ -352 +353 @@
      * 配送先都道府県の配列を返す.
      */
-    function getShippingPref() {
+    function getShippingPref($is_multiple) {
         $results = array();
-        foreach (SC_Helper_Purchase_Ex::getShippingTemp(true) as $val) {
+        foreach (SC_Helper_Purchase_Ex::getShippingTemp($is_multiple) as $val) {
             $results[] = $val['shipping_pref'];
         }
@@ -1269 +1270 @@
      */
     function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey) {
-        // カートの内容を削除する. 
+        // カートの内容を削除する.
         $objCartSession->delAllProducts($cartKey);
         SC_SiteSession_Ex::unsetUniqId();

branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

@@ -99 +99 @@
 
         // カートの商品を取得
-        $this->arrShipping = $objPurchase->getShippingTemp(true);
+        $this->arrShipping = $objPurchase->getShippingTemp($this->is_multiple);
         $this->arrCartItems = $objCartSess->getCartList($this->cartKey);
         // 合計金額
@@ -114 +114 @@
         $arrCalcResults = $objCartSess->calculate($this->cartKey, $objCustomer,
                                                   $arrOrderTemp['use_point'],
-                                                  $objPurchase->getShippingPref(),
+                                                  $objPurchase->getShippingPref($this->is_multiple),
                                                   $arrOrderTemp['charge'],
                                                   $arrOrderTemp['discount'],

branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -81 +81 @@
         $objFormParam = new SC_FormParam_Ex();
 
+        $this->is_multiple = $objPurchase->isMultiple();
+
         // カートの情報を取得
-        $this->arrShipping =& $objPurchase->getShippingTemp(true);
-
-        $this->is_multiple = $objPurchase->isMultiple();
+        $this->arrShipping =& $objPurchase->getShippingTemp($this->is_multiple);
+
         $this->tpl_uniqid = $objSiteSess->getUniqId();
         $cart_key = $objCartSess->getKey();

branches/version-2_11-dev/test/class/helper/Helper_AllTests.php

@@ -26 +26 @@
 require_once(realpath(dirname(__FILE__)) . "/SC_Helper_DB_Test.php");
 require_once(realpath(dirname(__FILE__)) . "/SC_Helper_Session_Test.php");
+require_once(realpath(dirname(__FILE__)) . "/SC_Helper_Purchase_Test.php");
 
 /**
@@ -40 +41 @@
         $suite->addTestSuite('SC_Helper_DB_Test');
         $suite->addTestSuite('SC_Helper_Session_Test');
+        $suite->addTestSuite('SC_Helper_Purchase_Test');
         return $suite;
     }

branches/version-2_11-dev/test/class/helper/SC_Helper_Session_Test.php

@@ -31 +31 @@
  * @package Helper
  * @author LOCKON CO.,LTD.
- * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
+ * @version $Id$
  */
 class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase {