Changeset 19308

Timestamp:

2010/11/07 01:07:35 (13 years ago)

Author:

shutta

Message:

r19307 をマージ。

File:

• branches/camp/camp-2_5-E/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (modified) (1 diff)

branches/camp/camp-2_5-E/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

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