Merge pull request #15 from p1fb/SW6-22-1.0.0-rc.3-preparation

SW6-22: 1.0.0 Preparation
PAYONE-GmbH · Feb 5, 2020 · 834ca26 · 834ca26
2 parents 8ab0950 + 347ae2d
commit 834ca26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git 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">

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

diff --git 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>