Changeset 18052 for branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

Timestamp:

2009/06/06 03:19:45 (15 years ago)

Author:

Seasoft

Message:

・店舗基本情報の取得処理にランタイムのキャッシュ機構を設け、店舗基本情報を深く渡し回す実装を改めた。
・SC_Utils 冒頭のコメントに従い、インスタンスを生成していた処理を、Helper クラスへ移す。計算処理のみ SC_Utils に残す。

File:

• branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (12 diffs)

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -32 +32 @@
 /* ペイジェント決済モジュール連携用 */
 if (file_exists(MODULE_PATH . 'mdl_paygent/include.php') === TRUE) {
-    require_once(MODULE_PATH . 'mdl_paygent/include.php');
+  require_once(MODULE_PATH . 'mdl_paygent/include.php');
 }
 
@@ -109 +109 @@
         $objView = new SC_AdminView();
         $objSess = new SC_Session();
-        $objSiteInfo = new SC_SiteInfo();
         $objDb = new SC_Helper_DB_Ex();
-        $arrInfo = $objSiteInfo->data;
 
         // パラメータ管理クラス
@@ -152 +150 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheek($arrInfo);
+            $this->arrErr = $this->lfCheek();
             $this->arrErr = $this->lfCheckError();
             if(count($this->arrErr) == 0) {
@@ -177 +175 @@
             $this->arrErr = $this->lfCheckError();
             #if(count($this->arrErr) == 0) {
-                $this->arrErr = $this->lfCheek($arrInfo);
+                $this->arrErr = $this->lfCheek();
             #}
             break;
@@ -198 +196 @@
                 }
             }
-            $this->lfReCheek($arrData, $arrInfo);
+            $this->lfReCheek($arrData);
             break;
         /* 商品追加ポップアップより商品選択後、商品情報取得*/
@@ -217 +215 @@
                 }
             }
-            $this->lfReCheek($arrData, $arrInfo);
+            $this->lfReCheek($arrData);
             break;
         /* F-REGI決済モジュール連携用 */
@@ -275 +273 @@
         $this->tpl_onload .= $anchor_hash;
 
-        $this->arrInfo = $arrInfo;
+        $objSiteInfo = new SC_SiteInfo();
+        $this->arrInfo = $objSiteInfo->data;
 
         /**
@@ -430 +429 @@
 
     /* 計算処理 */
-    function lfCheek($arrInfo) {
+    function lfCheek() {
         $objDb = new SC_Helper_DB_Ex();
         $arrVal = $this->objFormParam->getHashArray();
@@ -442 +441 @@
         for($i = 0; $i < $max; $i++) {
             // 小計の計算
-            $subtotal += SC_Utils_Ex::sfPreTax($arrVal['price'][$i], $arrInfo['tax'], $arrInfo['tax_rule']) * $arrVal['quantity'][$i];
+            $subtotal += SC_Helper_DB_Ex::sfPreTax($arrVal['price'][$i]) * $arrVal['quantity'][$i];
             // 小計の計算
-            $totaltax += SC_Utils_Ex::sfTax($arrVal['price'][$i], $arrInfo['tax'], $arrInfo['tax_rule']) * $arrVal['quantity'][$i];
+            $totaltax += SC_Helper_DB_Ex::sfTax($arrVal['price'][$i]) * $arrVal['quantity'][$i];
             // 加算ポイントの計算
             $totalpoint += SC_Utils_Ex::sfPrePoint($arrVal['price'][$i], $arrVal['point_rate'][$i]) * $arrVal['quantity'][$i];
@@ -459 +458 @@
 
         // 加算ポイント
-        $arrVal['add_point'] = SC_Utils_Ex::sfGetAddPoint($totalpoint, $arrVal['use_point'], $arrInfo);
+        $arrVal['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($totalpoint, $arrVal['use_point']);
 
         list($arrVal['point'], $arrVal['total_point']) = $objDb->sfGetCustomerPoint($_POST['order_id'], $arrVal['use_point'], $arrVal['add_point']);
@@ -479 +478 @@
     }
 
-    function lfReCheek($arrData, $arrInfo) {
+    function lfReCheek($arrData) {
         // 情報上書き
         $this->objFormParam->setParam($arrData);
@@ -485 +484 @@
         $this->objFormParam->convParam();
         #if(count($this->arrErr) == 0) {
-            $this->arrErr = $this->lfCheek($arrInfo);
+            $this->arrErr = $this->lfCheek();
         #}
         $this->arrErr = $this->lfCheckError();