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

Timestamp:

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

Author:

nanasess

bzr:base-revision:

nanasess@fsm.ne.jp-20110116062219-tpkgcgbv2y4kxl6r

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

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:

nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110116105610-cbdyux6eh8j902v3

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 nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/helper/SC_Helper_DB.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/pages/shopping/LC_Page_Shopping_Confirm.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx

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(複数配送先の指定)

• 送料計算を修正

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php (modified) (1 diff)

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;
     }