Changeset 20156 for branches/version-2_5-dev/data/class/pages/mypage

Timestamp:

2011/02/12 19:01:02 (16 years ago)

Author:

kimoto

Message:

LC_Page_Mypage_DeliveryAddr リファクタリング

• そもそも別配送先の登録は別クラスですべきではないか
• 購入遷移での配送先の登録もMypageのページクラスでするべきではない

Location:

branches/version-2_5-dev/data/class/pages/mypage

Files:

• LC_Page_AbstractMypage.php (modified) (1 diff)
• LC_Page_Mypage_DeliveryAddr.php (modified) (10 diffs)

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php

@@ -61 +61 @@
 
         // ログインしていない場合は必ずログインページを表示する
-        if(!$objCustomer->isLoginSuccess(true)) {
+        if($objCustomer->isLoginSuccess(true) === false) {
             // クッキー管理クラス
             $objCookie = new SC_Cookie(COOKIE_EXPIRE);

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php

@@ -44 +44 @@
     function init() {
         parent::init();
-        $this->tpl_title = "お届け先の追加･変更";
-        $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref= $masterData->getMasterData('mtb_pref');
+        $this->tpl_title    = "お届け先の追加･変更";
+        $masterData         = new SC_DB_MasterData_Ex();
+        $this->arrPref      = $masterData->getMasterData('mtb_pref');
         $this->httpCacheControl('nocache');
     }
@@ -67 +67 @@
      */
     function action() {
-        $objQuery = new SC_Query();
+        $objQuery    = new SC_Query();
         $objCustomer = new SC_Customer();
-        $ParentPage = MYPAGE_DELIVADDR_URLPATH;
+        $ParentPage  = MYPAGE_DELIVADDR_URLPATH;
 
         // GETでページを指定されている場合には指定ページに戻す
         if (isset($_GET['page'])) {
-            $ParentPage = htmlspecialchars($_GET['page'],ENT_QUOTES);
-        }else if(isset($_POST['ParentPage'])) {
-            $ParentPage = htmlspecialchars($_POST['ParentPage'],ENT_QUOTES);
+            $ParentPage = htmlspecialchars($_GET['page'], ENT_QUOTES);
+        } else if (isset($_POST['ParentPage'])) {
+            $ParentPage = htmlspecialchars($_POST['ParentPage'], ENT_QUOTES);
         }
         $this->ParentPage = $ParentPage;
@@ -82 +82 @@
          * ログイン判定 及び 退会判定
          * 未ログインでも, 複数配送設定ページからのアクセスの場合は表示する
+         *
+         * TODO 購入遷移とMyPageで別クラスにすべき
          */
         if (!$objCustomer->isLoginSuccess(true) && $ParentPage != MULTIPLE_URLPATH){
@@ -87 +89 @@
         }
 
+        // $_GET['other_deliv_id'] のあるなしで追加か編集か判定しているらしい
         if (!isset($_GET['other_deliv_id'])) $_GET['other_deliv_id'] = "";
-
-        //TODO 要リファクタリング(MODE if利用)
-        if ($this->getMode() == null){
-            $_SESSION['other_deliv_id'] = $_GET['other_deliv_id'];
-        }
-
-        if ($_GET['other_deliv_id'] != ""){
-            //不正アクセス判定
-            $flag = $objQuery->count("dtb_other_deliv", "customer_id=? AND other_deliv_id=?", array($objCustomer->getValue("customer_id"), $_SESSION['other_deliv_id']));
-            if (!$objCustomer->isLoginSuccess(true) || $flag == 0){
-                SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
-            }
-        }
-
-        //別のお届け先ＤＢ登録用カラム配列
-        $arrRegistColumn = array(
-                                 array("column" => "name01",    "convert" => "aKV"),
-                                 array("column" => "name02",    "convert" => "aKV"),
-                                 array("column" => "kana01",    "convert" => "CKV"),
-                                 array("column" => "kana02",    "convert" => "CKV"),
-                                 array("column" => "zip01",     "convert" => "n"),
-                                 array("column" => "zip02",     "convert" => "n"),
-                                 array("column" => "pref",      "convert" => "n"),
-                                 array("column" => "addr01",    "convert" => "aKV"),
-                                 array("column" => "addr02",    "convert" => "aKV"),
-                                 array("column" => "tel01",     "convert" => "n"),
-                                 array("column" => "tel02",     "convert" => "n"),
-                                 array("column" => "tel03",     "convert" => "n"),
-                                 );
-
-
-        if ($_GET['other_deliv_id'] != ""){
-            //別のお届け先情報取得
-            $arrOtherDeliv = $objQuery->select("*", "dtb_other_deliv", "other_deliv_id=? ", array($_SESSION['other_deliv_id']));
-            $this->arrForm = $arrOtherDeliv[0];
-        }
+        $_SESSION['other_deliv_id'] = $_GET['other_deliv_id'];
+
+        // パラメータ管理クラス,パラメータ情報の初期化
+        $objFormParam   = new SC_FormParam();
+        SC_Helper_Customer_Ex::sfCustomerOtherDelivParam($objFormParam);
+        $objFormParam->setParam($_POST);
+        $this->arrForm  = $objFormParam->getHashArray();
 
         switch ($this->getMode()) {
+            // 入力は必ずedit
             case 'edit':
-                $_POST = $this->lfConvertParam($_POST,$arrRegistColumn);
-                $this->arrErr = $this->lfErrorCheck($_POST);
-                if ($this->arrErr){
-                    foreach ($_POST as $key => $val){
-                        if ($val != "") $this->arrForm[$key] = $val;
-                    }
-                } else {
+                $this->arrErr = SC_Helper_Customer_Ex::sfCustomerOtherDelivErrorCheck($objFormParam);
+                // 入力エラーなし
+                if(empty($this->arrErr)) {
+
+                    // TODO ここでやるべきではない
                     $validUrl = array(MYPAGE_DELIVADDR_URLPATH,
                                       DELIV_URLPATH,
@@ -144 +117 @@
 
                     if ($objCustomer->isLoginSuccess(true)) {
-                        $this->lfRegistData($_POST, $arrRegistColumn, $objCustomer);
+                        $this->lfRegistData($objFormParam, $objCustomer->getValue("customer_id"));
                     } else {
-                        $this->lfRegistDataNonMember($_POST, $arrRegistColumn);
-                    }
-
-                    if(Net_UserAgent_Mobile::isMobile() === true) {
+                        $this->lfRegistDataNonMember($objFormParam);
+                    }
+
+                    if(SC_Display::detectDevice() === DEVICE_TYPE_MOBILE) {
                         // モバイルの場合、元のページに遷移
                         SC_Response_Ex::sendRedirect($this->getLocation($_POST['ParentPage']));
@@ -156 +129 @@
                 }
                 break;
-        }
-        if(Net_UserAgent_Mobile::isMobile() === true) {
+            case 'multiple':
+                // 複数配送先用？
+                break;
+            default :
+
+                if ($_GET['other_deliv_id'] != ""){
+                    //不正アクセス判定
+                    $flag = $objQuery->count("dtb_other_deliv",
+                                             "customer_id = ? AND other_deliv_id = ?",
+                                             array($objCustomer->getValue("customer_id"),
+                                             $_SESSION['other_deliv_id']));
+
+                    if (!$objCustomer->isLoginSuccess(true) || $flag == 0){
+                        SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
+                    }
+
+                    //別のお届け先情報取得
+                    $arrOtherDeliv = $objQuery->select("*", "dtb_other_deliv", "other_deliv_id = ? ", array($_SESSION['other_deliv_id']));
+                    $this->arrForm = $arrOtherDeliv[0];
+                }
+                break;
+        }
+
+        if (SC_Display::detectDevice() === DEVICE_TYPE_MOBILE) {
             $this->tpl_mainpage = 'mypage/delivery_addr.tpl';
         } else {
@@ -173 +168 @@
     }
 
-    /* エラーチェック */
-    function lfErrorCheck() {
-        $objErr = new SC_CheckError();
-
-        $objErr->doFunc(array("お名前(姓)", 'name01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("お名前(名)", 'name02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("お名前(フリガナ・姓)", 'kana01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $objErr->doFunc(array("お名前(フリガナ・名)", 'kana02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $objErr->doFunc(array("郵便番号1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
-        $objErr->doFunc(array("郵便番号2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
-        $objErr->doFunc(array("郵便番号", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
-        $objErr->doFunc(array("都道府県", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
-        $objErr->doFunc(array("住所（1）", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("住所（2）", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("電話番号1", 'tel01'), array("EXIST_CHECK","NUM_CHECK"));
-        $objErr->doFunc(array("電話番号2", 'tel02'), array("EXIST_CHECK","NUM_CHECK"));
-        $objErr->doFunc(array("電話番号3", 'tel03'), array("EXIST_CHECK","NUM_CHECK"));
-        $objErr->doFunc(array("電話番号", "tel01", "tel02", "tel03") ,array("TEL_CHECK"));
-        return $objErr->arrErr;
-
-    }
 
     /* 登録実行 */
-    function lfRegistData($array, $arrRegistColumn, &$objCustomer) {
-        $objQuery = new SC_Query();
-        foreach ($arrRegistColumn as $data) {
-            $arrRegist[ $data["column"] ] = $array[ $data["column"] ];
-        }
-
-        $arrRegist['customer_id'] = $objCustomer->getvalue('customer_id');
+    function lfRegistData($objFormParam, $customer_id) {
+        $objQuery   =& SC_Query::getSingletonInstance();
+
+        $arrRet     = $objFormParam->getHashArray();
+        $sqlval     = $objFormParam->getDbArray();
+
+        $sqlval['customer_id'] = $customer_id;
 
         // 追加
-        if (strlen($_POST['other_deliv_id'] == 0)) {
+        if (strlen($arrRet['other_deliv_id'] == 0)) {
             // 別のお届け先登録数の取得
-            $deliv_count = $objQuery->count("dtb_other_deliv", "customer_id=?", array($objCustomer->getValue('customer_id')));
+            $deliv_count = $objQuery->count("dtb_other_deliv", "customer_id = ?", array($customer_id));
             // 別のお届け先最大登録数に達している場合、エラー
             if ($deliv_count >= DELIV_ADDR_MAX) {
@@ -214 +188 @@
 
             // 実行
-            $arrRegist['other_deliv_id'] = $objQuery->nextVal('dtb_other_deliv_other_deliv_id');
-            $objQuery->insert("dtb_other_deliv", $arrRegist);
+            $sqlval['other_deliv_id'] = $objQuery->nextVal('dtb_other_deliv_other_deliv_id');
+            $objQuery->insert("dtb_other_deliv", $sqlval);
 
         // 変更
         } else {
-            $deliv_count = $objQuery->count("dtb_other_deliv","customer_id=? and other_deliv_id = ?" ,array($objCustomer->getValue('customer_id'), $_POST['other_deliv_id']));
+            $deliv_count = $objQuery->count("dtb_other_deliv","customer_id = ? AND other_deliv_id = ?" ,array($customer_id, $arrRet['other_deliv_id']));
             if ($deliv_count != 1) {
                 SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '一致する別のお届け先がありません。');
@@ -225 +199 @@
 
             // 実行
-            $objQuery->update("dtb_other_deliv", $arrRegist,
-                                  "other_deliv_id = "
-                                  . SC_Utils_Ex::sfQuoteSmart($array["other_deliv_id"]));
-        }
-    }
-
-    function lfRegistDataNonMember($array, $arrRegistColumn) {
+            $objQuery->update("dtb_other_deliv", $sqlval, "other_deliv_id = ?", array($arrRet['other_deliv_id']));
+        }
+    }
+
+    function lfRegistDataNonMember($objFormParam) {
+        $arrRegistColumn = $objFormParam->getDbArray();
+
         foreach ($arrRegistColumn as $data) {
             $arrRegist['shipping_' . $data["column"] ] = $array[ $data["column"] ];
@@ -241 +215 @@
         }
     }
-
-    //----　取得文字列の変換
-    function lfConvertParam($array, $arrRegistColumn) {
-        /*
-         *  文字列の変換
-         *  K :  「半角(ﾊﾝｶｸ)片仮名」を「全角片仮名」に変換
-         *  C :  「全角ひら仮名」を「全角かた仮名」に変換
-         *  V :  濁点付きの文字を一文字に変換。"K","H"と共に使用します
-         *  n :  「全角」数字を「半角(ﾊﾝｶｸ)」に変換
-         *  a :  全角英数字を半角英数字に変換する
-         */
-        // カラム名とコンバート情報
-        foreach ($arrRegistColumn as $data) {
-            $arrConvList[ $data["column"] ] = $data["convert"];
-        }
-
-        // 文字変換
-        foreach ($arrConvList as $key => $val) {
-            // POSTされてきた値のみ変換する。
-            if(strlen(($array[$key])) > 0) {
-                $array[$key] = mb_convert_kana($array[$key] ,$val);
-            }
-        }
-        return $array;
-    }
 }
 ?>