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']);
}
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
diff --git a/src/Eccube/Util/CacheUtil.php b/src/Eccube/Util/CacheUtil.php
index 41900b003c0..386f86e1674 100644
--- a/src/Eccube/Util/CacheUtil.php
+++ b/src/Eccube/Util/CacheUtil.php
@@ -85,6 +85,50 @@ public function forceClearCache(PostResponseEvent $event)
return $output->fetch();
}
+ /**
+ * Doctrineのキャッシュを削除します.
+ * APP_ENV=prodの場合のみ実行されます.
+ *
+ * @param null $env
+ * @return string
+ * @throws \Exception
+ */
+ public function clearDoctrineCache()
+ {
+ if ($this->kernel->getEnvironment() !== 'prod') {
+ return;
+ }
+ $console = new Application($this->kernel);
+ $console->setAutoExit(false);
+
+ $command = [
+ 'command' => 'cache:pool:clear',
+ 'pools' => ['doctrine.app_cache_pool'],
+ '--no-ansi' => true,
+ ];
+
+ $input = new ArrayInput($command);
+
+ $output = new BufferedOutput(
+ OutputInterface::VERBOSITY_DEBUG,
+ true
+ );
+
+ $console->run($input, $output);
+
+ return $output->fetch();
+ }
+
+ /**
+ * Twigキャッシュを削除します.
+ */
+ public function clearTwigCache()
+ {
+ $cacheDir = $this->kernel->getCacheDir().'/twig';
+ $fs = new Filesystem();
+ $fs->remove($cacheDir);
+ }
+
/**
* キャッシュを削除する.
*