Changeset 19912 for branches/version-2_5-dev/data/class
- Timestamp:
- 2011/01/14 16:05:27 (15 years ago)
- 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
- Location:
- branches/version-2_5-dev/data/class
- Files:
-
- 10 edited
-
helper/SC_Helper_Purchase.php (modified) (1 diff)
-
pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php (modified) (1 diff)
-
pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (9 diffs)
-
pages/mypage/LC_Page_Mypage_History.php (modified) (1 diff)
-
pages/mypage/LC_Page_Mypage_Refusal.php (modified) (1 diff)
-
pages/shopping/LC_Page_Shopping.php (modified) (3 diffs)
-
pages/shopping/LC_Page_Shopping_Confirm.php (modified) (1 diff)
-
pages/shopping/LC_Page_Shopping_Deliv.php (modified) (1 diff)
-
pages/shopping/LC_Page_Shopping_LoadPaymentModule.php (modified) (2 diffs)
-
util/SC_Utils.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
r19888 r19912 62 62 63 63 $objQuery->begin(); 64 SC_Utils_Ex::sfIsPrePage($objSiteSession); 64 if (!$objSiteSession->isPrePage()) { 65 SC_Utils::sfDispSiteError(PAGE_ERROR, $objSiteSession); 66 } 65 67 66 68 $uniqId = $objSiteSession->getUniqId(); -
branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php
r19805 r19912 163 163 } 164 164 $this->arrForm = $arrForm; 165 $this->setTemplate($this->tpl_mainpage); 165 166 } 166 167 -
branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r19805 r19912 25 25 require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php"); 26 26 27 /* GMO決済モジュール連携用 */28 if (file_exists(MODULE_REALDIR . 'mdl_gmopg/inc/include.php') === TRUE) {29 require_once(MODULE_REALDIR . 'mdl_gmopg/inc/include.php');30 }31 32 /* ペイジェント決済モジュール連携用 */33 if (file_exists(MODULE_REALDIR . 'mdl_paygent/include.php') === TRUE) {34 require_once(MODULE_REALDIR . 'mdl_paygent/include.php');35 }36 37 /* F-REGI決済モジュール連携用 */38 if (file_exists(MODULE_REALDIR. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php') === TRUE) {39 require_once(MODULE_REALDIR. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php');40 }41 42 /* SPS決済モジュール連携用 */43 if (file_exists(MODULE_REALDIR . 'mdl_sps/request.php') === TRUE) {44 require_once(MODULE_REALDIR . 'mdl_sps/request.php');45 }46 47 48 27 /** 49 28 * 受注修正 のページクラス. … … 85 64 $this->arrORDERSTATUS = $masterData->getMasterData("mtb_order_status"); 86 65 87 /* ペイジェント決済モジュール連携用 */88 if(function_exists("sfPaygentOrderPage")) {89 $this->arrDispKind = sfPaygentOrderPage();90 }91 92 /* F-REGI決済モジュール連携用 */93 if (file_exists(MODULE_REALDIR. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php') === TRUE) {94 global $arrFregiPayment;95 $this->arrFregiPayment = $arrFregiPayment;96 global $arrFregiDispKind;97 $this->arrFregiDispKind = $arrFregiDispKind;98 }99 66 $this->httpCacheControl('nocache'); 100 67 } … … 194 161 $this->arrErr = $this->lfCheckError(); 195 162 break; 196 /* ペイジェント決済モジュール連携用 */ 197 case 'paygent_order': 198 $this->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id); 199 break; 163 200 164 /* 商品削除*/ 201 165 case 'delete_product': … … 250 214 251 215 break; 252 /* F-REGI決済モジュール連携用 */ 253 case 'fregi_status': 254 $objFregiConfig = new LC_Page_Mdl_Fregi_Config(); 255 $this->fregi_err = $objFregiConfig->getSaleInfo($order_id, $this->arrDisp); 256 $this->lfGetOrderData($order_id); 257 break; 258 case 'fregi_card': 259 $objFregiConfig = new LC_Page_Mdl_Fregi_Config(); 260 $this->fregi_card_err = $objFregiConfig->setCardInfo($_POST['card_status'], $order_id, $this->arrDisp); 261 $this->lfGetOrderData($order_id); 262 break; 263 /* SPS決済モジュール連携用 */ 264 case 'sps_request': 265 $objErr = new SC_CheckError($_POST); 266 $objErr->doFunc(array("年","sps_year"), array('EXIST_CHECK')); 267 $objErr->doFunc(array("月","sps_month"), array('EXIST_CHECK')); 268 $objErr->doFunc(array("日","sps_date"), array('EXIST_CHECK')); 269 $objErr->doFunc(array("売上・返金日", "sps_year", "sps_month", "sps_date"), array("CHECK_DATE")); 270 if ($objErr->arrErr) { 271 $this->arrErr = $objErr->arrErr; 272 break; 273 } 274 $sps_return = sfSpsRequest( $order_id, $_POST['request_type'] ); 275 // DBから受注情報を再読込 276 $this->lfGetOrderData($order_id); 277 $this->tpl_onload = "window.alert('".$sps_return."');"; 278 break; 279 280 /* GMOPG連携用 */ 281 case 'gmopg_order_edit': 282 require_once(MODULE_REALDIR . 'mdl_gmopg/class/LC_Mdl_GMOPG_OrderEdit.php'); 283 $objGMOOrderEdit = new LC_MDL_GMOPG_OrderEdit; 284 $this->gmopg_order_edit_result = $objGMOOrderEdit->proccess(); 285 $this->lfGetOrderData($order_id); 286 break; 216 287 217 default: 288 218 break; … … 308 238 $objSiteInfo = new SC_SiteInfo(); 309 239 $this->arrInfo = $objSiteInfo->data; 310 311 /**312 * SPS決済 クレジット判定用処理313 */314 if (file_exists(MODULE_REALDIR . 'mdl_sps/request.php') === TRUE) {315 $objQuery = new SC_Query();316 $this->paymentType = $objQuery->getAll("SELECT module_code, memo03 FROM dtb_payment WHERE payment_id = ? ", array($this->arrForm["payment_id"]['value']));317 $objDate = new SC_Date();318 $objDate->setStartYear(RELEASE_YEAR);319 $this->arrYear = $objDate->getYear();320 $this->arrMonth = $objDate->getMonth();321 $this->arrDay = $objDate->getDay();322 }323 240 324 241 // 表示モード判定 … … 357 274 $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 358 275 359 // お届け先情報360 $this->objFormParam->addParam("お名前1", "deliv_name01", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));361 $this->objFormParam->addParam("お名前2", "deliv_name02", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));362 $this->objFormParam->addParam("お名前(フリガナ・姓)", "deliv_kana01", STEXT_LEN, "KVCa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));363 $this->objFormParam->addParam("お名前(フリガナ・名)", "deliv_kana02", STEXT_LEN, "KVCa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));364 $this->objFormParam->addParam("郵便番号1", "deliv_zip01", ZIP01_LEN, "n", array("NUM_CHECK", "NUM_COUNT_CHECK"));365 $this->objFormParam->addParam("郵便番号2", "deliv_zip02", ZIP02_LEN, "n", array("NUM_CHECK", "NUM_COUNT_CHECK"));366 $this->objFormParam->addParam("都道府県", "deliv_pref", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));367 $this->objFormParam->addParam("住所1", "deliv_addr01", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));368 $this->objFormParam->addParam("住所2", "deliv_addr02", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));369 $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));370 $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));371 $this->objFormParam->addParam("電話番号3", "deliv_tel03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));372 373 374 276 // 受注商品情報 375 277 $this->objFormParam->addParam("値引き", "discount", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); … … 383 285 384 286 $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 385 $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));386 287 $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 387 $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));388 288 $this->objFormParam->addParam("お支払方法名称", "payment_method"); 389 $this->objFormParam->addParam("お届け時間", "deliv_time"); 289 390 290 391 291 // 受注詳細情報 … … 436 336 $this->objFormParam->setParam($arrRet); 437 337 338 $this->arrShipping = $this->lfGetShippingData($order_id); 339 $this->lfInitShippingParam($this->arrShipping); 340 foreach ($this->arrShipping as $shipping) { 341 foreach ($shipping as $shippingKey => $shippingVal) { 342 $this->arrForm[$shippingKey . $shipping['shipping_id']] = $shippingVal; 343 $this->objFormParam->setValue($shippingKey . $shipping['shipping_id'], $shippingVal); 344 } 345 } 346 438 347 // その他支払い情報を表示 439 348 if($this->arrForm["memo02"] != "") $this->arrForm["payment_info"] = unserialize($this->arrForm["memo02"]); … … 457 366 $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id)); 458 367 return $arrRet; 368 } 369 370 /** 371 * 配送情報の取得. 372 * TODO リファクタリング 373 */ 374 function lfGetShippingData($orderId) { 375 $objQuery =& SC_Query::getSingletonInstance(); 376 $objProduct = new SC_Product(); 377 $objQuery->setOrder('shipping_id'); 378 $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($orderId)); 379 foreach (array_keys($arrRet) as $key) { 380 $objQuery->setOrder('shipping_id'); 381 $arrItems = $objQuery->select("*", "dtb_shipment_item", "order_id = ? AND shipping_id = ?", 382 array($orderId, $arrRet[$key]['shipping_id'])); 383 foreach ($arrItems as $itemKey => $arrDetail) { 384 foreach ($arrDetail as $detailKey => $detailVal) { 385 $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']][$detailKey] = $detailVal; 386 } 387 388 $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']]['productsClass'] =& $objProduct->getDetailAndProductsClass($arrDetail['product_class_id']); 389 } 390 } 391 return $arrRet; 392 } 393 394 /** 395 * お届け先用フォームの初期化 396 */ 397 function lfInitShippingParam(&$arrShipping) { 398 foreach ($arrShipping as $shipping) { 399 $this->objFormParam->addParam("お名前1", "shipping_name01" . $shipping['shipping_id'], STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 400 $this->objFormParam->addParam("お名前2", "shipping_name02" . $shipping['shipping_id'], STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 401 $this->objFormParam->addParam("お名前(フリガナ・姓)", "shipping_kana01" . $shipping['shipping_id'], STEXT_LEN, "KVCa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 402 $this->objFormParam->addParam("お名前(フリガナ・名)", "shipping_kana02" . $shipping['shipping_id'], STEXT_LEN, "KVCa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 403 $this->objFormParam->addParam("郵便番号1", "shipping_zip01" . $shipping['shipping_id'], ZIP01_LEN, "n", array("NUM_CHECK", "NUM_COUNT_CHECK")); 404 $this->objFormParam->addParam("郵便番号2", "shipping_zip02" . $shipping['shipping_id'], ZIP02_LEN, "n", array("NUM_CHECK", "NUM_COUNT_CHECK")); 405 $this->objFormParam->addParam("都道府県", "shipping_pref" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 406 $this->objFormParam->addParam("住所1", "shipping_addr01" . $shipping['shipping_id'], MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 407 $this->objFormParam->addParam("住所2", "shipping_addr02" . $shipping['shipping_id'], MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 408 $this->objFormParam->addParam("電話番号1", "shipping_tel01" . $shipping['shipping_id'], TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 409 $this->objFormParam->addParam("電話番号2", "shipping_tel02" . $shipping['shipping_id'], TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 410 $this->objFormParam->addParam("電話番号3", "shipping_tel03" . $shipping['shipping_id'], TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 411 $this->objFormParam->addParam("お届け時間ID", "deliv_time_id" . $shipping['shipping_id'], INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 412 $this->objFormParam->addParam("お届け時間", "deliv_time" . $shipping['shipping_id']); 413 $this->objFormParam->addParam("お届け日", "deliv_date" . $shipping['shipping_id'], STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 414 } 459 415 } 460 416 -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
r19888 r19912 220 220 $objQuery =& SC_Query::getSingletonInstance(); 221 221 $objProduct = new SC_Product(); 222 $objQuery->setOrder('shipping_id'); 222 223 $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($orderId)); 223 224 foreach (array_keys($arrRet) as $key) { 225 $objQuery->setOrder('shipping_id'); 224 226 $arrItems = $objQuery->select("*", "dtb_shipment_item", "order_id = ? AND shipping_id = ?", 225 227 array($orderId, $arrRet[$key]['shipping_id'])); -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
r19881 r19912 137 137 // 正しい遷移かどうかをチェック 138 138 function lfIsValidMovement(&$objSiteSess) { 139 // 確認ページからの遷移かどうかをチェック140 SC_Utils_Ex::sfIsPrePage($objSiteSess);141 142 139 // uniqid がPOSTされているかをチェック 143 140 $uniqid = $objSiteSess->getUniqId(); 144 if ( !empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid) ) {141 if ($objSiteSess->isPrePage() || !empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid) ) { 145 142 return; 146 143 } else { -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
r19890 r19912 337 337 $sqlval['update_date'] = 'Now()'; 338 338 $sqlval['customer_id'] = '0'; 339 $sqlval['deliv_id'] = $objPurchase->getDeliv($productTypeId);340 339 341 340 // お届け先を指定しない場合、 … … 345 344 } 346 345 346 $deliv_id = $objPurchase->getDeliv($productTypeId); 347 $order_val = array('deliv_id' => $deliv_id); 348 $shipping_val = array('deliv_id' => $deliv_id); 349 347 350 /* 348 351 * order_* と shipping_* をそれぞれ $_SESSION['shipping'][$shipping_id] 349 352 * に, shipping_* というキーで保存 350 353 */ 351 $order_val = array();352 $shipping_val = array();353 354 foreach ($sqlval as $key => $val) { 354 355 if (preg_match('/^order_/', $key)) { … … 358 359 } 359 360 } 361 360 362 if ($isMultiple) { 361 363 $objPurchase->saveShippingTemp($order_val, 0); -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
r19907 r19912 80 80 81 81 // 前のページで正しく登録手続きが行われた記録があるか判定 82 SC_Utils_Ex::sfIsPrePage($objSiteSess); 82 if (!$objSiteSess->isPrePage()) { 83 SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, $objSiteSess); 84 } 83 85 84 86 // ユーザユニークIDの取得と購入状態の正当性をチェック -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
r19891 r19912 173 173 // 会員情報の住所を受注一時テーブルに書き込む 174 174 $objPurchase->copyFromCustomer($sqlval, $objCustomer, 'shipping'); 175 // FIXME ダウンロード商品の場合は配送無し 175 176 $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 176 177 $objPurchase->saveShippingTemp($sqlval); -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
r19805 r19912 54 54 $objSiteSess = new SC_SiteSession(); 55 55 $objCartSess = new SC_CartSession(); 56 SC_Utils::sfIsPrePage($objSiteSess); 57 SC_Utils::sfCheckNormalAccess($objSiteSess, $objCartSess); 56 $objPurchase = new SC_Helper_Purchase_Ex(); 57 58 if (!$objSiteSess->isPrePage()) { 59 SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, $objSiteSess); 60 } 61 62 $uniqid = $objSiteSess->getUniqId(); 63 $objPurchase->verifyChangeCart($uniqid, $objCartSess); 58 64 59 65 $payment_id = $this->getPaymentId(); 60 66 if ($payment_id === false) { 61 SC_Utils ::sfDispSiteError(PAGE_ERROR, "", true);67 SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); 62 68 return; 63 69 } … … 65 71 $module_path = $this->getModulePath($payment_id); 66 72 if ($module_path === false) { 67 SC_Utils ::sfDispSiteError(FREE_ERROR_MSG, "", true,73 SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", true, 68 74 "モジュールファイルの取得に失敗しました。<br />この手続きは無効となりました。"); 69 75 return; -
branches/version-2_5-dev/data/class/util/SC_Utils.php
r19895 r19912 301 301 } 302 302 303 /**304 * 前のページで正しく登録が行われたか判定305 *306 * @deprecated SC_SiteSession::isPrePage() を使用して下さい307 */308 function sfIsPrePage(&$objSiteSess) {309 $ret = $objSiteSess->isPrePage();310 if($ret != true) {311 // エラーページの表示312 SC_Utils::sfDispSiteError(PAGE_ERROR, $objSiteSess);313 }314 }315 316 /**317 * @deprecated SC_Helper_Purchase::verifyChangeCart() を使用して下さい.318 */319 function sfCheckNormalAccess(&$objSiteSess, &$objCartSess) {320 // ユーザユニークIDの取得321 $uniqid = $objSiteSess->getUniqId();322 323 $cartkeys = $objCartSess->getKeys();324 325 foreach ($cartKeys as $cartKey) {326 // 購入ボタンを押した時のカート内容がコピーされていない場合のみコピーする。327 $objCartSess->saveCurrentCart($uniqid, $cartKey);328 // POSTのユニークIDとセッションのユニークIDを比較(ユニークIDがPOSTされていない場合はスルー)329 $ret = $objSiteSess->checkUniqId();330 if($ret != true) {331 // エラーページの表示332 SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE, $objSiteSess);333 }334 335 // カート内が空でないか || 購入ボタンを押してから変化がないか336 $quantity = $objCartSess->getTotalQuantity($cartKey);337 $ret = $objCartSess->checkChangeCart($cartKey);338 if($ret == true || !($quantity > 0)) {339 // カート情報表示に強制移動する340 // FIXME false を返して, Page クラスで遷移させるべき...341 if (defined("MOBILE_SITE")) {342 header("Location: ". MOBILE_CART_URL_PATH343 . "?" . session_name() . "=" . session_id());344 } else {345 header("Location: ".CART_URL_PATH);346 }347 exit;348 }349 }350 return $uniqid;351 }352 353 303 /* DB用日付文字列取得 */ 354 304 function sfGetTimestamp($year, $month, $day, $last = false) {
Note: See TracChangeset
for help on using the changeset viewer.
