Changeset 21016


Ignore:
Timestamp:
2011/07/05 19:29:09 (10 years ago)
Author:
habu
Message:

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

Location:
branches/version-2_11-dev
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php

    r21013 r21016  
    7575        $orderId = $this->registerOrderComplete($orderTemp, $objCartSession, 
    7676                                                $cartkey); 
    77         $shippingTemp =& $this->getShippingTemp(true); 
     77        $isMultiple = SC_Helper_Purchase::isMultiple(); 
     78        $shippingTemp =& $this->getShippingTemp( $isMultiple ); 
    7879        foreach ($shippingTemp as $shippingId => $val) { 
    7980            $this->registerShipmentItem($orderId, $shippingId, 
     
    352353     * 配送先都道府県の配列を返す. 
    353354     */ 
    354     function getShippingPref() { 
     355    function getShippingPref($is_multiple) { 
    355356        $results = array(); 
    356         foreach (SC_Helper_Purchase_Ex::getShippingTemp(true) as $val) { 
     357        foreach (SC_Helper_Purchase_Ex::getShippingTemp($is_multiple) as $val) { 
    357358            $results[] = $val['shipping_pref']; 
    358359        } 
     
    12691270     */ 
    12701271    function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey) { 
    1271         // カートの内容を削除する.  
     1272        // カートの内容を削除する. 
    12721273        $objCartSession->delAllProducts($cartKey); 
    12731274        SC_SiteSession_Ex::unsetUniqId(); 
  • branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

    r21006 r21016  
    9999 
    100100        // カートの商品を取得 
    101         $this->arrShipping = $objPurchase->getShippingTemp(true); 
     101        $this->arrShipping = $objPurchase->getShippingTemp($this->is_multiple); 
    102102        $this->arrCartItems = $objCartSess->getCartList($this->cartKey); 
    103103        // 合計金額 
     
    114114        $arrCalcResults = $objCartSess->calculate($this->cartKey, $objCustomer, 
    115115                                                  $arrOrderTemp['use_point'], 
    116                                                   $objPurchase->getShippingPref(), 
     116                                                  $objPurchase->getShippingPref($this->is_multiple), 
    117117                                                  $arrOrderTemp['charge'], 
    118118                                                  $arrOrderTemp['discount'], 
  • branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r21006 r21016  
    8181        $objFormParam = new SC_FormParam_Ex(); 
    8282 
     83        $this->is_multiple = $objPurchase->isMultiple(); 
     84 
    8385        // カートの情報を取得 
    84         $this->arrShipping =& $objPurchase->getShippingTemp(true); 
    85  
    86         $this->is_multiple = $objPurchase->isMultiple(); 
     86        $this->arrShipping =& $objPurchase->getShippingTemp($this->is_multiple); 
     87 
    8788        $this->tpl_uniqid = $objSiteSess->getUniqId(); 
    8889        $cart_key = $objCartSess->getKey(); 
  • branches/version-2_11-dev/test/class/helper/Helper_AllTests.php

    r21015 r21016  
    2626require_once(realpath(dirname(__FILE__)) . "/SC_Helper_DB_Test.php"); 
    2727require_once(realpath(dirname(__FILE__)) . "/SC_Helper_Session_Test.php"); 
     28require_once(realpath(dirname(__FILE__)) . "/SC_Helper_Purchase_Test.php"); 
    2829 
    2930/** 
     
    4041        $suite->addTestSuite('SC_Helper_DB_Test'); 
    4142        $suite->addTestSuite('SC_Helper_Session_Test'); 
     43        $suite->addTestSuite('SC_Helper_Purchase_Test'); 
    4244        return $suite; 
    4345    } 
  • branches/version-2_11-dev/test/class/helper/SC_Helper_Session_Test.php

    r21015 r21016  
    3131 * @package Helper 
    3232 * @author LOCKON CO.,LTD. 
    33  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $ 
     33 * @version $Id$ 
    3434 */ 
    3535class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase { 
Note: See TracChangeset for help on using the changeset viewer.