Changeset 19928 for branches/version-2_5-dev/data/class

Timestamp:

2011/01/16 19:56:17 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2657

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_CartSession.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]

bzr:timestamp:

2011-01-16 19:56:10.862999916 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-16T10:56:10.863000Z

Message:

#843(複数配送先の指定)

• 送料計算を修正

Location:

branches/version-2_5-dev/data/class

Files:

• SC_CartSession.php (modified) (2 diffs)
• helper/SC_Helper_DB.php (modified) (1 diff)
• helper/SC_Helper_Purchase.php (modified) (2 diffs)
• pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (1 diff)
• pages/shopping/LC_Page_Shopping_Confirm.php (modified) (1 diff)
• pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_CartSession.php

@@ -490 +490 @@
      * @param SC_Customer $objCustomer ログイン中の SC_Customer インスタンス
      * @param integer $use_point 今回使用ポイント
-     * @param integer $deliv_pref 配送先都道府県ID
-     * @param integer $payment_id 支払い方法ID
+     * @param integer|array $deliv_pref 配送先都道府県ID.
+                                        複数に配送する場合は都道府県IDの配列
      * @param integer $charge 手数料
      * @param integer $discount 値引
@@ -497 +497 @@
      */
     function calculate($productTypeId, &$objCustomer, $use_point = 0,
-                       $deliv_pref = "", $payment_id = "", $charge = 0, $discount = 0) {
+                       $deliv_pref = "", $charge = 0, $discount = 0) {
         $objDb = new SC_Helper_DB_Ex();
 

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

@@ -1477 +1477 @@
 
     /**
-     * 都道府県、支払い方法から配送料金を取得する.
-     *
-     * @param array $arrData 各種情報
-     * @return string 指定の都道府県, 支払い方法の配送料金
+     * 都道府県から配送料金を取得する.
+     *
+     * @param integer|array $pref_id 都道府県ID 又は都道府県IDの配列
+     * @return string 指定の都道府県, 商品種別の配送料金
      */
     function sfGetDelivFee($pref_id, $product_type_id) {
         $objQuery =& SC_Query::getSingletonInstance();
 
-        // 配送業者から配送料を取得
-        if($deliv_id != "") {
-
-            // 都道府県が指定されていない場合は、東京都の番号を指定しておく
-            if($pref_id == "") {
-                $pref_id = 13;
-            }
-
-            $objQuery =& SC_Query::getSingletonInstance();
-            $where = "product_type_id = ? AND pref = ?";
-            $arrRet= $objQuery->select("fee", "dtb_delivfee", $where, array($product_type_id, $pref_id));
-        }
-        return $arrRet[0]['fee'];
+        /*
+         * FIXME 都道府県が指定されていない場合は、東京都の番号を指定しておく
+         * http://svn.ec-cube.net/open_trac/ticket/410
+         */
+        if($pref_id == "") {
+            $pref_id = 13;
+        }
+        if (!is_array($pref_id)) {
+            $pref_id = array($pref_id);
+        }
+        $sql = <<< __EOS__
+            SELECT SUM(T1.fee) AS fee
+              FROM dtb_delivfee T1
+              JOIN dtb_deliv T2
+                ON T1.deliv_id = T2.deliv_id
+             WHERE T1.pref = ? AND T2.product_type_id = ?
+__EOS__;
+
+        $result = 0;
+        foreach ($pref_id as $pref) {
+            $result += $objQuery->getOne($sql, array($pref, $product_type_id));
+        }
+        return $result;
     }
 

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

@@ -225 +225 @@
 
     /**
+     * 配送先都道府県の配列を返す.
+     */
+    function getShippingPref() {
+        $results = array();
+        foreach ($_SESSION['shipping'] as $val) {
+            $results[] = $val['shipping_pref'];
+        }
+        return $results;
+    }
+
+    /**
      * 複数配送指定の購入かどうか.
      *
@@ -552 +563 @@
         $objQuery =& SC_Query::getSingletonInstance();
 
-        // 別のお届け先を指定が無ければ, お届け先に登録住所をコピー
-        /* FIXME
-        if ($orderParams['deliv_check'] == "-1") {
-            $keys = array('name01', 'name02', 'kana01', 'kana02', 'pref', 'zip01',
-                          'zip02', 'addr01', 'addr02', 'tel01', 'tel02', 'tel03');
-            foreach ($keys as $key) {
-                $orderParams['deliv_' . $key] = $orderParams['order_' . $key];
-            }
-        }
-        */
         // 不要な変数を unset
         $unsets = array('mailmaga_flg', 'deliv_check', 'point_check', 'password',

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -390 +390 @@
 
                 // お届け日の取得
-                $ts = strtotime($shipping["shipping_date"]);
-                $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts));
-                $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts);
-                $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts));
-                $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts);
-                $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts));
-                $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts);
+                if (!SC_Utils_Ex::isBlank($shipping["shipping_date"])) {
+                    $ts = strtotime($shipping["shipping_date"]);
+                    $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts));
+                    $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts);
+                    $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts));
+                    $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts);
+                    $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts));
+                    $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts);
+                }
 
                 // 配送内容の処理

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

@@ -111 +111 @@
 
         // カート集計を元に最終計算
-        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
-        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer, $tmpData['use_point'], $tmpData['deliv_pref'], $tmpData['payment_id'], $tmpData['charge'], $tmpData['discount']));
-        unset($arrData['deliv_fee']); // FIXME
+        // FIXME 使用ポイント, 手数料の扱い
+        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer, $tmpData['use_point'], $objPurchase->getShippingPref(), $tmpData['charge'], $tmpData['discount']));
+
         // 会員ログインチェック
         if($objCustomer->isLoginSuccess(true)) {

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

@@ -131 +131 @@
             SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true);
         }
-        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
-        $this->arrData = $objCartSess->calculate($this->cartKey, $objCustomer);
+        // FIXME 使用ポイント, 手数料の扱い
+        $this->arrData = $objCartSess->calculate($this->cartKey, $objCustomer, 0, $objPurchase->getShippingPref());
 
         // 購入金額の取得