Changeset 20787 for branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php

Timestamp:

2011/03/28 21:51:52 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20786

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/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

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3499

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/class/SC_CartSession.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-03-28 21:51:49.858000040 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-28T12:51:49.858000Z

Message:

#1200(複数配送業者登録時の送料計算が異常)

• /shopping/confirm.php でのみ, 送料計算を行うよう修正
• 送料の検索条件に配送業者IDを追加
• #410 も合わせて解決

File:

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

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

@@ -1172 +1172 @@
      *
      * @param integer|array $pref_id 都道府県ID 又は都道府県IDの配列
-     * @return string 指定の都道府県, 商品種別の配送料金
-     */
-    function sfGetDelivFee($pref_id, $product_type_id) {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        /*
-         * FIXME 都道府県が指定されていない場合は、東京都の番号を指定しておく
-         * http://svn.ec-cube.net/open_trac/ticket/410
-         */
-        if($pref_id == "") {
-            $pref_id = 13;
-        }
+     * @param integer $deliv_id 配送業者ID
+     * @return string 指定の都道府県, 配送業者の配送料金
+     */
+    function sfGetDelivFee($pref_id, $deliv_id = 0) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         if (!is_array($pref_id)) {
             $pref_id = array($pref_id);
         }
         $sql = <<< __EOS__
-            SELECT SUM(T1.fee) AS fee
+            SELECT 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 = ?
+             WHERE T1.pref = ?
+               AND T1.deliv_id = ?
                AND T2.del_flg = 0
 __EOS__;
-
         $result = 0;
         foreach ($pref_id as $pref) {
-            $result += $objQuery->getOne($sql, array($pref, $product_type_id));
+            $result += $objQuery->getOne($sql, array($pref, $deliv_id));
         }
         return $result;