Changeset 20655


Ignore:
Timestamp:
2011/03/15 20:58:58 (10 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20110315105126-vmzyt0zzleo4o32t
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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:

ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110315115854-q35ywgm2xkdhufev
bzr:revno:
3375
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/mobile/shopping/payment.tpl ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110315115537-3ed83ki0om9cx9u1
bzr:timestamp:
2011-03-15 20:58:54.572000027 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-03-15T11:58:54.572000Z
Message:

#1141 (複数お届け先がある場合に、お届け日・お届け時間が正常に指定できない)

  • shipping_id を, select[name] で使用するよう修正

複数配送購入の場合, 受注詳細に商品コードが登録されなかったのを修正

Location:
branches/version-2_5-dev/data
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl

    r20651 r20655  
    207207            <p class="non-select-msg">まずはじめに、配送方法を選択ください。</p> 
    208208            <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}--> 
    209             <!--{assign var=index value=$smarty.foreach.shippingItem.index}--> 
     209            <!--{assign var=index value=$shippingItem.shipping_id}--> 
    210210            <div class="delivdate top"> 
    211211                <!--★お届け日★--> 
  • branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/payment.tpl

    r20614 r20655  
    4343■お届け時間の指定<br> 
    4444<!--{foreach item=shippingItem name=shippingItem from=$arrShipping}--> 
    45 <!--{assign var=index value=$smarty.foreach.shippingItem.index}--> 
     45<!--{assign var=index value=$shippingItem.shipping_id}--> 
    4646 
    4747<!--{if $is_multiple}--> 
  • branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl

    r20614 r20655  
    200200                <p class="non-select-msg">まずはじめに、配送方法を選択ください。</p> 
    201201                <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}--> 
    202                 <!--{assign var=index value=$smarty.foreach.shippingItem.index}--> 
     202                <!--{assign var=index value=$shippingItem.shipping_id}--> 
    203203                <!--{if $is_multiple}--> 
    204204                <div class="delivdate"> 
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

    r20650 r20655  
    587587 
    588588            $code = SC_Utils_Ex::isBlank($arrValues['product_code']) 
    589                 ? $d['code'] 
     589                ? $d['product_code'] 
    590590                : $arrValues['product_code']; 
    591591 
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r20538 r20655  
    8383        // カートの情報を取得 
    8484        $this->arrShipping =& $objPurchase->getShippingTemp(); 
    85         $shipping_vol = count($this->arrShipping); 
    8685 
    8786        $this->is_multiple = $objPurchase->isMultiple(); 
     
    131130         */ 
    132131        case 'select_deliv': 
    133             $this->setFormParams($objFormParam, $_POST, true, $shipping_vol); 
     132            $this->setFormParams($objFormParam, $_POST, true, $this->arrShipping); 
    134133 
    135134            $arrErr = $objFormParam->checkError(); 
     
    154153        case 'confirm': 
    155154            // パラメータ情報の初期化 
    156             $this->setFormParams($objFormParam, $_POST, false, $shipping_vol); 
     155            $this->setFormParams($objFormParam, $_POST, false, $this->arrShipping); 
    157156 
    158157            $deliv_id = $objFormParam->getValue('deliv_id'); 
     
    190189        default: 
    191190            // FIXME 前のページから戻ってきた場合は別パラメータ(mode)で処理分岐する必要があるのかもしれない 
    192             $this->setFormParams($objFormParam, $arrOrderTemp, false, $shipping_vol); 
     191            $this->setFormParams($objFormParam, $arrOrderTemp, false, $this->arrShipping); 
    193192 
    194193            if (!$this->is_single_deliv) { 
     
    202201                $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id); 
    203202                $this->arrPayment = $arrSelectedDeliv['arrPayment']; 
    204                 // XXX セッションからデフォルト値を取得する必要あり 
    205203                $this->arrDelivTime = $arrSelectedDeliv['arrDelivTime']; 
    206204                $this->img_show = $arrSelectedDeliv['img_show']; 
     
    232230     * @param array $arrParam 設定する値の配列 
    233231     * @param boolean $deliv_only deliv_id チェックのみの場合 true 
    234      * @param integer $shipping_vol 配送数 
    235      */ 
    236     function setFormParams(&$objFormParam, $arrParam, $deliv_only, $shipping_vol) { 
    237         $this->lfInitParam($objFormParam, $deliv_only, $shipping_vol); 
     232     * @param array $arrShipping 配送先情報の配列 
     233     */ 
     234    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping) { 
     235        $this->lfInitParam($objFormParam, $deliv_only, $arrShipping); 
    238236        $objFormParam->setParam($arrParam); 
    239237        $objFormParam->convParam(); 
     
    245243     * @param SC_FormParam $objFormParam SC_FormParam インスタンス 
    246244     * @param boolean $deliv_only deliv_id チェックのみの場合 true 
    247      * @param integer $shipping_vol 配送数 
    248      * @return void 
    249      */ 
    250     function lfInitParam(&$objFormParam, $deliv_only, $shipping_vol) { 
     245     * @param array $arrShipping 配送先情報の配列 
     246     * @return void 
     247     */ 
     248    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) { 
    251249        $objFormParam->addParam("配送業者", "deliv_id", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 
    252250 
     
    257255            $objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2'); 
    258256 
    259             for ($i = 0; $i < $shipping_vol; $i++) { 
    260                 $objFormParam->addParam("お届け時間", "deliv_time_id" . $i, INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    261                 $objFormParam->addParam("お届け日", "deliv_date" . $i, STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK")); 
     257            foreach ($arrShipping as $val) { 
     258                $objFormParam->addParam("お届け時間", "deliv_time_id" . $val['shipping_id'], INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     259                $objFormParam->addParam("お届け日", "deliv_date" . $val['shipping_id'], STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK")); 
    262260            } 
    263261        } 
     
    316314         */ 
    317315        foreach (array_keys($_SESSION['shipping']) as $key) { 
    318  
    319             $time_id = $objFormParam->getValue('deliv_time_id' . $key); 
    320  
     316            $shipping_id = $_SESSION['shipping'][$key]['shipping_id']; 
     317            $time_id = $objFormParam->getValue('deliv_time_id' . $shipping_id); 
    321318            $_SESSION['shipping'][$key]['deliv_id'] = $deliv_id; 
    322319            $_SESSION['shipping'][$key]['time_id'] = $time_id; 
    323320            $_SESSION['shipping'][$key]['shipping_time'] = $arrDelivTime[$time_id]; 
    324             $_SESSION['shipping'][$key]['shipping_date'] = $objFormParam->getValue('deliv_date' . $key); 
     321            $_SESSION['shipping'][$key]['shipping_date'] = $objFormParam->getValue('deliv_date' . $shipping_id); 
    325322        } 
    326323    } 
Note: See TracChangeset for help on using the changeset viewer.