Changeset 15622

Timestamp:

2007/09/05 17:00:49 (16 years ago)

Author:

nanasess

Message:

リファクタリング

• クラス化に伴う修正

Location:

branches/feature-module-update

Files:

• data/class/helper/SC_Helper_Mail.php (modified) (6 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Complete.php (modified) (17 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Deliv.php (modified) (6 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (2 diffs)
• html/shopping/index.php (modified) (1 diff)

branches/feature-module-update/data/class/helper/SC_Helper_Mail.php

@@ -45 +45 @@
         // メール本文の取得
         $objMailView->assignobj($objPage);
-        $body = $objMailView->fetch($arrMAILTPLPATH[$template_id]);
+        $body = $objMailView->fetch($this->arrMAILTPLPATH[$template_id]);
 
         // メール送信処理
@@ -59 +59 @@
     /* 受注完了メール送信 */
     function sfSendOrderMail($order_id, $template_id, $subject = "", $header = "", $footer = "", $send = true) {
-        global $arrMAILTPLPATH;
 
         $objPage = new LC_Page();
@@ -111 +110 @@
 
         // 都道府県変換
-        $objPage->arrOrder['deliv_pref'] = $arrPref[$objPage->arrOrder['deliv_pref']];
+        $objPage->arrOrder['deliv_pref'] = $this->arrPref[$objPage->arrOrder['deliv_pref']];
 
         $objPage->arrOrderDetail = $arrOrderDetail;
@@ -121 +120 @@
         // メール本文の取得
         $objMailView->assignobj($objPage);
-        $body = $objMailView->fetch($arrMAILTPLPATH[$template_id]);
+        $body = $objMailView->fetch($this->arrMAILTPLPATH[$template_id]);
 
         // メール送信処理
@@ -129 +128 @@
         $error = $arrInfo['email04'];
 
-        $tosubject = SC_Utils::sfMakeSubject($objQuery, $objMailView,
+        $tosubject = $this->sfMakeSubject($objQuery, $objMailView,
                                              $objPage, $tmp_subject);
 
@@ -139 +138 @@
         if($send) {
             if ($objSendMail->sendMail()) {
-                $this->fSaveMailHistory($order_id, $template_id, $tosubject, $body);
+                $this->sfSaveMailHistory($order_id, $template_id, $tosubject, $body);
             }
         }

branches/feature-module-update/data/class/pages/shopping/LC_Page_Shopping_Complete.php

@@ -14 +14 @@
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id$
+ * @version $Id:LC_Page_Shopping_Complete.php 15532 2007-08-31 14:39:46Z nanasess $
  */
 class LC_Page_Shopping_Complete extends LC_Page {
@@ -32 +32 @@
         $this->tpl_title = "ご注文完了";
 
-        // TODO
-        $this->arrCONVENIENCE = $arrCONVENIENCE;
-        $this->arrCONVENIMESSAGE = $arrCONVENIMESSAGE;
-        $objPage->arrCONVENIENCE = $arrCONVENIENCE;
-        $objPage->arrCONVENIMESSAGE = $arrCONVENIMESSAGE;
+        $masterData = new SC_DB_MasterData_Ex();
+        $this->arrCONVENIENCE = $masterData->getMasterData("mtb_convenience");
+        $this->arrCONVENIMESSAGE = $masterData->getMasterData("mtb_conveni_message");
 
         $this->allowClientCache();
@@ -55 +53 @@
         $this->arrInfo = $objSiteInfo->data;
         $this->objCustomer = new SC_Customer();
+        $mailHelper = new SC_Helper_Mail_Ex();
 
         // 前のページで正しく登録手続きが行われたか判定
-        SC_Utils_Ex::sfIsPrePage($objSiteSess);
+        SC_Utils_Ex::sfIsPrePage($this->objSiteSess);
         // ユーザユニークIDの取得と購入状態の正当性をチェック
-        $uniqid = SC_Utils_Ex::sfCheckNormalAccess($objSiteSess, $objCartSess);
+        $uniqid = SC_Utils_Ex::sfCheckNormalAccess($this->objSiteSess, $this->objCartSess);
         if ($uniqid != "") {
 
@@ -65 +64 @@
             $objQuery = new SC_Query();
             $objQuery->begin();
-            $order_id = lfDoComplete($objQuery, $uniqid);
+            $order_id = $this->lfDoComplete($objQuery, $uniqid);
             $objQuery->commit();
 
             // セッションに保管されている情報を更新する
-            $objCustomer->updateSession();
+            $this->objCustomer->updateSession();
 
             // 完了メール送信
             if($order_id != "") {
-                SC_Utils_Ex::sfSendOrderMail($order_id, '1');
+                $mailHelper->sfSendOrderMail($order_id, '1');
             }
 
@@ -109 +108 @@
         }
 
-        $this->arrInfo = $arrInfo;
         // キャンペーンからの遷移かチェック
-        $this->is_campaign = $objCampaignSess->getIsCampaign();
-        $this->campaign_dir = $objCampaignSess->getCampaignDir();
+        $this->is_campaign = $this->objCampaignSess->getIsCampaign();
+        $this->campaign_dir = $this->objCampaignSess->getCampaignDir();
 
         $objView->assignobj($this);
         // フレームを選択(キャンペーンページから遷移なら変更)
-        $objCampaignSess->pageView($objView);
+        $this->objCampaignSess->pageView($objView);
 
         // セッション開放
-        $objCampaignSess->delCampaign();
+        $this->objCampaignSess->delCampaign();
     }
 
@@ -179 +177 @@
 
     // 完了処理
-    function lfDoComplete($objQuery, $uniqid) {
+    function lfDoComplete(&$objQuery, $uniqid) {
         $objDb = new SC_Helper_DB_Ex();
 
@@ -186 +184 @@
 
         // 会員情報登録処理
-        if ($objCustomer->isLoginSuccess()) {
+        if ($this->objCustomer->isLoginSuccess()) {
             // 新お届け先の登録
-            $this->lfSetNewAddr($uniqid, $objCustomer->getValue('customer_id'));
+            $this->lfSetNewAddr($uniqid, $this->objCustomer->getValue('customer_id'));
             // 購入集計を顧客テーブルに反映
-            $this->lfSetCustomerPurchase($objCustomer->getValue('customer_id'), $arrData, $objQuery);
+            $this->lfSetCustomerPurchase($this->objCustomer->getValue('customer_id'), $arrData, $objQuery);
         } else {
             //購入時強制会員登録
@@ -199 +197 @@
                 if($arrData['member_check'] == '1') {
                     // 仮会員登録
-                    $customer_id = $this->lfRegistPreCustomer($arrData, $arrInfo);
+                    $customer_id = $this->lfRegistPreCustomer($arrData, $this->arrInfo);
                     // 購入集計を顧客テーブルに反映
                     $this->lfSetCustomerPurchase($customer_id, $arrData, $objQuery);
@@ -207 +205 @@
             case '1':
                 // 仮会員登録
-                $customer_id = $this->lfRegistPreCustomer($arrData, $arrInfo);
+                $customer_id = $this->lfRegistPreCustomer($arrData, $this->arrInfo);
                 // 購入集計を顧客テーブルに反映
                 $this->lfSetCustomerPurchase($customer_id, $arrData, $objQuery);
@@ -215 +213 @@
         }
         // 一時テーブルを受注テーブルに格納する
-        $order_id = $this->lfRegistOrder($objQuery, $arrData, $objCampaignSess);
+        $order_id = $this->lfRegistOrder($objQuery, $arrData, $this->objCampaignSess);
         // カート商品を受注詳細テーブルに格納する
-        $this->lfRegistOrderDetail($objQuery, $order_id, $objCartSess);
+        $this->lfRegistOrderDetail($objQuery, $order_id, $this->objCartSess);
         // 受注一時テーブルの情報を削除する。
         $this->lfDeleteTempOrder($objQuery, $uniqid);
         // キャンペーンからの遷移の場合登録する。
-        if($objCampaignSess->getIsCampaign() and $objCartSess->chkCampaign($objCampaignSess->getCampaignId())) {
+        if($this->objCampaignSess->getIsCampaign() and $this->objCartSess->chkCampaign($this->objCampaignSess->getCampaignId())) {
             $this->lfRegistCampaignOrder($objQuery, $objCampaignSess, $order_id);
         }
 
         // セッションカート内の商品を削除する。
-        $objCartSess->delAllProducts();
+        $this->objCartSess->delAllProducts();
         // 注文一時IDを解除する。
-        $objSiteSess->unsetUniqId();
+        $this->objSiteSess->unsetUniqId();
 
         return $order_id;
@@ -299 +297 @@
         $body = $objMailView->fetch("mail_templates/customer_mail.tpl");
 
+        $mailHelper = new SC_Helper_Mail_Ex();
+
         $objMail = new GC_SendMail();
         $objMail->setItem(
                             ''                                      //　宛先
-                            , sfMakeSubject("会員登録のご確認")     //　サブジェクト
+                            , $mailHelper->sfMakeSubject("会員登録のご確認")        //　サブジェクト
                             , $body                                 //　本文
                             , $arrInfo['email03']                   //　配送元アドレス
@@ -371 +371 @@
 
     // 受注詳細テーブルへ登録
-    function lfRegistOrderDetail($objQuery, $order_id, $objCartSess) {
+    function lfRegistOrderDetail(&$objQuery, $order_id, &$objCartSess) {
         $objDb = new SC_Helper_DB_Ex();
         // カート内情報の取得
@@ -412 +412 @@
 
     // キャンペーン受注テーブルへ登録
-    function lfRegistCampaignOrder($objQuery, $objCampaignSess, $order_id) {
+    function lfRegistCampaignOrder(&$objQuery, &$objCampaignSess, $order_id) {
 
         // 受注データを取得
@@ -440 +440 @@
 
     /* 受注一時テーブルの削除 */
-    function lfDeleteTempOrder($objQuery, $uniqid) {
+    function lfDeleteTempOrder(&$objQuery, $uniqid) {
         $where = "order_temp_id = ?";
         $sqlval['del_flg'] = 1;
@@ -496 +496 @@
 
     /* 購入情報を会員テーブルに登録する */
-    function lfSetCustomerPurchase($customer_id, $arrData, $objQuery) {
+    function lfSetCustomerPurchase($customer_id, $arrData, &$objQuery) {
         $col = "first_buy_date, last_buy_date, buy_times, buy_total, point";
         $where = "customer_id = ?";
@@ -520 +520 @@
 
     // 在庫を減らす処理
-    function lfReduceStock($objQuery, $arrID, $quantity) {
+    function lfReduceStock(&$objQuery, $arrID, $quantity) {
         $where = "product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?";
         $arrRet = $objQuery->select("stock, stock_unlimited", "dtb_products_class", $where, $arrID);
@@ -544 +544 @@
     // GETの値をインサート用に整える
     function lfGetInsParam($sqlVal){
-
+        $objDb = new SC_Helper_DB_Ex();
         foreach($_GET as $key => $val){
             // カラムの存在チェック
-            if(sfColumnExists("dtb_order", $key)) $sqlVal[$key] = $val;
+            if($objDb->sfColumnExists("dtb_order", $key)) $sqlVal[$key] = $val;
         }
 

branches/feature-module-update/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

@@ -14 +14 @@
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id$
+ * @version $Id:LC_Page_Shopping_Deliv.php 15532 2007-08-31 14:39:46Z nanasess $
  */
 class LC_Page_Shopping_Deliv extends LC_Page {
@@ -71 +71 @@
         // ユーザユニークIDの取得と購入状態の正当性をチェック
         $uniqid = SC_Utils_Ex::sfCheckNormalAccess($objSiteSess, $objCartSess);
-        $objPage->tpl_uniqid = $uniqid;
+        $this->tpl_uniqid = $uniqid;
+
+        if (!isset($_POST['mode'])) $_POST['mode'] = "";
 
         // ログインチェック
@@ -82 +84 @@
         case 'login':
             $this->objLoginFormParam->toLower('login_email');
-            $objPage->arrErr = $this->objLoginFormParam->checkError();
+            $this->arrErr = $this->objLoginFormParam->checkError();
             $arrForm =  $this->objLoginFormParam->getHashArray();
             // クッキー保存判定
@@ -91 +93 @@
             }
 
-            if(count($objPage->arrErr) == 0) {
+            if(count($this->arrErr) == 0) {
                 // ログイン判定
                 if(!$objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'])) {
@@ -157 +159 @@
             $where = "order_temp_id = ?";
             $arrRet = $objQuery->select("*", "dtb_order_temp", $where, array($uniqid));
+            if (empty($arrRet)) $arrRet = array("");
             $this->objFormParam->setParam($arrRet[0]);
             break;
@@ -172 +175 @@
         $objQuery->setorder("other_deliv_id DESC");
         $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id']));
-        $objPage->arrAddr = $arrCustomerAddr;
-        $objPage->tpl_addrmax = count($objOtherAddr);
+        $this->arrAddr = $arrCustomerAddr;
+        $this->tpl_addrmax = count($objOtherAddr);
         $cnt = 1;
         foreach($objOtherAddr as $val) {
-            $objPage->arrAddr[$cnt] = $val;
+            $this->arrAddr[$cnt] = $val;
             $cnt++;
         }
 
         // 入力値の取得
-        $objPage->arrForm = $this->objFormParam->getFormParamList();
-        $objPage->arrErr = $arrErr;
-
-        $objView->assignobj($objPage);
+        if (!isset($arrErr)) $arrErr = array();
+        $this->arrForm = $this->objFormParam->getFormParamList();
+        $this->arrErr = $arrErr;
+
+        $objView->assignobj($this);
         // フレームを選択(キャンペーンページから遷移なら変更)
         $objCampaignSess->pageView($objView);

branches/feature-module-update/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -249 +249 @@
 
         if($sqlval['payment_id'] != "") {
-            list($sqlval['payment_method'], $sqlval['charge']) = lfGetPaymentInfo($sqlval['payment_id']);
+            list($sqlval['payment_method'], $sqlval['charge']) = $this->lfGetPaymentInfo($sqlval['payment_id']);
         } else {
             $sqlval['payment_id'] = '0';
@@ -256 +256 @@
 
         if($sqlval['deliv_time_id'] != "") {
-            list($sqlval['deliv_id'], $sqlval['deliv_time']) = lfGetDelivTimeInfo($sqlval['deliv_time_id']);
+            list($sqlval['deliv_id'], $sqlval['deliv_time']) = $this->lfGetDelivTimeInfo($sqlval['deliv_time_id']);
         } else {
             $sqlval['deliv_time_id'] = '0';

branches/feature-module-update/html/shopping/index.php

@@ -5 +5 @@
  * http://www.lockon.co.jp/
  */
-
 // {{{ requires
 require_once("../require.php");