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

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ページ/購入履歴詳細を対応

File:

• branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (modified) (3 diffs)

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

@@ -47 +47 @@
         $this->tpl_mainno = 'mypage';
         $this->tpl_mypageno = 'index';
+        $this->tpl_subtitle = '購入履歴詳細';
         $this->httpCacheControl('nocache');
         $masterData = new SC_DB_MasterData_Ex();
@@ -100 +101 @@
         //受注詳細データの取得
         $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 +202 @@
         // 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;
     }