[Svn-src-all:3917] [version-2_13-dev 22831] #2043 (typo修正・ソース整形・ソースコメントの改善 for 2.13.0)

[kimoto]

Subversion committed to /home/svn/open 22831
http://svn.ec-cube.net/open_trac/changeset/22831
┌────────────────────────────┐
│更新者　:  kimoto                                       │
│更新日時:  2013-05-21 11:32:18 +0900 (火, 21  5月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
 #2043 (typo修正・ソース整形・ソースコメントの改善 for 2.13.0)
 ページクラス内からの不要なSC_Queryを排除

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13-dev/data/class/SC_Fpdf.php

変更: branches/version-2_13-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_13-dev/data/class/SC_Fpdf.php	2013-05-21 01:41:59 UTC (rev 22830)
+++ branches/version-2_13-dev/data/class/SC_Fpdf.php	2013-05-21 02:32:18 UTC (rev 22831)
@@ -29,9 +29,9 @@
 
 define('PDF_TEMPLATE_REALDIR', TEMPLATE_ADMIN_REALDIR . 'pdf/');
 
-class SC_Fpdf extends SC_Helper_FPDI 
+class SC_Fpdf extends SC_Helper_FPDI
 {
-    function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf')
+    public function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf')
     {
         $this->FPDF();
         // デフォルトの設定
@@ -68,7 +68,7 @@
         $this->pageno = $this->setSourceFile($this->tpl_pdf);
     }
 
-    function setData($arrData)
+    public function setData($arrData)
     {
         $this->arrData = $arrData;
 
@@ -95,7 +95,7 @@
 
     }
 
-    function setShopData()
+    private function setShopData()
     {
         // ショップ情報
 
@@ -133,7 +133,7 @@
         $this->Image($logo_file, 124, 46, 40);
     }
 
-    function setMessageData()
+    private function setMessageData()
     {
         // メッセージ
         $this->lfText(27, 70, $this->arrData['msg1'], 8);  //メッセージ1
@@ -143,7 +143,7 @@
         $this->lfText(158, 288, $text, 8);  //作成日
     }
 
-    function setOrderData()
+    private function setOrderData()
     {
         $arrOrder = array();
         // DBから受注情報を読み込む
@@ -266,10 +266,10 @@
     /**
      * 備考の出力を行う
      *
-     * @param string $str 入力文字列
+     * @param  string $str 入力文字列
      * @return string 変更後の文字列
      */
-    function setEtcData()
+    private function setEtcData()
     {
         $this->Cell(0, 10, '', 0, 1, 'C', 0, '');
         $this->SetFont('Gothic', 'B', 9);
@@ -279,7 +279,7 @@
         $this->MultiCell(0, 4, $text, '', 2, 'L', 0, '');
     }
 
-    function createPdf()
+    public function createPdf()
     {
         // PDFをブラウザに送信
         ob_clean();
@@ -299,7 +299,7 @@
     }
 
     // PDF_Japanese::Text へのパーサー
-    function lfText($x, $y, $text, $size = 0, $style = '')
+    private function lfText($x, $y, $text, $size = 0, $style = '')
     {
         // 退避
         $bak_font_style = $this->FontStyle;
@@ -313,19 +313,17 @@
     }
 
     // 受注データの取得
-    function lfGetOrderData($order_id)
+    private function lfGetOrderData($order_id)
     {
         if (SC_Utils_Ex::sfIsInt($order_id)) {
             // DBから受注情報を読み込む
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $where = 'order_id = ?';
-            $arrRet = $objQuery->select('*', 'dtb_order', $where, array($order_id));
-            $this->arrDisp = $arrRet[0];
-            list($point) = SC_Helper_Customer_Ex::sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']);
+            $objPurchase = new SC_Helper_Purchase_Ex();
+            $this->arrDisp = $objPurchase->getOrder($order_id);
+            list($point) = SC_Helper_Customer_Ex::sfGetCustomerPoint($order_id, $this->arrDisp['use_point'], $this->arrDisp['add_point']);
             $this->arrDisp['point'] = $point;
 
             // 受注詳細データの取得
-            $arrRet = $this->lfGetOrderDetail($order_id);
+            $arrRet = $objPurchase->getOrderDetail($order_id);
             $arrRet = SC_Utils_Ex::sfSwapArray($arrRet);
             $this->arrDisp = array_merge($this->arrDisp, $arrRet);
 
@@ -336,15 +334,4 @@
             $this->arrDisp['payment_type'] = 'お支払い';
         }
     }
-
-    // 受注詳細データの取得
-    function lfGetOrderDetail($order_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate, tax_rate, tax_rule';
-        $where = 'order_id = ?';
-        $objQuery->setOrder('order_detail_id');
-        $arrRet = $objQuery->select($col, 'dtb_order_detail', $where, array($order_id));
-        return $arrRet;
-    }
 }