Index: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Address_Ex.php =================================================================== --- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Address_Ex.php (revision 22065) +++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Address_Ex.php (revision 22065) @@ -0,0 +1,39 @@ +setOrder('other_deliv_id IS NULL DESC, other_deliv_id DESC'); - return $objQuery->select('*', $from, '', array($customer_id, $customer_id)); } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21969) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 22065) @@ -349,16 +349,4 @@ /** - * お届け先フォーム初期化 - * - * @param SC_FormParam $objFormParam SC_FormParam インスタンス - * @access public - * @return void - */ - function sfCustomerOtherDelivParam(&$objFormParam) { - SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); - $objFormParam->addParam('', 'other_deliv_id'); - } - - /** * 会員共通 * @@ -415,9 +403,4 @@ } } - } - - function sfCustomerOtherDelivErrorCheck(&$objFormParam) { - $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam); - return $objErr->arrErr; } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php (revision 22065) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php (revision 22065) @@ -0,0 +1,133 @@ +count('dtb_other_deliv', 'customer_id = ?', array($customer_id)); + // 別のお届け先最大登録数に達している場合、エラー + if ($deliv_count >= DELIV_ADDR_MAX) { + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先最大登録数に達しています。'); + } + + // 実行 + $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($customer_id, $other_deliv_id)); + if ($deliv_count != 1) { + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '一致する別のお届け先がありません。'); + } + + // 実行 + $objQuery->update('dtb_other_deliv', $sqlval, 'other_deliv_id = ?', array($other_deliv_id)); + } + } + + /** + * お届け先を取得 + * + * @param integer $customer_id + * @param integer $other_deliv_id + * @return array() + */ + function getAddress($customer_id, $other_deliv_id) { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $address = $objQuery->select('*', 'dtb_other_deliv', 'customer_id = ? AND other_deliv_id = ?', array($customer_id, $other_deliv_id)); + return $address ? $address[0] : FALSE; + } + + /** + * お届け先の一覧を取得 + * + * @param integer $customerId + * @param integer $startno + * @return array + */ + function getList($customer_id, $startno = '') { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $objQuery->setOrder('other_deliv_id DESC'); + //スマートフォン用の処理 + if ($startno != '') { + $objQuery->setLimitOffset(SEARCH_PMAX, $startno); + } + return $objQuery->select('*', 'dtb_other_deliv', 'customer_id = ?', array($customer_id)); + } + + /** + * お届け先の削除 + * + * @param integer $customerId + * @param integer $delivId + * @return void + */ + function deleteAddress($customer_id, $other_deliv_id) { + $where = 'customer_id = ? AND other_deliv_id = ?'; + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $objQuery->delete('dtb_other_deliv', $where, array($customer_id, $other_deliv_id)); + } + + /** + * お届け先フォーム初期化 + * + * @param SC_FormParam $objFormParam SC_FormParam インスタンス + * @return void + */ + function setFormParam(&$objFormParam) { + SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); + $objFormParam->addParam('', 'other_deliv_id'); + } + + /** + * お届け先フォームエラーチェック + * + * @param SC_FormParam $objFormParam SC_FormParam インスタンス + * @return void + */ + function errorCheck(&$objFormParam) { + $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam); + return $objErr->arrErr; + } +} Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 21951) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 22065) @@ -73,4 +73,5 @@ $objPurchase = new SC_Helper_Purchase_Ex(); $objFormParam = new SC_FormParam_Ex(); + $objAddress = new SC_Helper_Address_Ex(); $this->tpl_uniqid = $objSiteSess->getUniqId(); @@ -109,5 +110,5 @@ // 削除 case 'delete': - $this->doDelete($arrForm['other_deliv_id']); + $objAddress->deleteAddress($objCustomer->getValue('customer_id'), $arrForm['other_deliv_id']); break; @@ -117,5 +118,5 @@ $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,5 +162,23 @@ // 登録済み住所を取得 - $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,16 +204,4 @@ $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,5 +219,5 @@ * @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,9 +228,6 @@ // 別のお届け先がチェックされている場合 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; } Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 21951) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 22065) @@ -71,4 +71,5 @@ $objCustomer = new SC_Customer_Ex(); $objFormParam = new SC_FormParam_Ex(); + $objAddress = new SC_Helper_Address_Ex(); // 複数配送先指定が無効な場合はエラー @@ -81,5 +82,5 @@ $this->addrs = $this->getDelivAddrs($objCustomer, $objPurchase, - $this->tpl_uniqid); + $objAddress, $this->tpl_uniqid); $this->tpl_addrmax = count($this->addrs); $this->lfInitParam($objFormParam); @@ -96,5 +97,5 @@ $this->saveMultipleShippings($this->tpl_uniqid, $objFormParam, $objCustomer, $objPurchase, - $objCartSess); + $objCartSess, $objAddress); $objSiteSess->setRegistFlag(); @@ -187,5 +188,5 @@ * @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,5 +195,23 @@ // 会員ログイン時 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,5 +299,5 @@ * @return void */ - function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess) { + function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -290,8 +309,6 @@ 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; } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21867) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 22065) @@ -72,4 +72,5 @@ $objCustomer = new SC_Customer_Ex(); + $objAddress = new SC_Helper_Address_Ex(); $ParentPage = MYPAGE_DELIVADDR_URLPATH; @@ -97,5 +98,5 @@ // パラメーター管理クラス,パラメーター情報の初期化 $objFormParam = new SC_FormParam_Ex(); - SC_Helper_Customer_Ex::sfCustomerOtherDelivParam($objFormParam); + $objAddress->setFormParam($objFormParam); $objFormParam->setParam($_POST); $this->arrForm = $objFormParam->getHashArray(); @@ -104,5 +105,5 @@ // 入力は必ずedit case 'edit': - $this->arrErr = SC_Helper_Customer_Ex::sfCustomerOtherDelivErrorCheck($objFormParam); + $this->arrErr = $objAddress->errorCheck($objFormParam); // 入力エラーなし if (empty($this->arrErr)) { @@ -116,5 +117,5 @@ if ($objCustomer->isLoginSuccess(true)) { - $this->lfRegistData($objFormParam, $objCustomer->getValue('customer_id')); + $this->lfRegistData($objAddress, $objFormParam, $objCustomer->getValue('customer_id')); } else { $this->lfRegistDataNonMember($objFormParam); @@ -135,13 +136,13 @@ if ($_GET['other_deliv_id'] != '') { - $arrOtherDeliv = $this->lfGetOtherDeliv($objCustomer->getValue('customer_id'), $_SESSION['other_deliv_id']); + $arrOtherDeliv = $objAddress->getAddress($objCustomer->getValue('customer_id'), $_SESSION['other_deliv_id']); //不正アクセス判定 - if (!$objCustomer->isLoginSuccess(true) || count($arrOtherDeliv) == 0) { + if (!$objCustomer->isLoginSuccess(true) || !$arrOtherDeliv) { SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); } //別のお届け先情報取得 - $this->arrForm = $arrOtherDeliv[0]; + $this->arrForm = $arrOtherDeliv; } break; @@ -165,21 +166,6 @@ } - /** - * ほかのお届け先を取得する - * - * @param mixed $customer_id - * @param mixed $other_deliv_id - * @access private - * @return array() - */ - function lfGetOtherDeliv($customer_id, $other_deliv_id) { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->select('*', 'dtb_other_deliv', 'customer_id = ? AND other_deliv_id = ?', array($customer_id, $other_deliv_id)); - } - /* 登録実行 */ - function lfRegistData($objFormParam, $customer_id) { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - + function lfRegistData($objAddress, $objFormParam, $customer_id) { $arrRet = $objFormParam->getHashArray(); $sqlval = $objFormParam->getDbArray(); @@ -187,27 +173,5 @@ $sqlval['customer_id'] = $customer_id; - // 追加 - if (strlen($arrRet['other_deliv_id'] == 0)) { - // 別のお届け先登録数の取得 - $deliv_count = $objQuery->count('dtb_other_deliv', 'customer_id = ?', array($customer_id)); - // 別のお届け先最大登録数に達している場合、エラー - if ($deliv_count >= DELIV_ADDR_MAX) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先最大登録数に達しています。'); - } - - // 実行 - $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($customer_id, $arrRet['other_deliv_id'])); - if ($deliv_count != 1) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '一致する別のお届け先がありません。'); - } - - // 実行 - $objQuery->update('dtb_other_deliv', $sqlval, 'other_deliv_id = ?', array($arrRet['other_deliv_id'])); - } + $objAddress->registAddress($customer_id, $sqlval, $arrRet['other_deliv_id']); } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 21867) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 22065) @@ -69,4 +69,5 @@ $objCustomer = new SC_Customer_Ex(); $customer_id = $objCustomer->getValue('customer_id'); + $objAddress = new SC_Helper_Address_Ex(); $objFormParam = new SC_FormParam_Ex(); @@ -84,5 +85,5 @@ } - $this->deleteOtherDeliv($customer_id, $objFormParam->getValue('other_deliv_id')); + $objAddress->deleteAddress($customer_id, $objFormParam->getValue('other_deliv_id')); break; @@ -91,5 +92,5 @@ $arrData = $objFormParam->getHashArray(); //別のお届け先情報 - $arrOtherDeliv = $this->getOtherDeliv($customer_id, (($arrData['pageno'] - 1) * SEARCH_PMAX)); + $arrOtherDeliv = $objAddress->getList($customer_id, (($arrData['pageno'] - 1) * SEARCH_PMAX)); //県名をセット $arrOtherDeliv = $this->setPref($arrOtherDeliv, $this->arrPref); @@ -108,5 +109,5 @@ //別のお届け先情報 - $this->arrOtherDeliv = $this->getOtherDeliv($customer_id); + $this->arrOtherDeliv = $objAddress->getList($customer_id); //お届け先登録数 @@ -139,33 +140,4 @@ /** - * お届け先の取得 - * - * @param integer $customerId - * @param integer $startno - * @return array - */ - function getOtherDeliv($customer_id, $startno = '') { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objQuery->setOrder('other_deliv_id DESC'); - //スマートフォン用の処理 - if ($startno != '') { - $objQuery->setLimitOffset(SEARCH_PMAX, $startno); - } - return $objQuery->select('*', 'dtb_other_deliv', 'customer_id = ?', array($customer_id)); - } - - /** - * お届け先の削除 - * - * @param integer $customerId - * @param integer $delivId - */ - function deleteOtherDeliv($customer_id, $deliv_id) { - $where = 'customer_id = ? AND other_deliv_id = ?'; - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objQuery->delete('dtb_other_deliv', $where, array($customer_id, $deliv_id)); - } - - /** * 県名をセット *