Ignore:
Timestamp:
2011/01/16 19:56:17 (11 years ago)
Author:
nanasess
bzr:base-revision:
nanasess@fsm.ne.jp-20110116062219-tpkgcgbv2y4kxl6r
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.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/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:

nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110116105610-cbdyux6eh8j902v3
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 nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/helper/SC_Helper_DB.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
data/class/pages/shopping/LC_Page_Shopping_Confirm.php nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20110116105415-kglfjf04e1qc1pjx
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(複数配送先の指定)

  • 送料計算を修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r19923 r19928  
    390390 
    391391                // お届け日の取得 
    392                 $ts = strtotime($shipping["shipping_date"]); 
    393                 $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts)); 
    394                 $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts); 
    395                 $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts)); 
    396                 $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts); 
    397                 $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts)); 
    398                 $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts); 
     392                if (!SC_Utils_Ex::isBlank($shipping["shipping_date"])) { 
     393                    $ts = strtotime($shipping["shipping_date"]); 
     394                    $this->objFormParam->setValue('shipping_date_year_' . $shipping['shipping_id'], date("Y", $ts)); 
     395                    $this->arrForm['shipping_date_year_' . $shipping['shipping_id']] = date("Y", $ts); 
     396                    $this->objFormParam->setValue('shipping_date_month_' . $shipping['shipping_id'], date("n", $ts)); 
     397                    $this->arrForm['shipping_date_month_' . $shipping['shipping_id']] = date("n", $ts); 
     398                    $this->objFormParam->setValue('shipping_date_day_' . $shipping['shipping_id'], date("j", $ts)); 
     399                    $this->arrForm['shipping_date_day_' . $shipping['shipping_id']] = date("j", $ts); 
     400                } 
    399401 
    400402                // 配送内容の処理 
Note: See TracChangeset for help on using the changeset viewer.