Merge pull request #92 from Shape-and-Shift/esd-2.0.5

ESD-2.0.5

Author: patrickleo175

.github/workflows/store.yml

@@ -2,7 +2,7 @@ name: PackPlugin
 on:
     push:
         branches:
-            - master
+            - 2.x
 
 jobs:
     build:

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 2.0.5
+* Problem mit dem freien ESD-Element behoben.
+
 # 2.0.4
 * Problem behoben, dass das Flow-Ereignis beim Upgrade von Shopware 6.4 auf 6.5 nicht ausgelöst wird
 

CHANGELOG_en-GB.md

@@ -1,3 +1,6 @@
+# 2.0.5
+* Fixed issue that regarding the free ESD item
+
 # 2.0.4
 * Fixed issue that the flow event is not triggered when upgrading from Shopware 6.4 to 6.5
 

composer.json

@@ -3,7 +3,7 @@
     "description":"ESD / Download plugin",
     "type":"shopware-platform-plugin",
     "keywords": ["esd", "download"],
-    "version":"2.0.4",
+    "version":"2.0.5",
     "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) {
+        if ($orderLineItems === null || $event->getOrder()->getAmountTotal() > 0.0) {
             return;
         }
 

src/Subscriber/OrderStateChangedSubscriber.php

@@ -49,6 +49,7 @@ 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();