Changeset 19659

Timestamp:

2010/11/08 11:12:58 (13 years ago)

Author:

eccuore

Message:

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

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/default/mypage/history.tpl (modified) (3 diffs)
• class/pages/mypage/LC_Page_Mypage_History.php (modified) (1 diff)

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

@@ -51 +51 @@
                 <th>商品コード</th>
                 <th>商品名</th>
-                <th>配送商品/ダウンロード</th>
+                <th>商品種別</th>
                 <th>単価</th>
                 <th>数量</th>
@@ -61 +61 @@
                     <td><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$orderDetail.product_id|escape:url}-->"<!--{/if}-->><!--{$orderDetail.product_name|escape}--></a></td>
                     <td>
-                    <!--{ if $orderDetail.down == "2"}-->
+                    <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
                         <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
                             <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>
@@ -69 +69 @@
                             ダウンロード商品<BR />（期限切れ）
                         <!--{ /if }-->
-                    <!--{ else }-->
-                            配送商品
+                    <!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
+                            通常商品
                     <!--{ /if }-->
                     </td>

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

@@ -227 +227 @@
         $col .= "od.classcategory_name2 AS classcategory_name2, od.price AS price, od.quantity AS quantity, od.point_rate AS point_rate";
         $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";
-        $col .= ",o.status AS status, pc.down AS down, o.payment_date AS payment_date, od.product_class_id as product_class_id, ";
+        $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, ";
         $col .= $dbFactory->getDownloadableDaysWhereSql();
         $col .= " AS effective";