From da3d83a833bc8f3ff12a0fa97f4d54917c166bd2 Mon Sep 17 00:00:00 2001
From: Florian Eisenmenger <f.eisenmenger@spawntree.de>
Date: Wed, 9 Mar 2022 12:22:29 +0100
Subject: [PATCH] fix

---
 .idea/deployment.xml                              |  4 ++++
 .idea/sshConfigs.xml                              |  8 ++++++++
 .idea/webServers.xml                              | 14 ++++++++++++++
 .../StateMachineTransitionSubscriber.php          | 15 ++++++++-------
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 .idea/deployment.xml
 create mode 100644 .idea/sshConfigs.xml
 create mode 100644 .idea/webServers.xml

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 0000000..c489644
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" serverName="Diäko" remoteFilesAllowedToDisappearOnAutoupload="false" />
+</project>
\ No newline at end of file
diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml
new file mode 100644
index 0000000..fecd2fd
--- /dev/null
+++ b/.idea/sshConfigs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SshConfigs">
+    <configs>
+      <sshConfig host="212.72.167.170" id="aac72a36-8230-43df-a5f0-d2ce3e9d4086" keyPath="$USER_HOME$/Desktop/Projekte/id_rsa_nk_spawntree.ppk" port="2342" nameFormat="DESCRIPTIVE" username="spawntree" useOpenSSHConfig="true" />
+    </configs>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
new file mode 100644
index 0000000..70f96e9
--- /dev/null
+++ b/.idea/webServers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebServers">
+    <option name="servers">
+      <webServer id="312db2b1-c865-41fb-95c0-f610a09469fe" name="Diäko" url="http://212.72.167.170">
+        <fileTransfer accessType="SFTP" host="212.72.167.170" port="2342" sshConfigId="aac72a36-8230-43df-a5f0-d2ce3e9d4086" sshConfig="spawntree@212.72.167.170:2342 key" keyPair="true">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php
index 7e51bb0..28664af 100644
--- a/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php
+++ b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php
@@ -77,7 +77,7 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface
         $orderId = $event->getEntityId();
         $order = $this->getOrder($orderId, $event);
         $salesChannelId = $order->getSalesChannelId();
-
+        
         // In case no order could be found - return
         if (empty($order)) {
             return;
@@ -85,14 +85,14 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface
 
         $minAmountDiscountableLineItems = $this->systemConfigService->get('AtlDiscountExtension.config.minAmountDiscountableLineItems', $salesChannelId);
         $amountDiscountableLineItems = $this->getAmountDiscountableLineItems($order->getLineItems(), $minAmountDiscountableLineItems, $salesChannelId, $event);
-
+        
         // In case it is not enough - return
         if ($amountDiscountableLineItems < $minAmountDiscountableLineItems) {
             return;
         }
-
+        
         $customer = $order->getOrderCustomer()->getCustomer();
-
+        
         // Tag the customer and trace last order date in 'spwn_repeat_discount' table
         $this->tagCustomer($customer, $salesChannelId, $event);
     }
@@ -133,11 +133,13 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface
         if ($customFieldName === '') {
             return 0;
         }
-
+        
         $amountDiscountableLineItems = 0;
         foreach($lineItems as $lineItem) {
+            if (empty($lineItem->getPayload()['customFields'])) {
+                continue;
+            }
             $customFields = $lineItem->getPayload()['customFields'];
-
             // Checks if the custom field exists and is set to true
             if (!empty($customFields[$customFieldName]) && $customFields[$customFieldName] === true) {
                 $amountDiscountableLineItems += $lineItem->getQuantity();
@@ -148,7 +150,6 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface
                 break;
             }
         }
-
         return $amountDiscountableLineItems;
     }