From f73a268151ac14eac9e6e5988ccadaa5684e952d Mon Sep 17 00:00:00 2001 From: Seasoft Date: Mon, 20 Aug 2018 07:41:00 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20refs=20#107=20=E5=AE=8C=E4=BA=86?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=81=AE=20JavaScript=20=E3=81=AB?= =?UTF-8?q?=E3=82=88=E3=82=8B=E3=83=88=E3=83=A9=E3=83=83=E3=82=AD=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=81=8C=E5=A4=9A=E9=87=8D=E3=81=AB=E8=A1=8C=E3=82=8F?= =?UTF-8?q?=E3=82=8C=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contact/LC_Page_Contact_Complete.php | 2 +- data/class/pages/entry/LC_Page_Entry.php | 3 ++- .../pages/entry/LC_Page_Entry_Complete.php | 19 ++++++++++++------- data/class/pages/regist/LC_Page_Regist.php | 5 +++-- .../pages/regist/LC_Page_Regist_Complete.php | 4 ++++ .../shopping/LC_Page_Shopping_Complete.php | 2 ++ .../shopping/LC_Page_Shopping_Confirm.php | 4 +--- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/data/class/pages/contact/LC_Page_Contact_Complete.php b/data/class/pages/contact/LC_Page_Contact_Complete.php index 5138c28bf8..405e27c79c 100644 --- a/data/class/pages/contact/LC_Page_Contact_Complete.php +++ b/data/class/pages/contact/LC_Page_Contact_Complete.php @@ -42,6 +42,7 @@ public function init() parent::init(); $this->tpl_title = 'お問い合わせ(完了ページ)'; $this->tpl_mainno = 'contact'; + $this->httpCacheControl('nocache'); } /** @@ -64,6 +65,5 @@ public function process() public function action() { // do nothing... - } } diff --git a/data/class/pages/entry/LC_Page_Entry.php b/data/class/pages/entry/LC_Page_Entry.php index c0d30565ab..6ff2c316ba 100644 --- a/data/class/pages/entry/LC_Page_Entry.php +++ b/data/class/pages/entry/LC_Page_Entry.php @@ -147,7 +147,8 @@ public function action() } // 完了ページに移動させる。 - SC_Response_Ex::sendRedirect('complete.php', array('ci' => SC_Helper_Customer_Ex::sfGetCustomerId($uniqid))); + $_SESSION['registered_customer_id'] = SC_Helper_Customer_Ex::sfGetCustomerId($uniqid); + SC_Response_Ex::sendRedirect('complete.php'); } break; case 'return': diff --git a/data/class/pages/entry/LC_Page_Entry_Complete.php b/data/class/pages/entry/LC_Page_Entry_Complete.php index 0d406485ca..795ef1b4d7 100644 --- a/data/class/pages/entry/LC_Page_Entry_Complete.php +++ b/data/class/pages/entry/LC_Page_Entry_Complete.php @@ -62,8 +62,9 @@ public function process() */ public function action() { + $objCartSess = new SC_CartSession_Ex(); + // カートが空かどうかを確認する。 - $objCartSess = new SC_CartSession_Ex(); $arrCartKeys = $objCartSess->getKeys(); $this->tpl_cart_empty = true; foreach ($arrCartKeys as $cart_key) { @@ -73,14 +74,18 @@ public function action() } } - // メインテンプレートを設定 + // 仮会員登録完了 if (CUSTOMER_CONFIRM_MAIL == true) { - // 仮会員登録完了 - $this->tpl_mainpage = 'entry/complete.tpl'; - } else { - // 本会員登録完了 + // 登録された会員ID + $this->tpl_customer_id = $_SESSION['registered_customer_id']; + unset($_SESSION['registered_customer_id']); + + // メインテンプレートを設定 + $this->tpl_mainpage = 'entry/complete.tpl'; + } + // 本会員登録完了 + else { SC_Response_Ex::sendRedirectFromUrlPath('regist/complete.php'); } - } } diff --git a/data/class/pages/regist/LC_Page_Regist.php b/data/class/pages/regist/LC_Page_Regist.php index da3915eb9e..6649d503f1 100644 --- a/data/class/pages/regist/LC_Page_Regist.php +++ b/data/class/pages/regist/LC_Page_Regist.php @@ -72,7 +72,8 @@ public function action() $registSecretKey = $this->lfRegistData($_GET); //本会員登録（フラグ変更） $this->lfSendRegistMail($registSecretKey); //本会員登録完了メール送信 - SC_Response_Ex::sendRedirect('complete.php', array('ci' => SC_Helper_Customer_Ex::sfGetCustomerId($registSecretKey))); + $_SESSION['registered_customer_id'] = SC_Helper_Customer_Ex::sfGetCustomerId($registSecretKey); + SC_Response_Ex::sendRedirect('complete.php'); break; //--　それ以外のアクセスは無効とする default: @@ -112,7 +113,7 @@ public function lfRegistData($array) */ public function lfCheckError($array) { - $objErr = new SC_CheckError_Ex($array); + $objErr = new SC_CheckError_Ex($array); if (preg_match("/^[[:alnum:]]+$/", $array['id'])) { if (!is_numeric(SC_Helper_Customer_Ex::sfGetCustomerId($array['id'], true))) { diff --git a/data/class/pages/regist/LC_Page_Regist_Complete.php b/data/class/pages/regist/LC_Page_Regist_Complete.php index 814059528d..28bceaea0c 100644 --- a/data/class/pages/regist/LC_Page_Regist_Complete.php +++ b/data/class/pages/regist/LC_Page_Regist_Complete.php @@ -41,6 +41,7 @@ public function init() { parent::init(); $this->tpl_title = '会員登録(完了ページ)'; + $this->httpCacheControl('nocache'); } /** @@ -62,5 +63,8 @@ public function process() */ public function action() { + // 登録された会員ID + $this->tpl_customer_id = $_SESSION['registered_customer_id']; + unset($_SESSION['registered_customer_id']); } } diff --git a/data/class/pages/shopping/LC_Page_Shopping_Complete.php b/data/class/pages/shopping/LC_Page_Shopping_Complete.php index 643f689436..19ef88531c 100644 --- a/data/class/pages/shopping/LC_Page_Shopping_Complete.php +++ b/data/class/pages/shopping/LC_Page_Shopping_Complete.php @@ -41,6 +41,7 @@ public function init() { parent::init(); $this->tpl_title = 'ご注文完了'; + $this->httpCacheControl('nocache'); } /** @@ -65,6 +66,7 @@ public function process() public function action() { $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); + $this->tpl_order_id = $_SESSION['order_id']; } /** diff --git a/data/class/pages/shopping/LC_Page_Shopping_Confirm.php b/data/class/pages/shopping/LC_Page_Shopping_Confirm.php index e6d4dfd31a..9ce56acffe 100644 --- a/data/class/pages/shopping/LC_Page_Shopping_Confirm.php +++ b/data/class/pages/shopping/LC_Page_Shopping_Confirm.php @@ -146,9 +146,7 @@ public function action() SC_Response_Ex::actionExit(); break; case 'confirm': - /* - * 決済モジュールで必要なため, 受注番号を取得 - */ + // 注文番号を取得 $this->arrForm['order_id'] = $objPurchase->getNextOrderID(); $_SESSION['order_id'] = $this->arrForm['order_id'];