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

Timestamp:

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

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.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/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:

ohkouchi@loop-az.jp-20110328125011-rwo1m6kj40dwy218

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110328125149-07m97ky2xgd00rng

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 ohkouchi@loop-az.jp-20110328125011-rwo1m6kj40dwy218
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110328125011-rwo1m6kj40dwy218
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110328125011-rwo1m6kj40dwy218

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/SC_CartSession.php (modified) (2 diffs)

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

@@ -508 +508 @@
      * @param integer $charge 手数料
      * @param integer $discount 値引
+     * @param integer $deliv_id 配送業者ID
      * @return array カートの計算結果の配列
      */
     function calculate($productTypeId, &$objCustomer, $use_point = 0,
-                       $deliv_pref = "", $charge = 0, $discount = 0) {
+                       $deliv_pref = "", $charge = 0, $discount = 0, $deliv_id = 0) {
         $objDb = new SC_Helper_DB_Ex();
 
@@ -528 +529 @@
 
         // 配送業者の送料を加算
-        if (OPTION_DELIV_FEE == 1) {
-            $results['deliv_fee'] += $objDb->sfGetDelivFee($deliv_pref, $productTypeId);
+        if (OPTION_DELIV_FEE == 1
+            && !SC_Utils_Ex::isBlank($deliv_pref)
+            && !SC_Utils_Ex::isBlank($deliv_id)) {
+            $results['deliv_fee'] += $objDb->sfGetDelivFee($deliv_pref, $deliv_id);
         }