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

Timestamp:

2011/02/15 16:43:52 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20166

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.php
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_PGSQL.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
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/plugin/bingo/SC_Plugin_bingo.php 19521@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fplugin%2Fbingo%2FSC_Plugin_bingo.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110215074339-73417ne1tgkich66

bzr:revno:

2895

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Query.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/class/pages/mypage/LC_Page_Mypage_History.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l
data/plugin/bingo/SC_Plugin_bingo.php ohkouchi@loop-az.jp-20110215074124-badwi2srn94are2l

bzr:timestamp:

2011-02-15 16:43:39.124000072 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-15T07:43:39.124000Z

Message:

#981([フロント]MYページ)

• 受注取得処理を抽象化

#642(共通ロジックの機能向上)

• SC_Query::extractOnlyColsOf() を追加

#628(未使用処理・定義などの削除)

• SC_Helper_DB クラスの未使用関数を削除

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

@@ -70 +70 @@
         $objCustomer    = new SC_Customer();
         $objDb          = new SC_Helper_DB_Ex();
+        $objPurchase = new SC_Helper_Purchase_Ex();
 
         if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
@@ -76 +77 @@
 
         $order_id        = $_GET['order_id'];
-        $arrOrderData   = $this->lfGetOrderData($objCustomer->getValue('customer_id'), $order_id);
 
-        if (empty($arrOrderData)){
+        //受注データの取得
+        $this->tpl_arrOrderData = $objPurchase->getOrder($order_id, $objCustomer->getValue('customer_id'));
+
+        if (empty($this->tpl_arrOrderData)){
             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
         }
 
-        //受注詳細データの取得
-        $this->tpl_arrOrderData = $arrOrderData[0];
+        $this->arrShipping      = $objPurchase->getShippings($order_id);
 
-        $this->arrShipping      = $objDb->sfGetShippingData($order_id);
         $this->isMultiple       = count($this->arrShipping) > 1;
         // 支払い方法の取得
         $this->arrPayment       = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-        // お届け時間の取得
-        $this->arrDelivTime     = SC_Utils_Ex::sfArrKeyValue($objDb->sfGetDelivTime($this->tpl_arrOrderData['payment_id']),
-                                                            'time_id',
-                                                            'deliv_time');
+        // FIXME お届け時間の取得
+        //$this->arrDelivTime     = $objPurchase->getDelivTime($this->tpl_arrOrderData['deliv_id']);
         // 受注商品明細の取得
-        $this->tpl_arrOrderDetail = $this->lfGetOrderDetail($order_id);
+        $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
         // 受注メール送信履歴の取得
         $this->tpl_arrMailHistory = $this->lfGetMailHistory($order_id);
@@ -107 +106 @@
     function destroy() {
         parent::destroy();
-    }
-
-    /**
-     * 受注の取得
-     *
-     * @param integer $orderId 注文番号
-     * @return array 受注の内容
-     */
-    function lfGetOrderData($customer_id, $order_id) {
-        // DBから受注情報を読み込む
-        $objQuery   =& SC_Query::getSingletonInstance();
-        $from       = "dtb_order";
-        $where      = "del_flg = 0 AND customer_id = ? AND order_id = ?";
-        return $objQuery->select("*", $from, $where, array($customer_id, $order_id));
-    }
-
-    /**
-     * 受注商品明細の取得
-     *
-     * @param integer $orderId 注文番号
-     * @return array 受注商品明細の内容
-     */
-    function lfGetOrderDetail($order_id) {
-        $objQuery   =& SC_Query::getSingletonInstance();
-        $dbFactory  = SC_DB_DBFactory_Ex::getInstance();
-
-        $col    = "
-            od.product_id AS product_id,
-            od.product_code AS product_code,
-            od.product_name AS product_name,
-            od.classcategory_name1 AS classcategory_name1,
-            od.classcategory_name2 AS classcategory_name2,
-            od.price AS price,
-            od.quantity AS quantity,
-            od.point_rate AS point_rate
-            ,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
-            ,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,
-            ".$dbFactory->getDownloadableDaysWhereSql()."
-            AS effective";
-
-        $from   = "dtb_products p, dtb_products_class pc, dtb_order_detail od, dtb_order o";
-        $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 = ?";
-
-        return $objQuery->select($col, $from, $where, array($order_id));
     }