Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

ShopBundle/Controller/Frontend/CartController.php

@@ -70,7 +70,7 @@ class CartController extends BaseController
                                 $form->handleRequest($request);
 
                                 if ($form->isSubmitted() && $form->isValid()) {
-                                        $orderShop = $this->orderUtils->getCartCurrent() ;
+                                        $orderShop = $this->orderUtils->getCartCurrent(true) ;
                                         $data = $form->getData() ;
                                         foreach($data as $orderProduct) {
                                                 if($orderProduct instanceof OrderProductInterface) {

ShopBundle/Repository/TicketRepository.php

@@ -27,6 +27,7 @@ class TicketRepository extends BaseRepository implements DefaultRepositoryInterf
         {
                 $query = $this->findByMerchantQuery() ;
                 $query->andWhere('e.status IN (:statusOpen)')->setParameter('statusOpen', [Ticket::TICKET_STATUS_OPEN, Ticket::TICKET_STATUS_BEING_PROCESSED]) ;
+                $query->addOrderBy('e.id', 'DESC') ;
                 return $query->getQuery()->getResult() ;
         }
 }

ShopBundle/Services/Order/OrderUtilsCartTrait.php

@@ -21,7 +21,7 @@ trait OrderUtilsCartTrait
         }
 
 
-        public function getCartCurrent()
+        public function getCartCurrent($createIfNotExist = false)
         {
                 $paramsSearchOrderShop = [];
 
@@ -63,6 +63,14 @@ trait OrderUtilsCartTrait
                         }
                 }
 
+                if($createIfNotExist && !$orderShop) {
+                        $orderShop = $this->createOrderShop([
+                                'user' => $user,
+                                'visitor' => $visitor,
+                                'merchant' => $this->merchantUtils->getMerchantCurrent()
+                        ]);
+                }
+
                 return $orderShop;
         }