diff --git a/data/class/helper/SC_Helper_Purchase.php b/data/class/helper/SC_Helper_Purchase.php index 71c34bb509..3f58a5221b 100644 --- a/data/class/helper/SC_Helper_Purchase.php +++ b/data/class/helper/SC_Helper_Purchase.php @@ -1490,24 +1490,25 @@ public function checkDbMyPendignOrder() public function checkSessionPendingOrder() { - if (!SC_Utils_Ex::isBlank($_SESSION['order_id'])) { - $order_id = $_SESSION['order_id']; - unset($_SESSION['order_id']); - $objQuery = SC_Query_Ex::getSingletonInstance(); - $objQuery->begin(); - $arrOrder = SC_Helper_Purchase_Ex::getOrder($order_id); - if ($arrOrder['status'] == ORDER_PENDING) { - $objCartSess = new SC_CartSession_Ex(); - $cartKeys = $objCartSess->getKeys(); - if (SC_Utils_Ex::isBlank($cartKeys)) { - SC_Helper_Purchase_Ex::rollbackOrder($order_id, ORDER_CANCEL, true); - GC_Utils_Ex::gfPrintLog('order rollback.(session pending) order_id=' . $order_id); - } else { - SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true); - GC_Utils_Ex::gfPrintLog('order rollback.(session pending and set card) order_id=' . $order_id); - } + if (!isset($_SESSION['order_id'])) return; + if (SC_Utils_Ex::isBlank($_SESSION['order_id'])) return; + + $order_id = $_SESSION['order_id']; + unset($_SESSION['order_id']); + $objQuery = SC_Query_Ex::getSingletonInstance(); + $objQuery->begin(); + $arrOrder = SC_Helper_Purchase_Ex::getOrder($order_id); + if ($arrOrder['status'] == ORDER_PENDING) { + $objCartSess = new SC_CartSession_Ex(); + $cartKeys = $objCartSess->getKeys(); + if (SC_Utils_Ex::isBlank($cartKeys)) { + SC_Helper_Purchase_Ex::rollbackOrder($order_id, ORDER_CANCEL, true); + GC_Utils_Ex::gfPrintLog('order rollback.(session pending) order_id=' . $order_id); + } else { + SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true); + GC_Utils_Ex::gfPrintLog('order rollback.(session pending and set card) order_id=' . $order_id); } - $objQuery->commit(); } + $objQuery->commit(); } } diff --git a/data/class/pages/LC_Page.php b/data/class/pages/LC_Page.php index f9c2aae67f..63f3e7229e 100644 --- a/data/class/pages/LC_Page.php +++ b/data/class/pages/LC_Page.php @@ -300,7 +300,7 @@ public function init() // 開始時刻を設定する。 $this->timeStart = microtime(true); - $this->tpl_authority = $_SESSION['authority']; + $this->tpl_authority = $_SESSION['authority'] ?? null; // ディスプレイクラス生成 $this->objDisplay = new SC_Display_Ex(); diff --git a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php index b1bfec95fe..f9fee7c6d5 100644 --- a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php +++ b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php @@ -46,7 +46,7 @@ public function init() // 開始時刻を設定する。 $this->timeStart = microtime(true); - $this->tpl_authority = $_SESSION['authority']; + $this->tpl_authority = $_SESSION['authority'] ?? null; // ディスプレイクラス生成 $this->objDisplay = new SC_Display_Ex(); diff --git a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php index b3b9643a30..bc39580f29 100644 --- a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php +++ b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php @@ -36,8 +36,6 @@ class LC_Page_FrontParts_Bloc_Category extends LC_Page_FrontParts_Bloc_Ex public $arrCat; /** @var array */ public $arrTree; - /** @var int */ - public $root_parent_id; /** * Page を初期化する. @@ -127,7 +125,6 @@ public function lfGetCatTree($arrParentCategoryId, $count_check = false) foreach ($arrParentCategoryId as $category_id) { $arrParentID = $objCategory->getTreeTrail($category_id); $this->arrParentID = array_merge($this->arrParentID, $arrParentID); - $this->root_parent_id[] = $arrParentID[0]; } return $arrTree; diff --git a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php index 2f74397904..b44d7539ff 100644 --- a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php +++ b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php @@ -62,10 +62,6 @@ public function process() */ public function action() { - // 基本情報を渡す - $objSiteInfo = SC_Helper_DB_Ex::sfGetBasisData(); - $this->arrInfo = $objSiteInfo->data; - //おすすめ商品表示 $this->arrBestProducts = $this->lfGetRanking(); }