Changeset 18827 for branches/version-2_5-dev/data
- Timestamp:
- 2010/09/27 14:24:56 (14 years ago)
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
r18819 r18827 63 63 <!--{ if $orderDetail.down == "2"}--> 64 64 <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}--> 65 <a target="_self" href="<!--{$smarty.const.URL_DIR}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->& classcategory_id1=<!--{$orderDetail.classcategory_id1}-->&classcategory_id2=<!--{$orderDetail.classcategory_id2}-->">ダウンロード</a>65 <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> 66 66 <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}--> 67 67 ダウンロード商品<BR />(入金確認中) -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
r18824 r18827 228 228 $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 229 $col .= ",o.status AS status, pc.down AS down, o.payment_date AS payment_date, od.product_class_id as product_class_id, "; 230 $col .= $dbFactory->getDownloadableDaysWhereSql( "o");230 $col .= $dbFactory->getDownloadableDaysWhereSql(); 231 231 $col .= " AS effective"; 232 233 232 $where = "p.product_id = od.product_id AND pc.product_id = od.product_id AND pc.product_class_id = od.product_class_id AND od.order_id = o.order_id AND od.order_id = ?"; 234 $arrRet = $objQuery->select($col, "dtb_products p, dtb_products_class pc, dtb_order_detail od, dtb_order o", $where );233 $arrRet = $objQuery->select($col, "dtb_products p, dtb_products_class pc, dtb_order_detail od, dtb_order o", $where,array($orderId)); 235 234 return $arrRet; 236 235 } -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php
r18824 r18827 140 140 function lfGetOrderDetail($order_id) { 141 141 $objQuery = new SC_Query(); 142 $col = "product_id, product_c ode, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate";142 $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; 143 143 $where = "order_id = ?"; 144 144 $objQuery->setOrder("product_class_id"); -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
r18701 r18827 65 65 for($num = 0; $num < count($arrDisp); $num++) { 66 66 $product_id = $arrDisp[$num]['product_id']; 67 $product_class_id = $arrDisp[$num]['product_class_id']; 67 68 $cate_id1 = $arrDisp[$num]['classcategory_id1']; 68 69 $cate_id2 = $arrDisp[$num]['classcategory_id2']; 69 70 $quantity = $arrDisp[$num]['quantity']; 70 71 71 $objCartSess->addProduct(array($product_id, $ cate_id1, $cate_id2), $quantity);72 $objCartSess->addProduct(array($product_id, $product_class_id, $cate_id1, $cate_id2), $quantity); 72 73 } 73 74 $this->sendRedirect($this->getLocation(URL_CART_TOP)); … … 102 103 for($num = 0; $num < count($arrDisp); $num++) { 103 104 $product_id = $arrDisp[$num]['product_id']; 105 $product_class_id = $arrDisp[$num]['product_class_id']; 104 106 $cate_id1 = $arrDisp[$num]['classcategory_id1']; 105 107 $cate_id2 = $arrDisp[$num]['classcategory_id2']; 106 108 $quantity = $arrDisp[$num]['quantity']; 107 109 108 $objCartSess->addProduct(array($product_id, $ cate_id1, $cate_id2), $quantity);110 $objCartSess->addProduct(array($product_id, $product_class_id, $cate_id1, $cate_id2), $quantity); 109 111 } 110 112 $this->sendRedirect($this->getLocation(MOBILE_URL_CART_TOP), true); … … 128 130 $order_count = $objQuery->count("dtb_order", "order_id = ? and customer_id = ?", array($order_id, $customer_id)); 129 131 if ($order_count != 1) return array(); 130 $col = "product_id, classcategory_id1, classcategory_id2, quantity";132 $col = "product_id, product_class_id, quantity"; 131 133 $where = "order_id = ?"; 132 $objQuery->setOrder(" classcategory_id1, classcategory_id2");134 $objQuery->setOrder("product_class_id"); 133 135 $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id)); 134 136 return $arrRet; 135 137 } 136 138 137 139 } 138 140 ?>
Note: See TracChangeset
for help on using the changeset viewer.