[Svn-src-all:3625] [version-2_12-dev 22537] pageクラスからdtb_paymentテーブルを直接指定している箇所をなくす
pineray
admin ＠ mail.ec-cube.net
2013年 2月 13日 (水) 18:15:47 JST
Subversion committed to /home/svn/open 22537
http://svn.ec-cube.net/open_trac/changeset/22537
┌────────────────────────────┐
│更新者 : pineray │
│更新日時: 2013-02-13 18:15:46 +0900 (水, 13 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
pageクラスからdtb_paymentテーブルを直接指定している箇所をなくす
以下のファイルが残っている.
LC_Page_Shopping_LoadPaymentModule.php
LC_Page_Admin_Home.php
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php
U branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
U branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
U branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -34,11 +34,15 @@
* 支払方法の情報を取得.
*
* @param integer $payment_id 支払方法ID
+ * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function get($payment_id) {
+ public function get($payment_id, $has_deleted = false) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'payment_id = ?';
+ if (!$has_deleted) {
+ $where .= ' del_flg = 0';
+ }
$arrRet = $objQuery->select('*', 'dtb_payment', $where, array($payment_id));
return $arrRet[0];
}
@@ -46,12 +50,16 @@
/**
* 支払方法一覧の取得.
*
+ * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function getList() {
+ public function getList($has_deleted = false) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'payment_id, payment_method, charge, rule_max, upper_rule, note, fix, charge_flg';
- $where = 'del_flg = 0';
+ $where = '';
+ if (!$has_deleted) {
+ $where .= 'del_flg = 0';
+ }
$table = 'dtb_payment';
$objQuery->setOrder('rank DESC');
$arrRet = $objQuery->select($col, $table, $where);
@@ -130,4 +138,13 @@
$memo03 = $objQuery->get('memo03', 'dtb_payment', 'payment_id = ?', array($payment_id));
return !SC_Utils_Ex::isBlank($memo03);
}
+
+ /**
+ * 支払方法IDをキー, 名前を値とする配列を取得.
+ *
+ * @return array
+ */
+ public static function getIDValueList() {
+ return SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ }
}
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -571,19 +571,6 @@
}
/**
- * 支払方法の詳細を取得する.
- *
- * @param integer $payment_id お支払い方法
- * @return array 支払方法詳細の配列
- */
- function getPaymentsByPaymentsId($payment_id) {
- $objQuery =& SC_Query_Ex::getSingletonInstance();
- $where = 'payment_id = ? AND del_flg = 0';
- $arrValues = array($payment_id);
- return $objQuery->getRow('*', 'dtb_payment', $where, $arrValues);
- }
-
- /**
* お届け日一覧を取得する.
*/
function getDelivDate(&$objCartSess, $productTypeId) {
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -48,7 +48,7 @@
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrProductType = $masterData->getMasterData('mtb_product_type');
- $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
$this->tpl_maintitle = '基本情報管理';
$this->tpl_subtitle = '配送方法設定';
$this->mode = $this->getMode();
変更: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -65,8 +65,7 @@
$this->arrDay = $objDate->getDay();
// 支払い方法種別
- $objDb = new SC_Helper_DB_Ex();
- $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
}
/**
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -70,7 +70,7 @@
$this->arrDay = $objDate->getDay();
// 支払い方法の取得
- $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
$this->httpCacheControl('nocache');
}
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -88,7 +88,7 @@
$this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
// 支払い方法の取得
- $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
// 配送業者の取得
$this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -107,7 +107,7 @@
$this->arrDayShippingDate = $objDate->getDay(true);
// 支払い方法の取得
- $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
// 配送業者の取得
$this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -84,7 +84,7 @@
$this->arrForm = $objFormParam->getHashArray();
//支払方法の取得
- $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
switch ($this->getMode()) {
case 'update':
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -74,7 +74,7 @@
$this->arrDELIVERYDATE = $masterData->getMasterData('mtb_delivery_date');
$this->arrProductType = $masterData->getMasterData('mtb_product_type');
$this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
- $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
$this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
$this->arrAllowedTag = $masterData->getMasterData('mtb_allowed_tag');
$this->arrTagCheckItem = array();
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -99,7 +99,7 @@
break;
}
// 支払い方法の取得
- $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
// 1ページあたりの件数
$this->dispNumber = SEARCH_PMAX;
}
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -93,7 +93,7 @@
$this->isMultiple = count($this->arrShipping) > 1;
// 支払い方法の取得
- $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
+ $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
// 受注商品明細の取得
$this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
foreach ($this->tpl_arrOrderDetail as $product_index => $arrOrderProductDetail) {
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-02-13 09:10:52 UTC (rev 22536)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-02-13 09:15:46 UTC (rev 22537)
@@ -326,7 +326,8 @@
$objErr->arrErr['use_point'] = '※ ご利用ポイントがご購入金額を超えています。<br>';
}
// ポイント差し引き後の決済方法チェック
- $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']);
+ $objPayment = new SC_Helper_Payment_Ex();
+ $arrPayments = $objPayment->get($arrForm['payment_id']);
if ($arrPayments['rule_max'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) {
$objErr->arrErr['use_point'] = '※ 選択した支払方法では、ポイントは'.($subtotal - $arrPayments['rule_max']).'ポイントまでご利用いただけます。<br>';
}
Svn-src-all メーリングリストの案内