[Svn-src-all:2671] [version-2_12-dev 21570] #1439 (「お届け先の指定」に戻った際に、選択した状態を引き継いでいない)

[Seasoft]

Subversion committed to /home/svn/open 21570
http://svn.ec-cube.net/open_trac/changeset/21570
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-02 00:53:37 +0900 (金, 02  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1439 (「お届け先の指定」に戻った際に、選択した状態を引き継いでいない)
  * rv r21567 (PostgreSQL でエラーが発生するため、一旦差し戻しをさせて頂きます。)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
_U  branches/version-2_12-dev/
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php


Property changes on: branches/version-2_12-dev
___________________________________________________________________
変更: svn:mergeinfo
   - /branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475

   + /branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475

変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2012-03-01 12:07:38 UTC (rev 21569)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2012-03-01 15:53:37 UTC (rev 21570)
@@ -460,7 +460,7 @@
     function copyFromOrder(&$dest, $src,
         $prefix = 'shipping', $src_prefix = 'order',
         $keys = array(
-            'deliv_check', 'name01', 'name02', 'kana01', 'kana02',
+            'name01', 'name02', 'kana01', 'kana02',
             'sex', 'zip01', 'zip02', 'pref', 'addr01', 'addr02',
             'tel01', 'tel02', 'tel03',
         )

変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	2012-03-01 12:07:38 UTC (rev 21569)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	2012-03-01 15:53:37 UTC (rev 21570)
@@ -147,11 +147,6 @@
                 break;
         }
 
-	// 配送IDの取得
-	$shippingData = $objPurchase->getShippingTemp();
-	if($shippingData[0]['shipping_deliv_check'] != null){
-		$this->arrForm['deliv_check'] = $shippingData[0]['shipping_deliv_check'];
-	}
         // 登録済み住所を取得
         $this->arrAddr = $objCustomer->getCustomerAddress($objCustomer->getValue('customer_id'));
         $this->tpl_addrmax = count($this->arrAddr);
@@ -215,9 +210,9 @@
         // 別のお届け先がチェックされている場合
         elseif ($deliv_check >= 1) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $arrOtherDeliv = $objQuery->getRow('* , ? as deliv_check', 'dtb_other_deliv',
+            $arrOtherDeliv = $objQuery->getRow('*', 'dtb_other_deliv',
                                                'customer_id = ? AND other_deliv_id = ?',
-                                               array($deliv_check, $objCustomer->getValue('customer_id'), $deliv_check));
+                                               array($objCustomer->getValue('customer_id'), $deliv_check));
             if (SC_Utils_Ex::isBlank($arrOtherDeliv)) {
                 return false;
             }