[Svn-src-all:4268] [version-2_13_0 23182] #1506 「決済処理中」受注データの実行フラグを追加
h_yoshimoto
admin ＠ mail.ec-cube.net
2013年 9月 3日 (火) 17:18:10 JST
Subversion committed to /home/svn/open 23182
http://svn.ec-cube.net/open_trac/changeset/23182
┌────────────────────────────┐
│更新者 : h_yoshimoto │
│更新日時: 2013-09-03 17:18:10 +0900 (火, 03 9月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1506 「決済処理中」受注データの実行フラグを追加
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_13_0/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_13_0/data/class/pages/LC_Page_Index.php
U branches/version-2_13_0/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
U branches/version-2_13_0/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage.php
U branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Login.php
U branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_13_0/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_13_0/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U branches/version-2_13_0/data/mtb_constants_init.php
U branches/version-2_13_0/html/install/sql/insert_data.sql
変更: branches/version-2_13_0/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_13_0/data/class/helper/SC_Helper_Purchase.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/helper/SC_Helper_Purchase.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -1343,6 +1343,19 @@
}
/**
+ * 決済処理中スタータスの受注データのキャンセル処理
+ * @param $cancel_flg 決済処理中ステータスのロールバックをするか(true:する false:しない)
+ */
+ public function cancelPendingOrder($cancel_flg)
+ {
+ if($cancel_flg == true){
+ $this->checkDbAllPendingOrder();
+ $this->checkDbMyPendignOrder();
+ $this->checkSessionPendingOrder();
+ }
+ }
+
+ /**
* 決済処理中スタータスの全受注検索
*/
public function checkDbAllPendingOrder()
変更: branches/version-2_13_0/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_13_0/data/class/pages/LC_Page_Index.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/LC_Page_Index.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -63,9 +63,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$this->tpl_title = '';
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13_0/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_13_0/data/class/pages/cart/LC_Page_Cart.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/cart/LC_Page_Cart.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -75,9 +75,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
変更: branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -76,9 +76,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objFormParam = new SC_FormParam_Ex();
変更: branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -64,9 +64,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- SC_Helper_Purchase_Ex::checkSessionPendingOrder();
- SC_Helper_Purchase_Ex::checkDbMyPendignOrder();
- SC_Helper_Purchase_Ex::checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$arrKiyaku = $this->lfGetKiyakuData();
$this->max = count($arrKiyaku);
変更: branches/version-2_13_0/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_13_0/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -65,9 +65,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
// 会員管理クラス
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -74,9 +74,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
変更: branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -72,12 +72,9 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- SC_Helper_Purchase_Ex::checkSessionPendingOrder();
- SC_Helper_Purchase_Ex::checkDbMyPendignOrder();
- SC_Helper_Purchase_Ex::checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objProduct = new SC_Product();
if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
変更: branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Login.php
===================================================================
--- branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Login.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Login.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -62,9 +62,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
}
変更: branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -62,9 +62,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
//受注詳細データの取得
$arrOrderDetail = $this->lfGetOrderDetail($_POST['order_id']);
変更: branches/version-2_13_0/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_13_0/data/class/pages/products/LC_Page_Products_Detail.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/products/LC_Page_Products_Detail.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -100,9 +100,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
// 会員クラス
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13_0/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_13_0/data/class/pages/products/LC_Page_Products_List.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/products/LC_Page_Products_List.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -93,9 +93,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objProduct = new SC_Product_Ex();
// パラメーター管理クラス
変更: branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -77,15 +77,12 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
$objCookie = new SC_Cookie_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
$nonmember_mainpage = 'shopping/nonmember_input.tpl';
変更: branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -73,14 +73,11 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$this->is_multiple = $objPurchase->isMultiple();
変更: branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -68,14 +68,11 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
$objAddress = new SC_Helper_Address_Ex();
変更: branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -65,13 +65,10 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer_Ex();
$objFormParam = new SC_FormParam_Ex();
$objAddress = new SC_Helper_Address_Ex();
変更: branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -73,13 +73,10 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer_Ex();
$objFormParam = new SC_FormParam_Ex();
$objDelivery = new SC_Helper_Delivery_Ex();
変更: branches/version-2_13_0/data/mtb_constants_init.php
===================================================================
--- branches/version-2_13_0/data/mtb_constants_init.php 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/data/mtb_constants_init.php 2013-09-03 08:18:10 UTC (rev 23182)
@@ -482,5 +482,5 @@
define('TAX_RULE_PRIORITY', "product_id,product_class_id,pref_id,country_id");
/** 決済処理中ステータスのロールバックを行う時間の設定(秒) */
define('PENDING_ORDER_CANCEL_TIME', 900);
-
-
+/** 決済処理中ステータスのロールバックをするか(true:する false:しない) */
+define('PENDING_ORDER_CANCEL_FLAG', true);
\ No newline at end of file
変更: branches/version-2_13_0/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_13_0/html/install/sql/insert_data.sql 2013-09-03 07:45:04 UTC (rev 23181)
+++ branches/version-2_13_0/html/install/sql/insert_data.sql 2013-09-03 08:18:10 UTC (rev 23182)
@@ -1262,6 +1262,7 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OPTION_PRODUCT_TAX_RULE', '0', 1415, '商品ごとの税率設定(軽減税率対応 有効:1 無効:0) ');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TAX_RULE_PRIORITY', '"product_id,product_class_id,pref_id,country_id"', 1416, '複数箇所の税率設定時における優先度設定。カンマ区切りスペース不可で記述。後に書いてあるキーに一致するほど優先される。デフォルト：''product_id,product_class_id,pref_id,country_id''（国＞地域（県）＞規格単位＞商品単位）');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_TIME', '900', 1417, '決済処理中ステータスのロールバックを行う時間の設定(秒) ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_FLAG', 'true', 1418, '決済処理中ステータスのロールバックをするか(true:する false:しない)');
INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, '会員数増加時のログイン処理速度を向上させたいときに試してみてください');
INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_products', 'name', 2, '商品名検索速度を向上させたいときに試してみてください');
Svn-src-all メーリングリストの案内