[Svn-src-all:3585] [version-2_12_3 22497] #1958 関数名を修正
h_yoshimoto
admin ＠ mail.ec-cube.net
2013年 2月 4日 (月) 20:23:58 JST
Subversion committed to /home/svn/open 22497
http://svn.ec-cube.net/open_trac/changeset/22497
┌────────────────────────────┐
│更新者 : h_yoshimoto │
│更新日時: 2013-02-04 20:23:57 +0900 (月, 04 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1958 関数名を修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12_3/data/class/helper/SC_Helper_Address.php
U branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
U branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_12_3/test/class/helper/SC_Helper_Address_Test.php
変更: branches/version-2_12_3/data/class/helper/SC_Helper_Address.php
===================================================================
--- branches/version-2_12_3/data/class/helper/SC_Helper_Address.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/data/class/helper/SC_Helper_Address.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -36,7 +36,7 @@
* @param array $sqlval
* @return array()
*/
- function save($sqlval) {
+ function registAddress($sqlval) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$customer_id = $sqlval['customer_id'];
$other_deliv_id = $sqlval['other_deliv_id'];
@@ -76,7 +76,7 @@
* @param integer $other_deliv_id
* @return array()
*/
- function get($other_deliv_id) {
+ function getAddress($other_deliv_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id));
return $address ? $address[0] : FALSE;
@@ -105,7 +105,7 @@
* @param integer $delivId
* @return void
*/
- function delete($other_deliv_id) {
+ function deleteAddress($other_deliv_id) {
$where = 'other_deliv_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
変更: branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -84,7 +84,7 @@
SC_Response_Ex::actionExit();
}
- $objAddress->delete($objFormParam->getValue('other_deliv_id'));
+ $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
break;
// スマートフォン版のもっと見るボタン用
変更: branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -135,7 +135,7 @@
default :
if ($_GET['other_deliv_id'] != '') {
- $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']);
+ $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
//不正アクセス判定
if (!$objCustomer->isLoginSuccess(true) || !$arrOtherDeliv) {
@@ -173,7 +173,7 @@
$sqlval['other_deliv_id'] = $arrRet['other_deliv_id'];
$sqlval['customer_id'] = $customer_id;
- $objAddress->save($sqlval);
+ $objAddress->registAddress($sqlval);
}
function lfRegistDataNonMember($objFormParam) {
変更: branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -109,7 +109,7 @@
switch ($this->getMode()) {
// 削除
case 'delete':
- $objAddress->delete($arrForm['other_deliv_id']);
+ $objAddress->deleteAddress($arrForm['other_deliv_id']);
break;
// 会員登録住所に送る
@@ -227,7 +227,7 @@
}
// 別のお届け先がチェックされている場合
else {
- $arrOtherDeliv = $objAddress->get($other_deliv_id);
+ $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
if (!$arrOtherDeliv) {
return false;
}
変更: branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -306,7 +306,7 @@
if ($objCustomer->isLoginSuccess(true)) {
if ($other_deliv_id != 0) {
- $otherDeliv = $objAddress->get($other_deliv_id);
+ $otherDeliv = $objAddress->getAddress($other_deliv_id);
foreach ($otherDeliv as $key => $val) {
$arrValues[$other_deliv_id]['shipping_' . $key] = $val;
}
変更: branches/version-2_12_3/test/class/helper/SC_Helper_Address_Test.php
===================================================================
--- branches/version-2_12_3/test/class/helper/SC_Helper_Address_Test.php 2013-02-04 09:12:18 UTC (rev 22496)
+++ branches/version-2_12_3/test/class/helper/SC_Helper_Address_Test.php 2013-02-04 11:23:57 UTC (rev 22497)
@@ -56,13 +56,13 @@
$this->objQuery->rollback();
}
- function testSave() {
+ function testRegistAddress() {
// ダミーの住所を登録
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
// 検証用の住所02
$sqlval['addr02'] = $create_test = 'create test ' . time();
- $this->objAddress->save($sqlval);
+ $this->objAddress->registAddress($sqlval);
// 住所02が検証用のものと同じか確認
$this->objQuery->setOrder('other_deliv_id DESC');
@@ -72,7 +72,7 @@
$sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
// 更新の検証のために住所02を変更
$sqlval['addr02'] = $update_test = 'update test ' . time();
- $this->objAddress->save($sqlval);
+ $this->objAddress->registAddress($sqlval);
// 住所02が検証用のものと同じか検証
$this->objQuery->setOrder('other_deliv_id DESC');
@@ -83,16 +83,16 @@
/**
* @depends testSave
*/
- function testGet() {
+ function testGetAddress() {
// testSave のテストが通っていること前提
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
$sqlval['addr02'] = 'get test';
- $this->objAddress->save($sqlval);
+ $this->objAddress->registAddress($sqlval);
$this->objQuery->setOrder('other_deliv_id DESC');
$other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
// DBに正しく記録され、取得できているか確認
- $address = $this->objAddress->get($other_deliv_id);
+ $address = $this->objAddress->getAddress($other_deliv_id);
$result = TRUE;
foreach ($sqlval as $key => $value) {
if ($value != $address[$key]) {
@@ -110,7 +110,7 @@
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
$sqlval['addr02'] = 'getList test';
- $this->objAddress->save($sqlval);
+ $this->objAddress->registAddress($sqlval);
$list = $this->objAddress->getList($this->customer_id);
$found = FALSE;
foreach ($list as $address) {
@@ -131,15 +131,15 @@
/**
* @depends testSave
*/
- function testDelete() {
+ function testDeleteAddress() {
// testSave のテストが通っていること前提
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
$sqlval['addr02'] = 'delete test';
- $this->objAddress->save($sqlval);
+ $this->objAddress->registAddress($sqlval);
$this->objQuery->setOrder('other_deliv_id DESC');
$other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
- $this->objAddress->delete($other_deliv_id);
+ $this->objAddress->deleteAddress($other_deliv_id);
$result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id));
$this->assertNull($result);
}
Svn-src-all メーリングリストの案内