[Svn-src-all:876] [version-2_5-dev 19763] #876(SC_Helper_Purchase#registerOtherDeliv を削除)

[Seasoft]

Subversion committed to /home/svn/open 19763
http://svn.ec-cube.net/open_trac/changeset/19763
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2010-12-25 17:20:37 +0900 (土, 25 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#876(SC_Helper_Purchase#registerOtherDeliv を削除)

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

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	2010-12-25 07:51:33 UTC (rev 19762)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	2010-12-25 08:20:37 UTC (rev 19763)
@@ -66,10 +66,6 @@
                                                    $objCartSession);
         $orderTemp = $this->getOrderTemp($uniqId);
 
-        if ($objCustomer->isLoginSuccess(true)) {
-            $this->registerOtherDeliv($uniqId, $customerId);
-        }
-
         $orderTemp['status'] = $orderStatus;
         $orderId = $this->registerOrder($orderTemp, $objCartSession,
                                         $_SESSION['cartKey']);
@@ -180,65 +176,6 @@
     }
 
     /**
-     * 会員登録住所と配送先住所を比較し, 差異があった場合は新規登録を行う.
-     *
-     * 別のお届け先に同一の配送先住所が存在する場合は登録しない.
-     *
-     * @param string $uniqId 配送先住所を特定するための一時テーブルのユニークID
-     * @param integer $customerId 顧客ID
-     * @return boolean 差異があり新規登録を行った場合 true; それ以外は false
-     */
-    function registerOtherDeliv($uniqId, $customerId) {
-        $keys = array('name01', 'name02', 'kana01', 'kana02', 'tel01', 'tel02',
-                      'tel03', 'zip01', 'zip02', 'pref', 'addr01', 'addr02');
-        $delivCols = "";
-        $cols = "";
-        $i = 0;
-        foreach ($keys as $key) {
-            $delivCols .= "deliv_" . $key;
-            $cols .= $key;
-            if ($i < count($keys) - 1) {
-                $delivCols .= ", ";
-                $cols .= ", ";
-            }
-            $i++;
-        }
-
-        $objQuery =& SC_Query::getSingletonInstance();
-        $orderTemp = $objQuery->select($delivCols, "dtb_order_temp",
-                                       "order_temp_id = ?", array($uniqId),
-                                       MDB2_FETCHMODE_ORDERED);
-
-        $customerAddrs = $objQuery->select($cols, "dtb_customer",
-                                           "customer_id = ?", array($customerId),
-                                           MDB2_FETCHMODE_ORDERED);
-
-        $hasAddr = false;
-        if ($orderTemp[0] != $customerAddrs[0]) {
-            $otherAddrs = $objQuery->select($cols, "dtb_other_deliv",
-                                           "customer_id = ?", array($customerId),
-                                            MDB2_FETCHMODE_ORDERED);
-            foreach ($otherAddrs as $otherAddr) {
-                if ($orderTemp[0] == $otherAddr) {
-                    $hasAddr = true;
-                }
-            }
-        }
-        if ($hasAddr) {
-            $i = 0;
-            foreach ($keys as $key) {
-                $addrs[$key] = $orderTemp[0][$i];
-                $i++;
-            }
-            $addrs['customer_id'] = $customerId;
-            $addrs['order_deliv_id'] = $objQuery->nextVal('dtb_other_deliv_other_deliv_id');
-            $objQuery->insert("dtb_other_deliv", $addrs);
-            return true;
-        }
-        return false;
-    }
-
-    /**
      * 受注完了メールを送信する.
      *
      * HTTP_USER_AGENT の種別により, 携帯電話の場合は携帯用の文面,