Changeset 22065 for branches/version-2_12-dev/data/class/pages/shopping

Timestamp:

2012/11/02 19:27:41 (11 years ago)

Author:

pineray

Message:

#1958 別お届け先関連の処理をページクラスから分離

Location:

branches/version-2_12-dev/data/class/pages/shopping

Files:

• LC_Page_Shopping_Deliv.php (modified) (7 diffs)
• LC_Page_Shopping_Multiple.php (modified) (7 diffs)

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

@@ -73 +73 @@
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objFormParam = new SC_FormParam_Ex();
+        $objAddress = new SC_Helper_Address_Ex();
 
         $this->tpl_uniqid = $objSiteSess->getUniqId();
@@ -109 +110 @@
             // 削除
             case 'delete':
-                $this->doDelete($arrForm['other_deliv_id']);
+                $objAddress->deleteAddress($objCustomer->getValue('customer_id'), $arrForm['other_deliv_id']);
                 break;
 
@@ -117 +118 @@
 
                 $shipping_id = $arrForm['deliv_check'] == -1 ? 0 : $arrForm['deliv_check'];
-                $success = $this->registerDeliv($shipping_id, $this->tpl_uniqid, $objPurchase, $objCustomer);
+                $success = $this->registerDeliv($shipping_id, $this->tpl_uniqid, $objPurchase, $objCustomer, $objAddress);
                 if (!$success) {
                     SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true);
@@ -161 +162 @@
 
         // 登録済み住所を取得
-        $this->arrAddr = $objCustomer->getCustomerAddress($objCustomer->getValue('customer_id'));
+        $addr = array(
+            array(
+                'other_deliv_id'    => NULL,
+                'customer_id'       => $objCustomer->getValue('customer_id'),
+                'name01'            => $objCustomer->getValue('name01'),
+                'name02'            => $objCustomer->getValue('name02'),
+                'kana01'            => $objCustomer->getValue('kana01'),
+                'kana02'            => $objCustomer->getValue('kana02'),
+                'zip01'             => $objCustomer->getValue('zip01'),
+                'zip02'             => $objCustomer->getValue('zip02'),
+                'pref'              => $objCustomer->getValue('pref'),
+                'addr01'            => $objCustomer->getValue('addr01'),
+                'addr02'            => $objCustomer->getValue('addr02'),
+                'tel01'             => $objCustomer->getValue('tel01'),
+                'tel02'             => $objCustomer->getValue('tel02'),
+                'tel03'             => $objCustomer->getValue('tel03'),
+            )
+        );
+        $this->arrAddr = array_merge($addr, $objAddress->getList($objCustomer->getValue('customer_id')));
         $this->tpl_addrmax = count($this->arrAddr);
 
@@ -185 +204 @@
         $objFormParam->addParam('その他のお届け先ID', 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お届け先チェック', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
-    }
-
-    /**
-     * その他のお届け先情報を削除する.
-     *
-     * @param integer $other_deliv_id その他のお届け先ID
-     * @return void
-     */
-    function doDelete($other_deliv_id) {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'other_deliv_id = ?';
-        $objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
     }
 
@@ -212 +219 @@
      * @return boolean お届け先チェックの値が妥当な場合 true
      */
-    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer) {
+    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer, $objAddress) {
         GC_Utils_Ex::gfDebugLog('register deliv. deliv_check=' . $deliv_check);
         $arrValues = array();
@@ -221 +228 @@
         // 別のお届け先がチェックされている場合
         else {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $arrOtherDeliv = $objQuery->getRow('*', 'dtb_other_deliv',
-                                               'customer_id = ? AND other_deliv_id = ?',
-                                               array($objCustomer->getValue('customer_id'), $other_deliv_id));
-            if (empty($arrOtherDeliv)) {
+            $arrOtherDeliv = $objAddress->getAddress($objCustomer->getValue('customer_id'), $other_deliv_id);
+            if (!$arrOtherDeliv) {
                 return false;
             }

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

@@ -71 +71 @@
         $objCustomer = new SC_Customer_Ex();
         $objFormParam = new SC_FormParam_Ex();
+        $objAddress = new SC_Helper_Address_Ex();
 
         // 複数配送先指定が無効な場合はエラー
@@ -81 +82 @@
 
         $this->addrs = $this->getDelivAddrs($objCustomer, $objPurchase,
-                                            $this->tpl_uniqid);
+                                            $objAddress, $this->tpl_uniqid);
         $this->tpl_addrmax = count($this->addrs);
         $this->lfInitParam($objFormParam);
@@ -96 +97 @@
                     $this->saveMultipleShippings($this->tpl_uniqid, $objFormParam,
                                                  $objCustomer, $objPurchase,
-                                                 $objCartSess);
+                                                 $objCartSess, $objAddress);
                     $objSiteSess->setRegistFlag();
 
@@ -187 +188 @@
      * @return array 配送住所のプルダウン用連想配列
      */
-    function getDelivAddrs(&$objCustomer, &$objPurchase, $uniqid) {
+    function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrPref = $masterData->getMasterData('mtb_pref');
@@ -194 +195 @@
         // 会員ログイン時
         if ($objCustomer->isLoginSuccess(true)) {
-            $arrAddrs = $objCustomer->getCustomerAddress($objCustomer->getValue('customer_id'));
+            $addr = array(
+                array(
+                    'other_deliv_id'    => NULL,
+                    'customer_id'       => $objCustomer->getValue('customer_id'),
+                    'name01'            => $objCustomer->getValue('name01'),
+                    'name02'            => $objCustomer->getValue('name02'),
+                    'kana01'            => $objCustomer->getValue('kana01'),
+                    'kana02'            => $objCustomer->getValue('kana02'),
+                    'zip01'             => $objCustomer->getValue('zip01'),
+                    'zip02'             => $objCustomer->getValue('zip02'),
+                    'pref'              => $objCustomer->getValue('pref'),
+                    'addr01'            => $objCustomer->getValue('addr01'),
+                    'addr02'            => $objCustomer->getValue('addr02'),
+                    'tel01'             => $objCustomer->getValue('tel01'),
+                    'tel02'             => $objCustomer->getValue('tel02'),
+                    'tel03'             => $objCustomer->getValue('tel03'),
+                )
+            );
+            $arrAddrs = array_merge($addr, $objAddress->getList($objCustomer->getValue('customer_id')));
             foreach ($arrAddrs as $val) {
                 $other_deliv_id = SC_Utils_Ex::isBlank($val['other_deliv_id']) ? 0 : $val['other_deliv_id'];
@@ -280 +299 @@
      * @return void
      */
-    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess) {
+    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -290 +309 @@
             if ($objCustomer->isLoginSuccess(true)) {
                 if ($other_deliv_id != 0) {
-                    $otherDeliv = $objQuery->select('*', 'dtb_other_deliv',
-                                                    'other_deliv_id = ?',
-                                                    array($other_deliv_id));
-                    foreach ($otherDeliv[0] as $key => $val) {
+                    $otherDeliv = $objAddress->getAddress($objCustomer->getValue('customer_id'), $other_deliv_id);
+                    foreach ($otherDeliv as $key => $val) {
                         $arrValues[$other_deliv_id]['shipping_' . $key] = $val;
                     }