Changeset 23279 for branches/version-2_13-dev/data/class/helper/SC_Helper_Address.php

Timestamp:

2013/11/18 15:20:47 (13 years ago)

Author:

m_uehara

Message:

#2465 r23269 - r23272, r23274 - r23275, r23277 - r23278 をマージ

File:

• branches/version-2_13-dev/data/class/helper/SC_Helper_Address.php (modified) (6 diffs)

branches/version-2_13-dev/data/class/helper/SC_Helper_Address.php

@@ -39 +39 @@
     public function registAddress($sqlval)
     {
+        if (self::delivErrorCheck($sqlval)) {
+            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
+            SC_Response_Ex::actionExit();
+        }
+        
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $customer_id = $sqlval['customer_id'];
         $other_deliv_id = $sqlval['other_deliv_id'];
 
-        // 顧客IDのチェック
-        if (is_null($customer_id) || !is_numeric($customer_id) || !preg_match("/^\d+$/", $customer_id)) {
-            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '顧客IDを正しく指定して下さい。');
-        }
         // 追加
         if (strlen($other_deliv_id == 0)) {
-            // 別のお届け先登録数の取得
-            $deliv_count = $objQuery->count('dtb_other_deliv', 'customer_id = ?', array($customer_id));
             // 別のお届け先最大登録数に達している場合、エラー
+            $from   = 'dtb_other_deliv';
+            $where  = 'customer_id = ?';
+            $arrVal = array($customer_id);
+            $deliv_count = $objQuery->count($from, $where, $arrVal);
             if ($deliv_count >= DELIV_ADDR_MAX) {
                 SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先最大登録数に達しています。');
+                SC_Response_Ex::actionExit();
             }
 
-            // 実行
+            // 別のお届け先を追加
             $sqlval['other_deliv_id'] = $objQuery->nextVal('dtb_other_deliv_other_deliv_id');
-            $objQuery->insert('dtb_other_deliv', $sqlval);
+            $objQuery->insert($from, $sqlval);
 
         // 変更
         } else {
-            $deliv_count = $objQuery->count('dtb_other_deliv','other_deliv_id = ?' ,array($other_deliv_id));
+            $from   = 'dtb_other_deliv';
+            $where  = 'customer_id = ? AND other_deliv_id = ?';
+            $arrVal = array($customer_id, $other_deliv_id);
+            $deliv_count = $objQuery->count($from, $where, $arrVal);
             if ($deliv_count != 1) {
                 SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '一致する別のお届け先がありません。');
+                SC_Response_Ex::actionExit();
             }
 
-            // 実行
-            $objQuery->update('dtb_other_deliv', $sqlval, 'other_deliv_id = ?', array($other_deliv_id));
+            // 別のお届け先を変更
+            $objQuery->update($from, $sqlval, $where, $arrVal);
         }
     }
@@ -75 +83 @@
      * お届け先を取得
      *
-     * @param  integer $other_deliv_id
+     * @param integer $other_deliv_id
      * @return array()
      */
     public function getAddress($other_deliv_id)
     {
+        $objCustomer = new SC_Customer_Ex();
+        $customer_id = $objCustomer->getValue('customer_id');
+        
+        if (self::delivErrorCheck(array('customer_id' => $customer_id, 'other_deliv_id' => $other_deliv_id))) {
+            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
+            SC_Response_Ex::actionExit();
+        }
+        
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id));
-
-        return $address ? $address[0] : FALSE;
+        
+        $col    = '*';
+        $from   = 'dtb_other_deliv';
+        $where  = 'customer_id = ? AND other_deliv_id = ?';
+        $arrVal = array($customer_id, $other_deliv_id);
+        $address = $objQuery->getRow($col, $from, $where, $arrVal);
+
+        return $address;
     }
 
@@ -95 +116 @@
     public function getList($customer_id, $startno = '')
     {
+        if (self::delivErrorCheck(array('customer_id' => $customer_id))) {
+            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
+            SC_Response_Ex::actionExit();
+        }
+        
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('other_deliv_id DESC');
@@ -102 +128 @@
         }
 
-        return $objQuery->select('*', 'dtb_other_deliv', 'customer_id = ?', array($customer_id));
+        $col    = '*';
+        $from   = 'dtb_other_deliv';
+        $where  = 'customer_id = ?';
+        $arrVal = array($customer_id);
+        return $objQuery->select($col, $from, $where, $arrVal);
     }
 
@@ -113 +143 @@
     public function deleteAddress($other_deliv_id)
     {
-        $where      = 'other_deliv_id = ?';
+        $objCustomer = new SC_Customer_Ex();
+        $customer_id = $objCustomer->getValue('customer_id');
+
+        if (self::delivErrorCheck(array('customer_id' => $customer_id, 'other_deliv_id' => $other_deliv_id))) {
+            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
+            SC_Response_Ex::actionExit();
+        }
+        
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
+
+        $from   = 'dtb_other_deliv';
+        $where  = 'customer_id = ? AND other_deliv_id = ?';
+        $arrVal = array($customer_id, $other_deliv_id);
+        $objQuery->delete($from, $where, $arrVal);
     }
 
@@ -142 +183 @@
         return $objErr->arrErr;
     }
+    
+    /**
+     * お届け先エラーチェック
+     * 
+     * @param array $arrParam
+     * @return true / false
+     */
+    public function delivErrorCheck($arrParam)
+    {
+        $error_flg = false;
+        
+        if (is_null($arrParam['customer_id']) || !is_numeric($arrParam['customer_id']) || !preg_match("/^\d+$/", $arrParam['customer_id'])) {
+            $error_flg = true;
+        }
+
+        if (strlen($arrParam['other_deliv_id']) > 0 && (!is_numeric($arrParam['other_deliv_id']) || !preg_match("/^\d+$/", $arrParam['other_deliv_id']))) {
+            $error_flg = true;
+        }
+        
+        return $error_flg;
+    }
 }