[Svn-src-all:1548] [version-2_5-dev 20444] SC_CartSessionクラスのclass_extends対応。
shutta
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 19:48:28 JST
Subversion committed to /home/svn/open 20444
http://svn.ec-cube.net/open_trac/changeset/20444
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-28 19:48:28 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
SC_CartSessionクラスのclass_extends対応。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Display.php
U branches/version-2_5-dev/data/class/SC_SiteView.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
A branches/version-2_5-dev/data/class_extends/SC_CartSession_Ex.php
U branches/version-2_5-dev/data/require_classes.php
変更: branches/version-2_5-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Display.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/SC_Display.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -55,7 +55,7 @@
function setPrevURL(){
// TODO SC_SiteSession で実装した方が良さげ
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
}
変更: branches/version-2_5-dev/data/class/SC_SiteView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SiteView.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/SC_SiteView.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -32,7 +32,7 @@
$this->initpath();
if ($setPrevURL) {
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
}
}
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -56,7 +56,7 @@
function completeOrder($orderStatus = ORDER_NEW) {
$objQuery =& SC_Query::getSingletonInstance();
$objSiteSession = new SC_SiteSession();
- $objCartSession = new SC_CartSession();
+ $objCartSession = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$customerId = $objCustomer->getValue('customer_id');
変更: branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -75,7 +75,7 @@
* @return void
*/
function action() {
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession();
$objCustomer = new SC_Customer();
変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -63,7 +63,7 @@
*/
function action() {
// カートが空かどうかを確認する。
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$this->tpl_cart_empty = count($objCartSess->getCartList()) < 1;
// メインテンプレートを設定
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -62,7 +62,7 @@
* @return void
*/
function action() {
- $objCart = new SC_CartSession();
+ $objCart = new SC_CartSession_Ex();
$objSiteInfo = new SC_SiteInfo;
$this->isMultiple = $objCart->isMultiple();
$this->arrCartList = $this->lfGetCartData($objCart, $objSiteInfo);
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -104,7 +104,7 @@
// 商品をカートに追加
function lfAddCartProducts($arrOrderDetail) {
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
foreach($arrOrderDetail as $order_row) {
$objCartSess->addProduct($order_row['product_class_id'],
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -147,7 +147,7 @@
case 'cart':
$this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
if (count($this->arrErr) == 0) {
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$classcategory_id1 = $this->objFormParam->getValue('classcategory_id1');
$classcategory_id2 = $this->objFormParam->getValue('classcategory_id2');
$product_class_id = $this->objFormParam->getValue('product_class_id');
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -501,7 +501,7 @@
// 規格IDを取得
$product_class_id = $arrForm['product_class_id'];
$product_type = $arrForm['product_type'];
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objCartSess->addProduct($product_class_id, $arrForm['quantity']);
// カート「戻るボタン」用に保持
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -76,7 +76,7 @@
*/
function action() {
$objSiteSess = new SC_SiteSession();
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$objCookie = new SC_Cookie();
$objPurchase = new SC_Helper_Purchase_Ex();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -70,7 +70,7 @@
* @return void
*/
function action() {
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession();
$objCustomer = new SC_Customer();
$objQuery = new SC_Query();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -66,7 +66,7 @@
*/
function action() {
$objSiteSess = new SC_SiteSession();
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -52,7 +52,7 @@
*/
function process() {
$objSiteSess = new SC_SiteSession();
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
if (!$objSiteSess->isPrePage()) {
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -64,7 +64,7 @@
*/
function action() {
$objSiteSess = new SC_SiteSession();
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer();
$objFormParam = new SC_FormParam();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -75,7 +75,7 @@
*/
function action() {
$objSiteSess = new SC_SiteSession();
- $objCartSess = new SC_CartSession();
+ $objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer();
$objFormParam = new SC_FormParam();
追加: branches/version-2_5-dev/data/class_extends/SC_CartSession_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_CartSession_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_CartSession_Ex.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_CartSession.php");
+
+class SC_CartSession_Ex extends SC_CartSession {
+}
+
+?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2011-02-28 10:03:31 UTC (rev 20443)
+++ branches/version-2_5-dev/data/require_classes.php 2011-02-28 10:48:28 UTC (rev 20444)
@@ -43,7 +43,7 @@
require_once(CLASS_REALDIR . "SC_SiteInfo.php");
require_once(CLASS_EX_REALDIR . "SC_SendMail_Ex.php");
require_once(CLASS_REALDIR . "SC_FormParam.php");
-require_once(CLASS_REALDIR . "SC_CartSession.php");
+require_once(CLASS_EX_REALDIR . "SC_CartSession_Ex.php");
require_once(CLASS_REALDIR . "SC_SiteSession.php");
require_once(CLASS_REALDIR . "SC_Customer.php");
require_once(CLASS_REALDIR . "SC_CustomerList.php");
Svn-src-all メーリングリストの案内