Changeset 23408

Timestamp:

2014/05/12 13:36:22 (12 years ago)

Author:

m_uehara

Message:

#2541 SC_Helper_Addressの処理の改善

Location:

branches/version-2_13_2

Files:

• data/class/helper/SC_Helper_Address.php (modified) (7 diffs)
• data/class/pages/mypage/LC_Page_Mypage_Delivery.php (modified) (1 diff)
• data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (modified) (2 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Deliv.php (modified) (2 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Multiple.php (modified) (1 diff)
• tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php (modified) (2 diffs)
• tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php (modified) (4 diffs)

branches/version-2_13_2/data/class/helper/SC_Helper_Address.php

@@ -40 +40 @@
     {
         if (self::delivErrorCheck($sqlval)) {
-            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
-            SC_Response_Ex::actionExit();
+            return false;
         }
         
@@ -56 +55 @@
             $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();
+                return false;
             }
 
             // 別のお届け先を追加
             $sqlval['other_deliv_id'] = $objQuery->nextVal('dtb_other_deliv_other_deliv_id');
-            $objQuery->insert($from, $sqlval);
+            $ret = $objQuery->insert($from, $sqlval);
 
         // 変更
@@ -71 +69 @@
             $deliv_count = $objQuery->count($from, $where, $arrVal);
             if ($deliv_count != 1) {
-                SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '一致する別のお届け先がありません。');
-                SC_Response_Ex::actionExit();
+                return false;
             }
 
             // 別のお届け先を変更
-            $objQuery->update($from, $sqlval, $where, $arrVal);
+            $ret = $objQuery->update($from, $sqlval, $where, $arrVal);
         }
+        
+        return $ret;
     }
 
@@ -86 +85 @@
      * @return array()
      */
-    public function getAddress($other_deliv_id)
+    public function getAddress($other_deliv_id, $customer_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();
+            return false;
         }
         
@@ -117 +112 @@
     {
         if (self::delivErrorCheck(array('customer_id' => $customer_id))) {
-            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
-            SC_Response_Ex::actionExit();
+            return false;
         }
         
@@ -141 +135 @@
      * @return void
      */
-    public function deleteAddress($other_deliv_id)
+    public function deleteAddress($other_deliv_id, $customer_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();
+            return false;
         }
         
@@ -156 +146 @@
         $where  = 'customer_id = ? AND other_deliv_id = ?';
         $arrVal = array($customer_id, $other_deliv_id);
-        $objQuery->delete($from, $where, $arrVal);
+        return $objQuery->delete($from, $where, $arrVal);
     }
 

branches/version-2_13_2/data/class/pages/mypage/LC_Page_Mypage_Delivery.php

@@ -83 +83 @@
                 }
 
-                $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
+                if (!$objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'), $customer_id)) {
+                    SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先を削除できませんでした。');
+                    SC_Response_Ex::actionExit();
+                }
                 break;
 

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

@@ -141 +141 @@
 
                 if ($_GET['other_deliv_id'] != '') {
-                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
+                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id'], $objCustomer->getValue('customer_id'));
 
                     //不正アクセス判定
@@ -172 +172 @@
         $sqlval['customer_id'] = $customer_id;
 
-        $objAddress->registAddress($sqlval);
+        if (!$objAddress->registAddress($sqlval)) {
+            SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先を登録できませんでした。');
+            SC_Response_Ex::actionExit();
+        }
     }
 

branches/version-2_13_2/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

@@ -112 +112 @@
             // 削除
             case 'delete':
-                $objAddress->deleteAddress($arrForm['other_deliv_id']);
+                if (!$objAddress->deleteAddress($arrForm['other_deliv_id'], $objCustomer->getValue('customer_id'))) {
+                    SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先を削除できませんでした。');
+                    SC_Response_Ex::actionExit();
+                }
                 break;
 
@@ -225 +228 @@
         // 別のお届け先がチェックされている場合
         else {
-            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
+            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id, $objCustomer->getValue('customer_id'));
             if (!$arrOtherDeliv) {
                 return false;

branches/version-2_13_2/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

@@ -302 +302 @@
             if ($objCustomer->isLoginSuccess(true)) {
                 if ($other_deliv_id != 0) {
-                    $otherDeliv = $objAddress->getAddress($other_deliv_id);
+                    $otherDeliv = $objAddress->getAddress($other_deliv_id, $objCustomer->getValue('customer_id'));
+
+                    if (!$otherDeliv) {
+                        SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, "入力値が不正です。<br />正しい値を入力してください。");
+                        SC_Response_Ex::actionExit();
+                    }
+
                     foreach ($otherDeliv as $key => $val) {
                         $arrValues[$other_deliv_id]['shipping_' . $key] = $val;

branches/version-2_13_2/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php

@@ -13 +13 @@
         parent::setUp();
         $this->objAddress = new SC_Helper_Address_Ex();
-        $_SESSION['customer']['customer_id'] = 1; // 会員じゃないとテストが落ちる
     }
 
@@ -27 +26 @@
         $this->setUpAddress();
         $other_deliv_id = '1000';
+        $customer_id = 1;
         $this->expected = NULL;
-        $this->objAddress->deleteAddress($other_deliv_id);
+        $this->objAddress->deleteAddress($other_deliv_id, $customer_id);
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $select = '*';
         $from = 'dtb_other_deliv';
-        $where = 'other_deliv_id = ?';
-        $whereVal = array($other_deliv_id);
+        $where = 'other_deliv_id = ? AND customer_id = ?';
+        $whereVal = array($other_deliv_id, $customer_id);
         $this->actual = $objQuery->getRow($select, $from, $where, $whereVal);
 
         $this->verify('登録配送先削除');
     }
+
+    public function testdeleteAddressTest_会員IDを設定しない場合_FALSEを返す()
+    {
+        $this->setUpAddress();
+        $other_deliv_id = '1000';
+        $this->expected = FALSE;
+        $this->actual = $this->objAddress->deleteAddress($other_deliv_id);
+
+        $this->verify('登録配送先削除');
+    }
 }

branches/version-2_13_2/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php

@@ -13 +13 @@
         parent::setUp();
         $this->objAddress = new SC_Helper_Address_Ex();
-        $_SESSION['customer']['customer_id'] = 1; // 会員じゃないとテストが落ちる
     }
 
@@ -28 +27 @@
         $this->setUpAddress();
         $other_deliv_id = '999';
+        $customer_id = 1;
+        $this->expected = FALSE;
+        $this->actual = $this->objAddress->getAddress($other_deliv_id, $customer_id);
+
+        $this->verify('登録配送先取得');
+    }
+    
+    public function testgetAddressTest_会員IDを設定しない場合_FALSEを返す()
+    {
+        $this->setUpAddress();
+        $other_deliv_id = '1001';
         $this->expected = FALSE;
         $this->actual = $this->objAddress->getAddress($other_deliv_id);
@@ -38 +48 @@
         $this->setUpAddress();
         $other_deliv_id = '1001';
+        $customer_id = 1;
         $this->expected = array(
                 'other_deliv_id' => '1001',
@@ -60 +71 @@
                 'zipcode' => null
             );
-        $this->actual = $this->objAddress->getAddress($other_deliv_id);
+        $this->actual = $this->objAddress->getAddress($other_deliv_id, $customer_id);
 
         $this->verify('登録配送先取得');