fix: add cartListener (#14)

Co-authored-by: mdevaud <mdevaud@openstudio.fr>

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <authors>
         <author>
             <name>mdevaud</name>

EventListeners/CartListener.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace SubOrderGenerator\EventListeners;
+
+use OpenApi\Events\ModelExtendDataEvent;
+use SubOrderGenerator\Model\SubOrderQuery;
+use SubOrderGenerator\Service\SubOrderService;
+use SubOrderGenerator\SubOrderGenerator;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Thelia\Core\Event\Cart\CartCreateEvent;
+use Thelia\Core\Event\Cart\CartEvent;
+use Thelia\Core\Event\TheliaEvents;
+
+class CartListener implements EventSubscriberInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private SubOrderService $subOrderService
+    )
+    {
+    }
+
+    public function clearSubOrderSession(){
+        $session = $this->requestStack->getCurrentRequest()->getSession();
+        $session->remove(SubOrderGenerator::SUBORDER_TOKEN_SESSION_KEY);
+    }
+
+    public function updateCart(ModelExtendDataEvent $event){
+
+        $session = $this->requestStack->getCurrentRequest()->getSession();
+        //if no suborder token found do nothing
+        if(null === $subOrderToken = $session->get(SubOrderGenerator::SUBORDER_TOKEN_SESSION_KEY)){
+            return;
+        }
+
+        if(null === $suborderLink = SubOrderQuery::create()->findOneByToken($subOrderToken)){
+            throw new NotFoundHttpException('No subOrder Associated to token');
+        }
+        $order = $suborderLink->getOrderRelatedBySubOrderId();
+
+        $event->setExtendDataKeyValue("total_amount_sub_order", round($order->getTotalAmount() - $this->subOrderService->getAmountAlreadyPaid($suborderLink),2) );
+    }
+
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            TheliaEvents::CART_ADDITEM => ['clearSubOrderSession', 128],
+            TheliaEvents::CART_DELETEITEM => ['clearSubOrderSession', 128],
+            TheliaEvents::CART_UPDATEITEM => ['clearSubOrderSession', 128],
+            TheliaEvents::CART_CLEAR => ['clearSubOrderSession', 128],
+            TheliaEvents::CART_CREATE_NEW =>['clearSubOrderSession', 128],
+            ModelExtendDataEvent::ADD_EXTEND_DATA_PREFIX . "cart" => ['updateCart', 10],
+        ];
+    }
+}

EventListeners/SubOrderPayListener.php

@@ -3,6 +3,7 @@
 namespace SubOrderGenerator\EventListeners;
 
 use OpenApi\Events\ModelExtendDataEvent;
+use OpenApi\Model\Api\CartItem;
 use SubOrderGenerator\Model\SubOrder;
 use SubOrderGenerator\Model\SubOrderQuery;
 use SubOrderGenerator\Service\SubOrderService;
@@ -16,6 +17,8 @@
 use Thelia\Core\Event\Order\OrderPayTotalEvent;
 use Thelia\Core\Event\Payment\IsValidPaymentEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Model\Event\CartEvent;
+use Thelia\Model\Event\CartItemEvent;
 use Thelia\Model\Order as OrderModel;
 
 class SubOrderPayListener implements EventSubscriberInterface
@@ -88,30 +91,12 @@ public function changeTotalForSubOrder(OrderPayTotalEvent $event){
         }
     }
 
-    public function updateCart(ModelExtendDataEvent $event){
-
-        $session = $this->requestStack->getCurrentRequest()->getSession();
-        //if no suborder token found do nothing
-        if(null === $subOrderToken = $session->get(SubOrderGenerator::SUBORDER_TOKEN_SESSION_KEY)){
-            return;
-        }
-
-        if(null === $suborderLink = SubOrderQuery::create()->findOneByToken($subOrderToken)){
-            throw new NotFoundHttpException('No subOrder Associated to token');
-        }
-        $order = $suborderLink->getOrderRelatedBySubOrderId();
-
-        $event->setExtendDataKeyValue("total_amount_sub_order", round($order->getTotalAmount() - $this->subOrderService->getAmountAlreadyPaid($suborderLink),2) );
-
-    }
-
     public static function getSubscribedEvents()
     {
         return [
             TheliaEvents::ORDER_PAY => ['paySubOrder', 200],
             TheliaEvents::MODULE_PAYMENT_IS_VALID => ['filterSubOrderPayment'],
             TheliaEvents::ORDER_PAY_GET_TOTAL => ['changeTotalForSubOrder', 70],
-            ModelExtendDataEvent::ADD_EXTEND_DATA_PREFIX . "cart" => ['updateCart', 10],
         ];
     }
 }

Service/SubOrderService.php

@@ -23,7 +23,6 @@
 use Thelia\Model\OrderProductAttributeCombination;
 use Thelia\Model\OrderProductTax;
 use Thelia\Model\OrderStatusQuery;
-use Thelia\Model\ProductQuery;
 use Thelia\Model\ProductSaleElementsQuery;
 
 class SubOrderService
@@ -161,14 +160,6 @@ public function fillCartFromSubOrderChild(Order $childOrder)
         foreach ($orderProducts as $orderProduct) {
             $newEvent = new CartEvent($cart);
             $newEvent->setQuantity($orderProduct->getQuantity());
-            $product = ProductQuery::create()
-                ->filterByVisible(true)
-                ->filterByRef($orderProduct->getProductRef())
-                ->findOne();
-
-            if (null === $product) {
-                continue;
-            }
 
             $pse = ProductSaleElementsQuery::create()
                 ->filterById($orderProduct->getProductSaleElementsId())
@@ -184,7 +175,7 @@ public function fillCartFromSubOrderChild(Order $childOrder)
                 continue;
             }
 
-            $newEvent->setProduct($product->getId());
+            $newEvent->setProduct($pse->getProductId());
             $newEvent->setNewness(true);
             $newEvent->setAppend(false);
             $newEvent->setProductSaleElementsId($pse->getId());