Changeset 19659


Ignore:
Timestamp:
2010/11/08 11:12:58 (11 years ago)
Author:
eccuore
Message:

#823 商品種別によってカートを分ける 注文履歴詳細でのエラー解消

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

Legend:

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

    r18853 r19659  
    5151                <th>商品コード</th> 
    5252                <th>商品名</th> 
    53                 <th>配送商品/ダウンロード</th> 
     53                <th>商品種別</th> 
    5454                <th>単価</th> 
    5555                <th>数量</th> 
     
    6161                    <td><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$orderDetail.product_id|escape:url}-->"<!--{/if}-->><!--{$orderDetail.product_name|escape}--></a></td> 
    6262                    <td> 
    63                     <!--{ if $orderDetail.down == "2"}--> 
     63                    <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}--> 
    6464                        <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}--> 
    6565                            <a target="_self" href="<!--{$smarty.const.URL_DIR}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a> 
     
    6969                            ダウンロード商品<BR />(期限切れ) 
    7070                        <!--{ /if }--> 
    71                     <!--{ else }--> 
    72                             配送商品 
     71                    <!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}--> 
     72                            通常商品 
    7373                    <!--{ /if }--> 
    7474                    </td> 
  • branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php

    r18827 r19659  
    227227        $col .= "od.classcategory_name2 AS classcategory_name2, od.price AS price, od.quantity AS quantity, od.point_rate AS point_rate"; 
    228228        $col .= ",CASE WHEN EXISTS(SELECT * FROM dtb_products WHERE product_id = od.product_id AND del_flg = 0 AND status = 1) THEN '1' ELSE '0' END AS enable"; 
    229         $col .= ",o.status AS status, pc.down AS down, o.payment_date AS payment_date, od.product_class_id as product_class_id, "; 
     229        $col .= ",o.status AS status, pc.product_type_id AS product_type_id, o.payment_date AS payment_date, od.product_class_id as product_class_id, "; 
    230230        $col .= $dbFactory->getDownloadableDaysWhereSql(); 
    231231        $col .= " AS effective"; 
Note: See TracChangeset for help on using the changeset viewer.