Changeset 19912 for branches/version-2_5-dev/data/class/util/SC_Utils.php

Timestamp:

2011/01/14 16:05:27 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19911

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php 18068@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_SearchCustomer.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/class/pages/mypage/LC_Page_Mypage_Refusal.php 16107@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Refusal.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php lc_page_shopping_loa-20101025071457-rpmc2g2y1ik9lyow-1
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2641

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php [email protected]
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_History.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Refusal.php [email protected]
data/class/pages/shopping/LC_Page_Shopping.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Deliv.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php [email protected]
data/class/util/SC_Utils.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]

bzr:timestamp:

2011-01-14 16:05:11.578999996 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-14T07:05:11.579000Z

Message:

#628(未使用処理・定義などの削除)

• モジュール連携用のコードを削除

#843(複数配送先の指定)

• 受注編集画面を修正

#642(共通ロジックの機能向上)

• SC_Utils::sfIsPrePage(), SC_Utils::sfCheckNormalAccess() を削除

#631(テーブル定義の改良)

• データ型を大文字に統一

File:

• branches/version-2_5-dev/data/class/util/SC_Utils.php (modified) (1 diff)

branches/version-2_5-dev/data/class/util/SC_Utils.php

@@ -301 +301 @@
     }
 
-    /**
-     * 前のページで正しく登録が行われたか判定
-     *
-     * @deprecated SC_SiteSession::isPrePage() を使用して下さい
-     */
-    function sfIsPrePage(&$objSiteSess) {
-        $ret = $objSiteSess->isPrePage();
-        if($ret != true) {
-            // エラーページの表示
-            SC_Utils::sfDispSiteError(PAGE_ERROR, $objSiteSess);
-        }
-    }
-
-    /**
-     * @deprecated SC_Helper_Purchase::verifyChangeCart() を使用して下さい.
-     */
-    function sfCheckNormalAccess(&$objSiteSess, &$objCartSess) {
-        // ユーザユニークIDの取得
-        $uniqid = $objSiteSess->getUniqId();
-
-        $cartkeys = $objCartSess->getKeys();
-
-        foreach ($cartKeys as $cartKey) {
-            // 購入ボタンを押した時のカート内容がコピーされていない場合のみコピーする。
-            $objCartSess->saveCurrentCart($uniqid, $cartKey);
-            // POSTのユニークIDとセッションのユニークIDを比較(ユニークIDがPOSTされていない場合はスルー)
-            $ret = $objSiteSess->checkUniqId();
-            if($ret != true) {
-                // エラーページの表示
-                SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE, $objSiteSess);
-            }
-
-            // カート内が空でないか || 購入ボタンを押してから変化がないか
-            $quantity = $objCartSess->getTotalQuantity($cartKey);
-            $ret = $objCartSess->checkChangeCart($cartKey);
-            if($ret == true || !($quantity > 0)) {
-                // カート情報表示に強制移動する
-                // FIXME false を返して, Page クラスで遷移させるべき...
-                if (defined("MOBILE_SITE")) {
-                    header("Location: ". MOBILE_CART_URL_PATH
-                           . "?" . session_name() . "=" . session_id());
-                } else {
-                    header("Location: ".CART_URL_PATH);
-                }
-                exit;
-            }
-        }
-        return $uniqid;
-    }
-
     /* DB用日付文字列取得 */
     function sfGetTimestamp($year, $month, $day, $last = false) {