Changeset 19926


Ignore:
Timestamp:
2011/01/16 14:16:26 (10 years ago)
Author:
nanasess
bzr:base-revision:
nanasess@fsm.ne.jp-20110116040657-2h3dglqgirth230h
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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-20110116051325-wvwnjom5zt481mp9
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110116051621-bzu2wxdp0g4vfscr
bzr:revno:
2655
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110116051325-wvwnjom5zt481mp9
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110116051325-wvwnjom5zt481mp9
bzr:timestamp:
2011-01-16 14:16:21.371999979 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-16T05:16:21.372000Z
Message:

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

  • PostgreSQL で DBエラーになっていたのを修正
  • 配送情報がマージされなくなっていたのを修正
Location:
branches/version-2_5-dev/data/class
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

    r19923 r19926  
    482482            } 
    483483 
     484            // 配送日付を timestamp に変換 
     485            if (!SC_Utils_Ex::isBlank($sqlval['shipping_date'])) { 
     486                $d = mb_strcut($sqlval["shipping_date"], 0, 10); 
     487                $arrDate = split("/", $d); 
     488                $ts = mktime(0, 0, 0, $arrDate[1], $arrDate[2], $arrDate[0]); 
     489                $sqlval['shipping_date'] = date("Y-m-d", $ts); 
     490            } 
     491 
    484492            $sqlval['order_id'] = $orderId; 
    485493            $sqlval['shipping_id'] = $shipping_id; 
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

    r19923 r19926  
    113113                                                                array($other_deliv_id)); 
    114114                                foreach ($otherDeliv[0] as $key => $val) { 
    115                                     $sqlval[$i]['shipping_' . $key] = $val; 
     115                                    $sqlval[$other_deliv_id]['shipping_' . $key] = $val; 
    116116                                } 
    117117                            } else { 
    118                                 $objPurchase->copyFromCustomer($sqlval[$i], $objCustomer, 
     118                                $objPurchase->copyFromCustomer($sqlval[0], $objCustomer, 
    119119                                                               "shipping"); 
    120120                            } 
    121121                        } 
    122                         $sqlval[$i]['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 
    123                         $objPurchase->setShipmentItemTemp($i, $params['product_class_id' . $i], $params['quantity' . $i]); 
     122                        $sqlval[$other_deliv_id]['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 
     123                        $objPurchase->setShipmentItemTemp($other_deliv_id, $params['product_class_id' . $i], $params['quantity' . $i]); 
    124124                        $i++; 
    125125                    } 
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r19923 r19926  
    152152                foreach (array_keys($_SESSION['shipping']) as $key) { 
    153153                    $timeId = $this->objFormParam->getValue('deliv_time_id' . $key); 
     154                    /* TODO 
     155                     * SC_Purchase::getShippingTemp() で取得して, 
     156                     * リファレンスで代入すると, セッションに添字を追加できない? 
     157                     */ 
    154158                    $_SESSION['shipping'][$key]['time_id'] = $timeId; 
    155159                    $_SESSION['shipping'][$key]['shipping_time'] = $this->arrDelivTime[$timeId]; 
    156                     // XXX 文字列を代入しておいてもDBで自動変換可能? 
    157160                    $_SESSION['shipping'][$key]['shipping_date'] = $this->objFormParam->getValue('deliv_date' . $key); 
    158161                } 
Note: See TracChangeset for help on using the changeset viewer.