diff --git a/src/Eccube/Resource/template/default/Block/header.twig b/src/Eccube/Resource/template/default/Block/header.twig
index 9201751a4fb..bbffd3a74ab 100644
--- a/src/Eccube/Resource/template/default/Block/header.twig
+++ b/src/Eccube/Resource/template/default/Block/header.twig
@@ -14,7 +14,7 @@ file that was distributed with this source code.
{{ render(path('block_search_product')) }}
diff --git a/src/Eccube/Service/CartService.php b/src/Eccube/Service/CartService.php
index 19375be6718..1d8d19e73cf 100644
--- a/src/Eccube/Service/CartService.php
+++ b/src/Eccube/Service/CartService.php
@@ -133,7 +133,7 @@ public function __construct(
*/
public function getCarts($empty_delete = false)
{
- if (!empty($this->carts)) {
+ if (null !== $this->carts) {
if ($empty_delete) {
$cartKeys = [];
foreach (array_keys($this->carts) as $index) {
@@ -181,6 +181,10 @@ public function getSessionCarts()
{
$cartKeys = $this->session->get('cart_keys', []);
+ if (empty($cartKeys)) {
+ return [];
+ }
+
return $this->cartRepository->findBy(['cart_key' => $cartKeys], ['id' => 'DESC']);
}
From 4dea64d787f9b96eb98dc691f5a62ea6893acdba Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Thu, 13 Sep 2018 17:15:28 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=88=E3=83=96?=
=?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=AE=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Twig/Extension/CartServiceExtension.php | 65 +++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 src/Eccube/Twig/Extension/CartServiceExtension.php
diff --git a/src/Eccube/Twig/Extension/CartServiceExtension.php b/src/Eccube/Twig/Extension/CartServiceExtension.php
new file mode 100644
index 00000000000..66a790e7a57
--- /dev/null
+++ b/src/Eccube/Twig/Extension/CartServiceExtension.php
@@ -0,0 +1,65 @@
+cartService = $cartService;
+ }
+
+ public function getFunctions()
+ {
+ return [
+ new \Twig_Function('get_cart', [$this, 'get_cart'], ['is_safe' => ['all']]),
+ new \Twig_Function('get_all_carts', [$this, 'get_all_carts'], ['is_safe' => ['all']]),
+ new \Twig_Function('get_carts_total_price', [$this, 'get_carts_total_price'], ['is_safe' => ['all']]),
+ new \Twig_Function('get_carts_total_quantity', [$this, 'get_carts_total_quantity'], ['is_safe' => ['all']]),
+ ];
+ }
+
+ public function get_cart()
+ {
+ return $this->cartService->getCart();
+ }
+
+ public function get_all_carts()
+ {
+ return $this->cartService->getCarts();
+ }
+
+ public function get_carts_total_price()
+ {
+ $Carts = $this->cartService->getCarts();
+ $totalPrice = array_reduce($Carts, function ($total, Cart $Cart) {
+ $total += $Cart->getTotalPrice();
+
+ return $total;
+ }, 0);
+
+ return $totalPrice;
+ }
+
+ public function get_carts_total_quantity()
+ {
+ $Carts = $this->cartService->getCarts();
+ $totalQuantity = array_reduce($Carts, function ($total, Cart $Cart) {
+ $total += $Cart->getTotalQuantity();
+
+ return $total;
+ }, 0);
+
+ return $totalQuantity;
+ }
+}
\ No newline at end of file
From 6612838db11cdcde3a984ea9e9077de8fdf370d9 Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 14 Sep 2018 11:14:25 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
=?UTF-8?q?=E3=83=88=E3=81=AE=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5?=
=?UTF-8?q?=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EventListener/TwigInitializeListener.php | 30 ++++++++-----------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/Eccube/EventListener/TwigInitializeListener.php b/src/Eccube/EventListener/TwigInitializeListener.php
index c313225df0d..0b54e675b00 100644
--- a/src/Eccube/EventListener/TwigInitializeListener.php
+++ b/src/Eccube/EventListener/TwigInitializeListener.php
@@ -193,12 +193,7 @@ public function setFrontVariables(GetResponseEvent $event)
// URLからPageを取得
/** @var Page $Page */
- $Page = $this->pageRepository->findOneBy(['url' => $route]);
-
- // 該当するPageがない場合は空のページをセット
- if (!$Page) {
- $Page = $this->pageRepository->newPage();
- }
+ $Page = $this->pageRepository->getPageByRoute($route);
/** @var PageLayout[] $PageLayouts */
$PageLayouts = $Page->getPageLayouts();
@@ -227,22 +222,21 @@ public function setFrontVariables(GetResponseEvent $event)
if ($request->get('preview')) {
$is_admin = $request->getSession()->has('_security_admin');
if ($is_admin) {
- $Page->getPageLayouts()->clear();
- $PageLayouts = $this->pageLayoutRepository->findBy(['layout_id' => 0]);
- foreach ($PageLayouts as $PageLayout) {
- $Page->addPageLayout($PageLayout);
- }
+ $Layout = $this->layoutRepository->get(Layout::DEFAULT_LAYOUT_PREVIEW_PAGE);
- $Layout->getBlockPositions()->clear();
- $BlockPositions = $this->blockPositionRepository->findBy(['layout_id' => 0]);
- foreach ($BlockPositions as $BlockPosition) {
- $Layout->addBlockPosition($BlockPosition);
- }
+ $this->twig->addGlobal('Layout', $Layout);
+ $this->twig->addGlobal('Page', $Page);
+ $this->twig->addGlobal('title', $Page->getName());
+
+ return;
}
}
- // Layoutのデータがない場合は空のLayoutをセット
- if (!$Layout) {
+ if ($Layout) {
+ // lazy loadを制御するため, Layoutを取得しなおす.
+ $Layout = $this->layoutRepository->get($Layout->getId());
+ } else {
+ // Layoutのデータがない場合は空のLayoutをセット
$Layout = new Layout();
}
From 386547b3d01fdea98e739576916e27b335b8f5de Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 14 Sep 2018 12:41:17 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?=
=?UTF-8?q?=E3=83=A5=E3=81=AE=E5=89=8A=E9=99=A4=E6=BC=8F=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Eccube/Controller/Admin/Product/CategoryController.php | 4 +++-
src/Eccube/Controller/Admin/Product/CsvImportController.php | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/Eccube/Controller/Admin/Product/CategoryController.php b/src/Eccube/Controller/Admin/Product/CategoryController.php
index 50d883eaa75..edbc439306c 100644
--- a/src/Eccube/Controller/Admin/Product/CategoryController.php
+++ b/src/Eccube/Controller/Admin/Product/CategoryController.php
@@ -252,7 +252,7 @@ public function delete(Request $request, $id, CacheUtil $cacheUtil)
/**
* @Route("/%eccube_admin_route%/product/category/sort_no/move", name="admin_product_category_sort_no_move", methods={"POST"})
*/
- public function moveSortNo(Request $request)
+ public function moveSortNo(Request $request, CacheUtil $cacheUtil)
{
if (!$request->isXmlHttpRequest()) {
throw new BadRequestHttpException();
@@ -269,6 +269,8 @@ public function moveSortNo(Request $request)
}
$this->entityManager->flush();
+ $cacheUtil->clearDoctrineCache();
+
return new Response('Successful');
}
}
diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php
index 43ad009d94c..c10a6cc283f 100644
--- a/src/Eccube/Controller/Admin/Product/CsvImportController.php
+++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php
@@ -34,6 +34,7 @@
use Eccube\Repository\ProductRepository;
use Eccube\Repository\TagRepository;
use Eccube\Service\CsvImportService;
+use Eccube\Util\CacheUtil;
use Eccube\Util\StringUtil;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Symfony\Component\Filesystem\Filesystem;
@@ -537,7 +538,7 @@ public function csvProduct(Request $request)
* @Route("/%eccube_admin_route%/product/category_csv_upload", name="admin_product_category_csv_import")
* @Template("@admin/Product/csv_category.twig")
*/
- public function csvCategory(Request $request)
+ public function csvCategory(Request $request, CacheUtil $cacheUtil)
{
$form = $this->formFactory->createBuilder(CsvImportType::class)->getForm();
@@ -682,6 +683,8 @@ public function csvCategory(Request $request)
log_info('カテゴリCSV登録完了');
$message = 'admin.common.csv_upload_complete';
$this->session->getFlashBag()->add('eccube.admin.success', $message);
+
+ $cacheUtil->clearDoctrineCache();
}
}
}