From 8573c7f4b26a33890b501bd55df38484c4595e7c Mon Sep 17 00:00:00 2001
From: Fabian Boettcher <fabian.boettcher@payone.de>
Date: Tue, 4 Feb 2020 16:28:26 +0100
Subject: [PATCH 1/4] Fix service DI bug

---
 src/DependencyInjection/handlers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DependencyInjection/handlers.xml b/src/DependencyInjection/handlers.xml
index 088527dc2..8146a2a87 100644
--- a/src/DependencyInjection/handlers.xml
+++ b/src/DependencyInjection/handlers.xml
@@ -9,7 +9,7 @@
             <argument type="service" id="PayonePayment\Payone\Request\Refund\RefundRequestFactory" />
             <argument type="service" id="PayonePayment\Payone\Client\PayoneClient" />
             <argument type="service" id="PayonePayment\Components\TransactionDataHandler\TransactionDataHandler" />
-            <argument type="service" id="Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler" />
+            <argument type="service" id="PayonePayment\Components\TransactionStatus\TransactionStatusService" />
         </service>
 
         <service id="PayonePayment\Components\CapturePaymentHandler\CapturePaymentHandler">

From bb1112d2b43efdfed8969b2b2b3488af748a401c Mon Sep 17 00:00:00 2001
From: Fabian Boettcher <fabian.boettcher@payone.de>
Date: Tue, 4 Feb 2020 16:29:56 +0100
Subject: [PATCH 2/4] Correct status translations

---
 src/Resources/config/settings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Resources/config/settings.xml b/src/Resources/config/settings.xml
index 4bb8f58d8..6a524b38c 100644
--- a/src/Resources/config/settings.xml
+++ b/src/Resources/config/settings.xml
@@ -52,49 +52,49 @@
         <input-field type="single-select">
             <name>paymentStatusAppointed</name>
             <label>Transition for Appointed</label>
-            <label lang="de-DE">Statuswechsel für Bestellt</label>
+            <label lang="de-DE">Statuswechsel für APPOINTED</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusCapture</name>
             <label>Transition for Capture</label>
-            <label lang="de-DE">Statuswechsel für Erfasst</label>
+            <label lang="de-DE">Statuswechsel für CAPTURE</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusPaid</name>
             <label>Transition for Paid</label>
-            <label lang="de-DE">Statuswechsel für Bezahlt</label>
+            <label lang="de-DE">Statuswechsel für PAID</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusUnderpaid</name>
             <label>Transition for Underpaid</label>
-            <label lang="de-DE">Statuswechsel für Teilweise bezahlt</label>
+            <label lang="de-DE">Statuswechsel für UNDERPAID</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusCancelation</name>
             <label>Transition for Cancelation</label>
-            <label lang="de-DE">Statuswechsel für Abgebrochen</label>
+            <label lang="de-DE">Statuswechsel für CANCELLATION</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusRefund</name>
             <label>Transition for Refund</label>
-            <label lang="de-DE">Statuswechsel für Rückerstattet</label>
+            <label lang="de-DE">Statuswechsel für REFUND</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusDebit</name>
             <label>Transition for Debit</label>
-            <label lang="de-DE">Statuswechsel für Abgebucht</label>
+            <label lang="de-DE">Statuswechsel für DEBIT</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusReminder</name>
             <label>Transition for Reminder</label>
-            <label lang="de-DE">Statuswechsel für Erinnerung</label>
+            <label lang="de-DE">Statuswechsel für REMINDER</label>
         </input-field>
 
         <input-field type="single-select">
@@ -112,19 +112,19 @@
         <input-field type="single-select">
             <name>paymentStatusTransfer</name>
             <label>Transition for Transfer</label>
-            <label lang="de-DE">Statuswechsel für Übetragen</label>
+            <label lang="de-DE">Statuswechsel für TRANSFER</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusInvoice</name>
             <label>Transition for Invoice</label>
-            <label lang="de-DE">Statuswechsel für Rechnung</label>
+            <label lang="de-DE">Statuswechsel für INVOICE</label>
         </input-field>
 
         <input-field type="single-select">
             <name>paymentStatusFailed</name>
             <label>Transition for Failed</label>
-            <label lang="de-DE">Statuswechsel für Fehlgeschlagen</label>
+            <label lang="de-DE">Statuswechsel für FAILED</label>
         </input-field>
     </card>
 

From f3cbb14cc1e15df7562e0d7533d05e60a6a94f92 Mon Sep 17 00:00:00 2001
From: Fabian Boettcher <fabian.boettcher@payone.de>
Date: Wed, 5 Feb 2020 15:38:09 +0100
Subject: [PATCH 3/4] Remove sequence number check for refunds

---
 src/Payone/Request/Refund/RefundRequest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Payone/Request/Refund/RefundRequest.php b/src/Payone/Request/Refund/RefundRequest.php
index ecfac50b3..86a98bbc4 100644
--- a/src/Payone/Request/Refund/RefundRequest.php
+++ b/src/Payone/Request/Refund/RefundRequest.php
@@ -36,10 +36,6 @@ public function getRequestParameters(
             throw new InvalidOrderException($order->getId());
         }
 
-        if ($customFields[CustomFieldInstaller::SEQUENCE_NUMBER] < 1) {
-            throw new InvalidOrderException($order->getId());
-        }
-
         $currency = $this->getOrderCurrency($order, $context);
 
         return [

From 347ae2db5e192281790d80578bc0e9f746d27caa Mon Sep 17 00:00:00 2001
From: Fabian Boettcher <fabian.boettcher@payone.de>
Date: Wed, 5 Feb 2020 16:14:32 +0100
Subject: [PATCH 4/4] Fix logic bug in refund sequence number check

---
 src/Payone/Request/Refund/RefundRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Payone/Request/Refund/RefundRequest.php b/src/Payone/Request/Refund/RefundRequest.php
index 86a98bbc4..2ebb8a3cb 100644
--- a/src/Payone/Request/Refund/RefundRequest.php
+++ b/src/Payone/Request/Refund/RefundRequest.php
@@ -32,7 +32,7 @@ public function getRequestParameters(
             throw new InvalidOrderException($order->getId());
         }
 
-        if (empty($customFields[CustomFieldInstaller::SEQUENCE_NUMBER])) {
+        if (!isset($customFields[CustomFieldInstaller::SEQUENCE_NUMBER])) {
             throw new InvalidOrderException($order->getId());
         }