Changeset 22831 for branches/version-2_13-dev/data/class/SC_Fpdf.php

Timestamp:

2013/05/21 11:32:18 (11 years ago)

Author:

kimoto

Message:

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

File:

• branches/version-2_13-dev/data/class/SC_Fpdf.php (modified) (10 diffs)

branches/version-2_13-dev/data/class/SC_Fpdf.php

@@ -30 +30 @@
 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();
@@ -69 +69 @@
     }
 
-    function setData($arrData)
+    public function setData($arrData)
     {
         $this->arrData = $arrData;
@@ -96 +96 @@
     }
 
-    function setShopData()
+    private function setShopData()
     {
         // ショップ情報
@@ -134 +134 @@
     }
 
-    function setMessageData()
+    private function setMessageData()
     {
         // メッセージ
@@ -144 +144 @@
     }
 
-    function setOrderData()
+    private function setOrderData()
     {
         $arrOrder = array();
@@ -267 +267 @@
      * 備考の出力を行う
      *
-     * @param string $str 入力文字列
+     * @param  string $str 入力文字列
      * @return string 変更後の文字列
      */
-    function setEtcData()
+    private function setEtcData()
     {
         $this->Cell(0, 10, '', 0, 1, 'C', 0, '');
@@ -280 +280 @@
     }
 
-    function createPdf()
+    public function createPdf()
     {
         // PDFをブラウザに送信
@@ -300 +300 @@
 
     // PDF_Japanese::Text へのパーサー
-    function lfText($x, $y, $text, $size = 0, $style = '')
+    private function lfText($x, $y, $text, $size = 0, $style = '')
     {
         // 退避
@@ -314 +314 @@
 
     // 受注データの取得
-    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);
@@ -337 +335 @@
         }
     }
-
-    // 受注詳細データの取得
-    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;
-    }
 }