Changeset 11152

Timestamp:

2006/12/23 21:35:16 (19 years ago)

Author:

uehara

Message:

 

File:

• temp/branches/ec-cube-beta/html/shopping/confirm.php (modified) (2 diffs)

temp/branches/ec-cube-beta/html/shopping/confirm.php

@@ -56 +56 @@
 $arrData = sfGetOrderTemp($uniqid);
 // ¥«¡¼¥È½¸·×¤ò¸µ¤ËºÇ½ª·×»»
-$arrData = sfTotalConfirm($arrData, $objPage, $objCartSess, $arrInfo, $objCustomer);
+$arrData = sfTotalConfirm($arrData, $objPage, $objCartSess, $arrInfo, $objCustomer, $objCampaignSess);
 // ¥­¥ã¥ó¥Ú¡¼¥ó¤«¤é¤ÎÁ«°Ü¤ÇÁ÷ÎÁ¤¬ÌµÎÁ¤À¤Ã¤¿¾ì¹ç¤Î½èÍý
 if($objCampaignSess->getIsCampaign()) {
@@ -62 +62 @@
     // Á÷ÎÁ̵ÎÁ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç
     if($deliv_free_flg) {
+        $arrData['total'] -= $arrData['deliv_fee'];
         $arrData['deliv_fee'] = 0;
     }