Ignore:
Timestamp:
2011/01/16 01:20:36 (11 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19922
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
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_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
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
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110115162029-azxvx5ryjasawo2x
bzr:revno:
2652
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/Smarty/templates/default/shopping/confirm.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
bzr:timestamp:
2011-01-16 01:20:29.269999981 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-15T16:20:29.270000Z
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

    r19920 r19923  
    8585        $objSess = new SC_Session(); 
    8686        $objDb = new SC_Helper_DB_Ex(); 
    87         $objDate = new SC_Date(1901); 
    88         $this->arrYearDelivDate = $objDate->getYear('', date('Y'), ''); 
    89         $this->arrMonthDelivDate = $objDate->getMonth(true); 
    90         $this->arrDayDelivDate = $objDate->getDay(true); 
     87        $objDate = new SC_Date(1970); 
     88        $objPurchase = new SC_Helper_Purchase_Ex(); 
     89        $this->arrYearShippingDate = $objDate->getYear('', date('Y'), ''); 
     90        $this->arrMonthShippingDate = $objDate->getMonth(true); 
     91        $this->arrDayShippingDate = $objDate->getDay(true); 
    9192 
    9293        // パラメータ管理クラス 
     
    221222        // 支払い方法の取得 
    222223        $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method"); 
    223         // お届け時間の取得 
    224         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id')); 
    225         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time'); 
    226224 
    227225        $this->arrForm = $this->objFormParam->getFormParamList(); 
     226        // XXX 商品種別IDは0番目の配列を使用 
     227        $this->product_type_id = $this->arrForm['product_type_id']['value'][0]; 
     228        $this->arrDelivTime = $objPurchase->getDelivTime($this->product_type_id); 
    228229        $this->product_count = count($this->arrForm['quantity']['value']); 
    229230 
     
    290291 
    291292        // 受注詳細情報 
     293        $this->objFormParam->addParam("商品種別ID", "product_type_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); 
    292294        $this->objFormParam->addParam("単価", "price", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); 
    293295        $this->objFormParam->addParam("数量", "quantity", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); 
     
    336338            $this->objFormParam->addParam("電話番号2", "shipping_tel02_" . $shipping['shipping_id'], TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    337339            $this->objFormParam->addParam("電話番号3", "shipping_tel03_" . $shipping['shipping_id'], TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    338             $this->objFormParam->addParam("お届け時間ID", "deliv_time_id_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    339             $this->objFormParam->addParam("お届け時間", "deliv_time_" . $shipping['shipping_id']); 
    340             $this->objFormParam->addParam("お届け日", "deliv_date_" . $shipping['shipping_id'], STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
     340            $this->objFormParam->addParam("お届け時間ID", "time_id_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     341            $this->objFormParam->addParam("お届け時間", "shipping_time_" . $shipping['shipping_id']); 
     342            $this->objFormParam->addParam("お届け日(年)", "shipping_date_year_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     343            $this->objFormParam->addParam("お届け日(月)", "shipping_date_month_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     344            $this->objFormParam->addParam("お届け日(日)", "shipping_date_day_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     345            $this->objFormParam->addParam("お届け日", "shipping_date_" . $shipping['shipping_id'], STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    341346            $this->objFormParam->addParam("配送商品規格数", "shipping_product_quantity_" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    342347            foreach ($shipping['shipment_item'] as $productClassId => $item) { 
     
    378383            $this->objFormParam->setValue('shipping_quantity', $this->arrForm['shipping_quantity']); 
    379384 
     385            // 配送情報の処理 
    380386            foreach ($this->arrShipping as $shipping) { 
    381387 
    382388                $this->arrShippingIds[] = $shipping['shipping_id']; 
    383389                $this->arrProductClassIds[] = array_keys($shipping['shipment_item']); 
     390 
     391                // お届け日の取得 
     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); 
     399 
     400                // 配送内容の処理 
    384401                foreach ($shipping as $shippingKey => $shippingVal) { 
    385402 
     
    391408                                                  $this->arrForm['shipping_product_quantity' . '_' . $shipping['shipping_id']]); 
    392409 
     410                    // 配送商品の処理 
    393411                    foreach ($shipping['shipment_item'] as $productClassId => $item) { 
    394412                        foreach ($item as $itemKey => $itemVal) { 
     
    417435    function lfGetOrderDetail($order_id) { 
    418436        $objQuery = new SC_Query(); 
    419         $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; 
    420         $where = "order_id = ?"; 
    421         $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id)); 
     437        $from = <<< __EOS__ 
     438                 dtb_order_detail T1 
     439            JOIN dtb_products_class T2 
     440              ON T1.product_class_id = T2.product_class_id 
     441__EOS__; 
     442        $arrRet = $objQuery->select("T1.*, T2.product_type_id", $from, 
     443                                    "order_id = ?", array($order_id)); 
    422444        return $arrRet; 
    423445    } 
Note: See TracChangeset for help on using the changeset viewer.