Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php =================================================================== --- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 19805) +++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 19888) @@ -64,5 +64,4 @@ */ function action() { - //$objView = new SC_SiteView(); $objSess = new SC_Session(); $objCustomer = new SC_Customer(); @@ -87,6 +86,5 @@ } - //$objView->assignobj($this); - //$objView->display($this->tpl_mainpage); + $this->setTemplate('mypage/mail_view.tpl'); } Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php =================================================================== --- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 19881) +++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 19888) @@ -47,4 +47,5 @@ $this->tpl_mainno = 'mypage'; $this->tpl_mypageno = 'index'; + $this->tpl_subtitle = '購入履歴詳細'; $this->httpCacheControl('nocache'); $masterData = new SC_DB_MasterData_Ex(); @@ -100,4 +101,6 @@ //受注詳細データの取得 $this->arrDisp = $this->lfGetOrderData($orderId); + $this->arrShipping = $this->lfGetShippingData($orderId); + $this->isMultiple = count($this->arrShipping) > 1; // 支払い方法の取得 $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method"); @@ -199,11 +202,35 @@ // DBから受注情報を読み込む $objQuery = new SC_Query(); + /* $col = "order_id, create_date, payment_id, subtotal, tax, use_point, add_point, discount, "; $col .= "deliv_fee, charge, payment_total, deliv_name01, deliv_name02, deliv_kana01, deliv_kana02, "; $col .= "deliv_zip01, deliv_zip02, deliv_pref, deliv_addr01, deliv_addr02, deliv_tel01, deliv_tel02, deliv_tel03, deliv_time_id, deliv_date "; + */ $from = "dtb_order"; $where = "order_id = ?"; - $arrRet = $objQuery->select($col, $from, $where, array($orderId)); + $arrRet = $objQuery->select("*", $from, $where, array($orderId)); return $arrRet[0]; + } + + /** + * 配送情報の取得. + * TODO リファクタリング + */ + function lfGetShippingData($orderId) { + $objQuery =& SC_Query::getSingletonInstance(); + $objProduct = new SC_Product(); + $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($orderId)); + foreach (array_keys($arrRet) as $key) { + $arrItems = $objQuery->select("*", "dtb_shipment_item", "order_id = ? AND shipping_id = ?", + array($orderId, $arrRet[$key]['shipping_id'])); + foreach ($arrItems as $itemKey => $arrDetail) { + foreach ($arrDetail as $detailKey => $detailVal) { + $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']][$detailKey] = $detailVal; + } + + $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']]['productsClass'] =& $objProduct->getDetailAndProductsClass($arrDetail['product_class_id']); + } + } + return $arrRet; } Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php =================================================================== --- /branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php (revision 19872) +++ /branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php (revision 19888) @@ -198,5 +198,5 @@ $objProduct = new SC_Product(); if (empty($_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'])) { - $product = $objProduct->getDetailAndProductsClass($productClassId); + $product =& $objProduct->getDetailAndProductsClass($productClassId); $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'] = $product; } Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl =================================================================== --- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl (revision 19835) +++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl (revision 19888) @@ -126,44 +126,64 @@ + +
商品コード | +商品名 | +単価 | +数量 | + +
---|---|---|---|
+ | + + : + + + : + + |
+ + 円 + | ++ 円 + *}--> + |
▼お届け先 | -||||
---|---|---|---|---|
お名前 | - - -+ | |||
お名前(フリガナ) | - - -+ | |||
郵便番号 | - - -〒- | +〒- | ||
住所 | - - -+ | |||
電話番号 | - - - --- | +-- |