Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 19912)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 19928)
@@ -111,7 +111,7 @@
 
         // カート集計を元に最終計算
-        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
-        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer, $tmpData['use_point'], $tmpData['deliv_pref'], $tmpData['payment_id'], $tmpData['charge'], $tmpData['discount']));
-        unset($arrData['deliv_fee']); // FIXME
+        // FIXME 使用ポイント, 手数料の扱い
+        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer, $tmpData['use_point'], $objPurchase->getShippingPref(), $tmpData['charge'], $tmpData['discount']));
+
         // 会員ログインチェック
         if($objCustomer->isLoginSuccess(true)) {
Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 19926)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 19928)
@@ -131,6 +131,6 @@
             SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true);
         }
-        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
-        $this->arrData = $objCartSess->calculate($this->cartKey, $objCustomer);
+        // FIXME 使用ポイント, 手数料の扱い
+        $this->arrData = $objCartSess->calculate($this->cartKey, $objCustomer, 0, $objPurchase->getShippingPref());
 
         // 購入金額の取得
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 19923)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 19928)
@@ -390,11 +390,13 @@
 
                 // お届け日の取得
-                $ts = strtotime($shipping["shipping_date"]);
-                $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts));
-                $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts);
-                $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts));
-                $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts);
-                $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts));
-                $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts);
+                if (!SC_Utils_Ex::isBlank($shipping["shipping_date"])) {
+                    $ts = strtotime($shipping["shipping_date"]);
+                    $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts));
+                    $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts);
+                    $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts));
+                    $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts);
+                    $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts));
+                    $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts);
+                }
 
                 // 配送内容の処理