Changeset 19928 for branches/version-2_5-dev/data/class/pages

Timestamp:

2011/01/16 19:56:17 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.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
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2657

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_CartSession.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]

bzr:timestamp:

2011-01-16 19:56:10.862999916 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-16T10:56:10.863000Z

Message:

#843(複数配送先の指定)

• 送料計算を修正

Location:

branches/version-2_5-dev/data/class/pages

Files:

• admin/order/LC_Page_Admin_Order_Edit.php (modified) (1 diff)
• shopping/LC_Page_Shopping_Confirm.php (modified) (1 diff)
• shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -390 +390 @@
 
                 // お届け日の取得
-                $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);
+                }
 
                 // 配送内容の処理

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

@@ -111 +111 @@
 
         // カート集計を元に最終計算
-        // 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)) {

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -131 +131 @@
             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());
 
         // 購入金額の取得