Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    r20764 r20787  
    116116                                                  $objPurchase->getShippingPref(), 
    117117                                                  $arrOrderTemp['charge'], 
    118                                                   $arrOrderTemp['discount']); 
     118                                                  $arrOrderTemp['discount'], 
     119                                                  $arrOrderTemp['deliv_id']); 
    119120        $this->arrForm = array_merge($arrOrderTemp, $arrCalcResults); 
    120121 
Note: See TracChangeset for help on using the changeset viewer.