Changeset 22796 for branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

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

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

@@ -32 +32 @@
  * @version $Id$
  */
-class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43 +42 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mypageno     = 'index';
@@ -62 +60 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -72 +69 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
         $objDb          = new SC_Helper_DB_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
-        $objProduct  = new SC_Product();
 
         if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
@@ -84 +79 @@
         }
 
-        $order_id               = $_GET['order_id'];
-        $this->is_price_change  = false;
+        $order_id        = $_GET['order_id'];
 
         //受注データの取得
@@ -98 +92 @@
         $this->isMultiple       = count($this->arrShipping) > 1;
         // 支払い方法の取得
-        $this->arrPayment       = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment       = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         // 受注商品明細の取得
         $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
-        foreach ($this->tpl_arrOrderDetail as $product_index => $arrOrderProductDetail) {
-            //必要なのは商品の販売金額のみなので、遅い場合は、別途SQL作成した方が良い
-            $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']); 
-            if($this->tpl_arrOrderDetail[$product_index]['price'] != $arrTempProductDetail['price02']) {
-                $this->is_price_change = true;
-            }
-            $this->tpl_arrOrderDetail[$product_index]['product_price'] = ($arrTempProductDetail['price02'])?$arrTempProductDetail['price02']:0;
-        }
-        
         $this->tpl_arrOrderDetail = $this->setMainListImage($this->tpl_arrOrderDetail);
         $objPurchase->setDownloadableFlgTo($this->tpl_arrOrderDetail);
@@ -125 +110 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -136 +120 @@
      * @return array 受注メール送信履歴の内容
      */
-    function lfGetMailHistory($order_id)
-    {
+    function lfGetMailHistory($order_id) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $col        = 'send_date, subject, template_id, send_id';
@@ -153 +136 @@
      * @return array お届け先情報
      */
-    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY)
-    {
+    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY) {
         $arrShipping = $objPurchase->getShippings($order_id);
 
@@ -176 +158 @@
      * @return array 画像をセットした購入履歴の配列
      */
-    function setMainListImage($arrOrderDetails)
-    {
+    function setMainListImage($arrOrderDetails) {
         $i = 0;
         foreach ($arrOrderDetails as $arrOrderDetail) {
@@ -194 +175 @@
      * @return array MIMETYPE、ファイル名をセットした購入履歴の配列
      */
-    function lfSetMimetype($arrOrderDetails)
-    {
+    function lfSetMimetype($arrOrderDetails) {
         $objHelperMobile = new SC_Helper_Mobile_Ex();
         $i = 0;
@@ -216 +196 @@
      * @param $arrOrderDetail 購入履歴の配列
      */
-    function lfSetAU($arrOrderDetails)
-    {
+    function lfSetAU($arrOrderDetails) {
         $this->isAU = false;
         // モバイル端末かつ、キャリアがAUの場合に処理を行う