ESD-2.0.4

Author: Pattrick Leo

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 2.0.4
+* Problem behoben, dass das Flow-Ereignis beim Upgrade von Shopware 6.4 auf 6.5 nicht ausgelöst wird
+
 # 2.0.3
 * Wiederholung der Version 2.0.1 mit behobenem Fehler beim Kompilieren von SCSS im Storefront.
 

CHANGELOG_en-GB.md

@@ -1,3 +1,6 @@
+# 2.0.4
+* Fixed issue that the flow event is not triggered when upgrading from Shopware 6.4 to 6.5
+
 # 2.0.3
 * Re-release of version 2.0.1 with fixed error while compiling SCSS at Storefront. 
 

composer.json

@@ -3,7 +3,7 @@
     "description":"ESD / Download plugin",
     "type":"shopware-platform-plugin",
     "keywords": ["esd", "download"],
-    "version":"2.0.3",
+    "version":"2.0.4",
     "license":"proprietary",
     "authors":[
         {

src/Checkout/Cart/Subscriber/OrderPlacedSubscriber.php

@@ -33,7 +33,7 @@ public function __invoke(CheckoutOrderPlacedEvent $event): void
     {
         $orderLineItems = $event->getOrder()->getLineItems();
 
-        if ($orderLineItems === null || $event->getOrder()->getAmountTotal() > 0.0) {
+        if ($orderLineItems === null) {
             return;
         }
 

src/Event/EsdDownloadPaymentStatusPaidDisabledZipEvent.php

@@ -118,6 +118,7 @@ public function getValues(): array
     {
         return [
             'esdData' => $this->templateData,
+            ...$this->templateData,
         ];
     }
 }

src/Event/EsdDownloadPaymentStatusPaidEvent.php

@@ -128,6 +128,7 @@ public function getValues(): array
     {
         return [
             'esdData' => $this->templateData,
+            ...$this->templateData,
         ];
     }
 }

src/Event/EsdSerialPaymentStatusPaidEvent.php

@@ -110,6 +110,7 @@ public function getValues(): array
     {
         return [
             'esdData' => $this->templateData,
+            ...$this->templateData,
         ];
     }
 }

src/Resources/config/services.xml

@@ -48,13 +48,13 @@
         </service>
 
         <!-- Subscribers -->
-        <service id="Sas\Esd\Checkout\Cart\Subscriber\OrderPlacedSubscriber">
-            <argument type="service" id="product.repository"/>
-            <argument type="service" id="Sas\Esd\Service\EsdOrderService"/>
-            <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
-            <argument type="service" id="event_dispatcher"/>
-            <tag name="kernel.event_listener"/>
-        </service>
+<!--        <service id="Sas\Esd\Checkout\Cart\Subscriber\OrderPlacedSubscriber">-->
+<!--            <argument type="service" id="product.repository"/>-->
+<!--            <argument type="service" id="Sas\Esd\Service\EsdOrderService"/>-->
+<!--            <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>-->
+<!--            <argument type="service" id="event_dispatcher"/>-->
+<!--            <tag name="kernel.event_listener"/>-->
+<!--        </service>-->
 
         <service id="Sas\Esd\Subscriber\MediaPermissionSubscriber">
             <tag name="kernel.event_listener" priority="-10000"/>

src/Subscriber/OrderStateChangedSubscriber.php

@@ -49,7 +49,6 @@ public function orderStatePaid(OrderStateMachineStateChangeEvent $event): void
 
         if ($this->esdOrderService->isEsdOrder($order)
             && !empty($order->getLineItems())
-            && $order->getAmountTotal() > 0
         ) {
             $orderLineItemIds = array_filter($order->getLineItems()->fmap(static function (OrderLineItemEntity $orderLineItem) {
                 return $orderLineItem->getId();