Merge pull request #56 from p1fb/SW6-55-fix-prepayment-bug

SW6-55: Fix Prepayment Implementation
PAYONE-GmbH · Aug 28, 2020 · 43a40cc · 43a40cc
2 parents 8f3b63b + e138b4b
commit 43a40cc
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 7 deletions.
diff --git a/src/Components/RequestBuilder/EpsRequestBuilder.php b/src/Components/RequestBuilder/EpsRequestBuilder.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\RequestBuilder;
+
+use PayonePayment\PaymentMethod\PayoneEps;
+use PayonePayment\Struct\PaymentTransaction;
+use Shopware\Core\Framework\Context;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+class EpsRequestBuilder extends AbstractRequestBuilder
+{
+    public function supports(string $paymentMethodId): bool
+    {
+        return $paymentMethodId === PayoneEps::UUID;
+    }
+
+    public function getAdditionalRequestParameters(PaymentTransaction $transaction, Context $context, ParameterBag $parameterBag): array
+    {
+        return [];
+    }
+}
diff --git a/src/Components/RequestBuilder/IDealRequestBuilder.php b/src/Components/RequestBuilder/IDealRequestBuilder.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\RequestBuilder;
+
+use PayonePayment\PaymentMethod\PayoneIDeal;
+use PayonePayment\Struct\PaymentTransaction;
+use Shopware\Core\Framework\Context;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+class IDealRequestBuilder extends AbstractRequestBuilder
+{
+    public function supports(string $paymentMethodId): bool
+    {
+        return $paymentMethodId === PayoneIDeal::UUID;
+    }
+
+    public function getAdditionalRequestParameters(PaymentTransaction $transaction, Context $context, ParameterBag $parameterBag): array
+    {
+        return [];
+    }
+}
diff --git a/src/Components/RequestBuilder/PaydirektRequestBuilder.php b/src/Components/RequestBuilder/PaydirektRequestBuilder.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\RequestBuilder;
+
+use PayonePayment\PaymentMethod\PayonePaydirekt;
+use PayonePayment\Struct\PaymentTransaction;
+use Shopware\Core\Framework\Context;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+class PaydirektRequestBuilder extends AbstractRequestBuilder
+{
+    public function supports(string $paymentMethodId): bool
+    {
+        return $paymentMethodId === PayonePaydirekt::UUID;
+    }
+
+    public function getAdditionalRequestParameters(PaymentTransaction $transaction, Context $context, ParameterBag $parameterBag): array
+    {
+        return [];
+    }
+}
diff --git a/src/Components/RequestBuilder/PrepaymentRequestBuilder.php b/src/Components/RequestBuilder/PrepaymentRequestBuilder.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\RequestBuilder;
+
+use PayonePayment\PaymentMethod\PayonePrepayment;
+use PayonePayment\Struct\PaymentTransaction;
+use Shopware\Core\Framework\Context;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+class PrepaymentRequestBuilder extends AbstractRequestBuilder
+{
+    public function supports(string $paymentMethodId): bool
+    {
+        return $paymentMethodId === PayonePrepayment::UUID;
+    }
+
+    public function getAdditionalRequestParameters(PaymentTransaction $transaction, Context $context, ParameterBag $parameterBag): array
+    {
+        return [];
+    }
+}
diff --git a/src/DependencyInjection/handler/payment_handler.xml b/src/DependencyInjection/handler/payment_handler.xml
@@ -151,7 +151,7 @@
             <argument type="service" id="order_line_item.repository" />
             <argument type="service" id="request_stack" />
 
-            <tag name="shopware.payment.method.async" />
+            <tag name="shopware.payment.method.sync" />
         </service>
 
         <service id="PayonePayment\PaymentHandler\PayonePaydirektPaymentHandler">

diff --git a/src/DependencyInjection/handler/request_handler.xml b/src/DependencyInjection/handler/request_handler.xml
@@ -38,5 +38,21 @@
         <service id="PayonePayment\Components\RequestBuilder\SofortBankingRequestBuilder">
             <tag name="payone_payment.request_handler" />
         </service>
+
+        <service id="PayonePayment\Components\RequestBuilder\PrepaymentRequestBuilder">
+            <tag name="payone_payment.request_handler" />
+        </service>
+
+        <service id="PayonePayment\Components\RequestBuilder\PaydirektRequestBuilder">
+            <tag name="payone_payment.request_handler" />
+        </service>
+
+        <service id="PayonePayment\Components\RequestBuilder\IDealRequestBuilder">
+            <tag name="payone_payment.request_handler" />
+        </service>
+
+        <service id="PayonePayment\Components\RequestBuilder\EpsRequestBuilder">
+            <tag name="payone_payment.request_handler" />
+        </service>
     </services>
 </container>
diff --git a/src/Installer/PaymentMethodInstaller.php b/src/Installer/PaymentMethodInstaller.php
@@ -59,6 +59,7 @@ class PaymentMethodInstaller implements InstallerInterface
         PayoneEps::class,
         PayoneIDeal::class,
         PayonePaydirekt::class,
+        PayonePrepayment::class,
     ];
 
     /** @var PluginIdProvider */

diff --git a/src/PaymentHandler/PayonePaypalPaymentHandler.php b/src/PaymentHandler/PayonePaypalPaymentHandler.php
@@ -156,6 +156,10 @@ public static function isCapturable(array $transactionData, array $customFields)
      */
     public static function isRefundable(array $transactionData, array $customFields): bool
     {
-        return strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_CAPTURE && (float) $transactionData['receivable'] !== 0.0;
+        if (strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_CAPTURE && (float) $transactionData['receivable'] !== 0.0) {
+            return true;
+        }
+
+        return strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_PAID;
     }
 }
diff --git a/src/PaymentHandler/PayonePrepaymentPaymentHandler.php b/src/PaymentHandler/PayonePrepaymentPaymentHandler.php
@@ -133,10 +133,6 @@ public static function isCapturable(array $transactionData, array $customFields)
      */
     public static function isRefundable(array $transactionData, array $customFields): bool
     {
-        if (strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_CAPTURE && (float) $transactionData['receivable'] !== 0.0) {
-            return true;
-        }
-
-        return strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_PAID;
+        return strtolower($transactionData['txaction']) === TransactionStatusService::ACTION_CAPTURE && (float) $transactionData['receivable'] !== 0.0;
     }
 }