Changeset 19888


Ignore:
Timestamp:
2011/01/12 14:50:04 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19887
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/mypage/history.tpl 15743@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmypage%2Fhistory.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/class/pages/mypage/LC_Page_Mypage_MailView.php 17922@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_MailView.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/user_data/packages/default/css/mypage.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Fmypage.css
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110112054950-jwre6p1cx9u3lzaf
bzr:revno:
2617
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/default/mypage/history.tpl ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
data/class/pages/mypage/LC_Page_Mypage_History.php ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
data/class/pages/mypage/LC_Page_Mypage_MailView.php ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
html/user_data/packages/default/css/mypage.css ohkouchi@loop-az.jp-20110112054815-8xv37us7nnr1h4de
bzr:timestamp:
2011-01-12 14:49:50.160000086 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-12T05:49:50.160000Z
Message:

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

  • Myページ/購入履歴詳細を対応
Location:
branches/version-2_5-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl

    r19835 r19888  
    126126        <!-- 使用ポイントここまで --> 
    127127 
     128        <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}--> 
     129        <h4>お届け先<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h4> 
     130        <!--{if $isMultiple}--> 
     131            <table summary="お届け内容確認"> 
     132              <tr> 
     133                <th>商品コード</th> 
     134                <th>商品名</th> 
     135                <th>単価</th> 
     136                <th>数量</th> 
     137                <!--{* XXX 購入小計と誤差が出るためコメントアウト 
     138                <th>小計</th> 
     139                *}--> 
     140              </tr> 
     141              <!--{foreach item=item from=$shippingItem.shipment_item}--> 
     142                  <tr> 
     143                      <td><!--{$item.product_code|h}--></td> 
     144                      <td><!--{* 商品名 *}--><!--{$item.productsClass.name|h}--><br /> 
     145                          <!--{if $item.productsClass.classcategory_name1 != ""}--> 
     146                              <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br /> 
     147                          <!--{/if}--> 
     148                          <!--{if $item.productsClass.classcategory_name2 != ""}--> 
     149                              <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--> 
     150                          <!--{/if}--> 
     151                      </td> 
     152                      <td class="pricetd"> 
     153                          <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 
     154                      </td> 
     155                      <td id="quantity"><!--{$item.quantity}--></td> 
     156                      <!--{* XXX 購入小計と誤差が出るためコメントアウト 
     157                      <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td> 
     158                      *}--> 
     159                  </tr> 
     160              <!--{/foreach}--> 
     161            </table> 
     162         <!--{/if}--> 
    128163        <table summary="お届け先" class="delivname"> 
    129             <thead> 
    130                 <tr> 
    131                     <th colspan="5">▼お届け先</th> 
    132                 </tr> 
    133             </thead> 
    134164            <tbody> 
    135165                <tr> 
    136166                    <th>お名前</th> 
    137                     <!--{assign var=key1 value="deliv_name01"}--> 
    138                     <!--{assign var=key2 value="deliv_name02"}--> 
    139                     <td><!--{$arrDisp[$key1]|h}-->&nbsp;<!--{$arrDisp[$key2]|h}--></td> 
     167                    <td><!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--></td> 
    140168                </tr> 
    141169                <tr> 
    142170                    <th>お名前(フリガナ)</th> 
    143                     <!--{assign var=key1 value="deliv_kana01"}--> 
    144                     <!--{assign var=key2 value="deliv_kana02"}--> 
    145                     <td><!--{$arrDisp[$key1]|h}-->&nbsp;<!--{$arrDisp[$key2]|h}--></td> 
     171                    <td><!--{$shippingItem.shipping_kana01|h}-->&nbsp;<!--{$shippingItem.shipping_kana02|h}--></td> 
    146172                </tr> 
    147173                <tr> 
    148174                    <th>郵便番号</th> 
    149                     <!--{assign var=key1 value="deliv_zip01"}--> 
    150                     <!--{assign var=key2 value="deliv_zip02"}--> 
    151                     <td>〒<!--{$arrDisp[$key1]}-->-<!--{$arrDisp[$key2]}--></td> 
     175                    <td>〒<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--></td> 
    152176                </tr> 
    153177                <tr> 
    154178                    <th>住所</th> 
    155                     <!--{assign var=pref value=`$arrDisp.deliv_pref`}--> 
    156                     <!--{assign var=key value="deliv_addr01"}--> 
    157                     <td><!--{$arrPref[$pref]}--><!--{$arrDisp[$key]|h}--><!--{assign var=key value="deliv_addr02"}--><!--{$arrDisp[$key]|h}--></td> 
     179                    <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td> 
    158180                </tr> 
    159181                <tr> 
    160182                    <th>電話番号</th> 
    161                     <!--{assign var=key1 value="deliv_tel01"}--> 
    162                     <!--{assign var=key2 value="deliv_tel02"}--> 
    163                     <!--{assign var=key3 value="deliv_tel03"}--> 
    164                     <td><!--{$arrDisp[$key1]}-->-<!--{$arrDisp[$key2]}-->-<!--{$arrDisp[$key3]}--></td> 
     183                    <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td> 
    165184                </tr> 
    166185            </tbody> 
    167186        </table> 
     187        <!--{/foreach}--> 
    168188 
    169189        <br /> 

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

    r19872 r19888  
    198198        $objProduct = new SC_Product(); 
    199199        if (empty($_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'])) { 
    200             $product = $objProduct->getDetailAndProductsClass($productClassId); 
     200            $product =& $objProduct->getDetailAndProductsClass($productClassId); 
    201201            $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'] = $product; 
    202202        } 

  • branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php

    r19881 r19888  
    4747        $this->tpl_mainno = 'mypage'; 
    4848        $this->tpl_mypageno = 'index'; 
     49        $this->tpl_subtitle = '購入履歴詳細'; 
    4950        $this->httpCacheControl('nocache'); 
    5051        $masterData = new SC_DB_MasterData_Ex(); 
    … …  
    100101        //受注詳細データの取得 
    101102        $this->arrDisp = $this->lfGetOrderData($orderId); 
     103        $this->arrShipping = $this->lfGetShippingData($orderId); 
     104        $this->isMultiple = count($this->arrShipping) > 1; 
    102105        // 支払い方法の取得 
    103106        $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method"); 
    … …  
    199202        // DBから受注情報を読み込む 
    200203        $objQuery = new SC_Query(); 
     204        /* 
    201205        $col = "order_id, create_date, payment_id, subtotal, tax, use_point, add_point, discount, "; 
    202206        $col .= "deliv_fee, charge, payment_total, deliv_name01, deliv_name02, deliv_kana01, deliv_kana02, "; 
    203207        $col .= "deliv_zip01, deliv_zip02, deliv_pref, deliv_addr01, deliv_addr02, deliv_tel01, deliv_tel02, deliv_tel03, deliv_time_id, deliv_date "; 
     208        */ 
    204209        $from = "dtb_order"; 
    205210        $where = "order_id = ?"; 
    206         $arrRet = $objQuery->select($col, $from, $where, array($orderId)); 
     211        $arrRet = $objQuery->select("*", $from, $where, array($orderId)); 
    207212        return $arrRet[0]; 
     213    } 
     214 
     215    /** 
     216     * 配送情報の取得. 
     217     * TODO リファクタリング 
     218     */ 
     219    function lfGetShippingData($orderId) { 
     220        $objQuery =& SC_Query::getSingletonInstance(); 
     221        $objProduct = new SC_Product(); 
     222        $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($orderId)); 
     223        foreach (array_keys($arrRet) as $key) { 
     224            $arrItems = $objQuery->select("*", "dtb_shipment_item", "order_id = ? AND shipping_id = ?", 
     225                                       array($orderId, $arrRet[$key]['shipping_id'])); 
     226            foreach ($arrItems as $itemKey => $arrDetail) { 
     227                foreach ($arrDetail as $detailKey => $detailVal) { 
     228                    $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']][$detailKey] = $detailVal; 
     229                } 
     230 
     231                $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']]['productsClass'] =& $objProduct->getDetailAndProductsClass($arrDetail['product_class_id']); 
     232            } 
     233        } 
     234        return $arrRet; 
    208235    } 
    209236 

  • branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php

    r19805 r19888  
    6464     */ 
    6565    function action() { 
    66         //$objView = new SC_SiteView(); 
    6766        $objSess = new SC_Session(); 
    6867        $objCustomer = new SC_Customer(); 
    … …  
    8786        } 
    8887 
    89         //$objView->assignobj($this); 
    90         //$objView->display($this->tpl_mainpage); 
     88        $this->setTemplate('mypage/mail_view.tpl'); 
    9189    } 
    9290 

  • branches/version-2_5-dev/html/user_data/packages/default/css/mypage.css

    r17519 r19888  
    1919    background-color: #f1f1ec; 
    2020    letter-spacing: 0.15em; 
     21} 
     22 
     23div#mypagecolumn h4 { 
     24    margin: 10px auto; 
     25    font-size: 120%; 
     26    border-bottom: 1px solid #999; 
     27    text-align: left; 
    2128} 
    2229 
Note: See TracChangeset for help on using the changeset viewer.