Merge pull request #28 from NicolasBarbey/main

get default lang when the session lang is null

Author: NicolasBarbey

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <authors>
         <author>
             <name>Bertrand Tourlonias</name>

Controller/ProductDataController.php

@@ -13,6 +13,7 @@
 use Thelia\Model\Base\RewritingUrlQuery;
 use Thelia\Model\Currency;
 use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
 use Thelia\Model\ProductQuery;
 use Thelia\Model\ProductSaleElementsQuery;
 
@@ -42,7 +43,7 @@ public function getProductDataWithUrl(Request $request, GoogleTagService $google
         $session = $request->getSession();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         /** @var Currency $currency */
         $currency = $session->get('thelia.current.currency') ?: CurrencyQuery::create()->filterByByDefault(1)->findOne();
@@ -79,7 +80,7 @@ public function getCartItem(Request $request, GoogleTagService $googleTagService
         $session = $request->getSession();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         /** @var Currency $currency */
         $currency = $session->get('thelia.current.currency') ?: CurrencyQuery::create()->filterByByDefault(1)->findOne();

Listener/GoogleTagListener.php

@@ -14,6 +14,7 @@
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
 use Thelia\Model\ProductQuery;
 
 class GoogleTagListener implements EventSubscriberInterface
@@ -73,7 +74,7 @@ public function getViewItem(ShortCodeEvent $event): void
         $product = ProductQuery::create()->filterById($productId)->findOne();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         $currency = $session->getCurrency() ?: CurrencyQuery::create()->findOneByByDefault(1);
 

Service/GoogleTagService.php

@@ -18,6 +18,7 @@
 use Thelia\Model\CurrencyQuery;
 use Thelia\Model\Customer;
 use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
 use Thelia\Model\Order;
 use Thelia\Model\OrderProduct;
 use Thelia\Model\OrderQuery;
@@ -238,7 +239,7 @@ public function getProductItems(array $productIds = null, $itemList = false): ar
         $products = ProductQuery::create()->filterById($productIds)->find();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         $currency = $session->getCurrency() ?: CurrencyQuery::create()->findOneByByDefault(1);
 
@@ -450,7 +451,7 @@ public function getOrderProductItems(Order $order, Country $country): array
         $products = $order->getOrderProducts();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         $currency = $session->getCurrency() ?: CurrencyQuery::create()->findOneByByDefault(1);
 
@@ -471,7 +472,7 @@ public function getProductCartItems(CartItem $cartItem, Country $country): array
         $session = $this->requestStack->getSession();
 
         /** @var Lang $lang */
-        $lang = $session->get('thelia.current.lang');
+        $lang = $session->get('thelia.current.lang') ?: LangQuery::create()->filterByByDefault(1)->findOne();
 
         $currency = $session->getCurrency() ?: CurrencyQuery::create()->findOneByByDefault(1);