PAYOSWXP-115: amazon pay: add platform_id

PAYONE-GmbH · Mar 27, 2024 · 31ae088 · 31ae088
1 parent 9718a48
commit 31ae088
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 54 deletions.
diff --git a/src/Payone/RequestParameter/Builder/Amazon/AbstractAmazonParameterBuilder.php b/src/Payone/RequestParameter/Builder/Amazon/AbstractAmazonParameterBuilder.php
diff --git a/src/Payone/RequestParameter/Builder/Amazon/AbstractAmazonRequestParameterBuilder.php b/src/Payone/RequestParameter/Builder/Amazon/AbstractAmazonRequestParameterBuilder.php
@@ -12,6 +12,7 @@ abstract class AbstractAmazonRequestParameterBuilder extends AbstractRequestPara
 {
     final public const CLEARING_TYPE = parent::CLEARING_TYPE_WALLET;
     final public const WALLET_TYPE = 'AMP';
+    final public const PLATFORM_ID = 'A1JKLSC6LUW5EW';
 
     public function supports(AbstractRequestParameterStruct $arguments): bool
     {

diff --git a/src/Payone/RequestParameter/Builder/Amazon/AuthorizeRequestParameterBuilder.php b/src/Payone/RequestParameter/Builder/Amazon/AuthorizeRequestParameterBuilder.php
@@ -29,6 +29,7 @@ public function getRequestParameter(AbstractRequestParameterStruct $arguments):
             'request' => $arguments->getAction(),
             'clearingtype' => self::CLEARING_TYPE,
             'wallettype' => self::WALLET_TYPE,
+            'add_paydata[platform_id]' => self::PLATFORM_ID,
             'add_paydata[storename]' => $this->getStoreName($arguments->getSalesChannelContext(), $arguments->getPaymentMethod()),
             'add_paydata[checkoutMode]' => 'ProcessOrder',
             'add_paydata[productType]' => 'PayAndShip',

diff --git a/src/Payone/RequestParameter/Builder/AmazonPayExpress/AbstractRequestParameterBuilder.php b/src/Payone/RequestParameter/Builder/AmazonPayExpress/AbstractRequestParameterBuilder.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Payone\RequestParameter\Builder\AmazonPayExpress;
+
+use PayonePayment\PaymentHandler\PayoneAmazonPayExpressPaymentHandler;
+use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
+use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
+
+abstract class AbstractRequestParameterBuilder extends \PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder
+{
+    public function getRequestParameter(AbstractRequestParameterStruct $arguments): array
+    {
+        return [
+            'clearingtype' => AbstractAmazonRequestParameterBuilder::CLEARING_TYPE,
+            'wallettype' => AbstractAmazonRequestParameterBuilder::WALLET_TYPE,
+            'add_paydata[platform_id]' => AbstractAmazonRequestParameterBuilder::PLATFORM_ID,
+        ];
+    }
+
+    public function supports(AbstractRequestParameterStruct $arguments): bool
+    {
+        return $arguments->getPaymentMethod() === PayoneAmazonPayExpressPaymentHandler::class;
+    }
+}
diff --git a/src/Payone/RequestParameter/Builder/AmazonPayExpress/AuthorizeRequestParameterBuilder.php b/src/Payone/RequestParameter/Builder/AmazonPayExpress/AuthorizeRequestParameterBuilder.php
@@ -4,9 +4,6 @@
 
 namespace PayonePayment\Payone\RequestParameter\Builder\AmazonPayExpress;
 
-use PayonePayment\PaymentHandler\PayoneAmazonPayExpressPaymentHandler;
-use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
-use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
 use PayonePayment\Payone\RequestParameter\Struct\PaymentTransactionStruct;
 
@@ -17,19 +14,17 @@ class AuthorizeRequestParameterBuilder extends AbstractRequestParameterBuilder
      */
     public function getRequestParameter(AbstractRequestParameterStruct $arguments): array
     {
-        return [
+        return array_merge(parent::getRequestParameter($arguments), [
             'request' => $arguments->getAction(),
-            'clearingtype' => AbstractAmazonRequestParameterBuilder::CLEARING_TYPE,
-            'wallettype' => AbstractAmazonRequestParameterBuilder::WALLET_TYPE,
-        ];
+        ]);
     }
 
     public function supports(AbstractRequestParameterStruct $arguments): bool
     {
         $action = $arguments->getAction();
 
-        return $arguments instanceof PaymentTransactionStruct
-            && $arguments->getPaymentMethod() === PayoneAmazonPayExpressPaymentHandler::class
+        return parent::supports($arguments)
+            && $arguments instanceof PaymentTransactionStruct
             && ($action === self::REQUEST_ACTION_AUTHORIZE || $action === self::REQUEST_ACTION_PREAUTHORIZE);
     }
 }
diff --git a/...equestParameter/Builder/AmazonPayExpress/CreateCheckoutSessionRequestParameterBuilder.php b/...equestParameter/Builder/AmazonPayExpress/CreateCheckoutSessionRequestParameterBuilder.php
@@ -7,9 +7,6 @@
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
 use PayonePayment\Components\GenericExpressCheckout\Struct\CreateExpressCheckoutSessionStruct;
 use PayonePayment\Configuration\ConfigurationPrefixes;
-use PayonePayment\PaymentHandler\PayoneAmazonPayExpressPaymentHandler;
-use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
-use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -30,12 +27,11 @@ public function __construct(
      */
     public function getRequestParameter(AbstractRequestParameterStruct $arguments): array
     {
-        $requestParameters = [
+        $requestParameters = array_merge(parent::getRequestParameter($arguments), [
+            'request' => self::REQUEST_ACTION_GENERIC_PAYMENT,
             'add_paydata[action]' => 'createCheckoutSessionPayload',
-            'clearingtype' => AbstractAmazonRequestParameterBuilder::CLEARING_TYPE,
-            'wallettype' => AbstractAmazonRequestParameterBuilder::WALLET_TYPE,
             'add_paydata[addressRestrictions_type]' => 'Allowed',
-        ];
+        ]);
 
         foreach ($this->getCountryCodes($arguments->getSalesChannelContext()) as $index => $countryCode) {
             $requestParameters['add_paydata[addressRestrictions_country_' . $index . ']'] = $countryCode;
@@ -62,8 +58,7 @@ public function getRequestParameter(AbstractRequestParameterStruct $arguments):
 
     public function supports(AbstractRequestParameterStruct $arguments): bool
     {
-        return $arguments instanceof CreateExpressCheckoutSessionStruct
-            && $arguments->getPaymentMethod() === PayoneAmazonPayExpressPaymentHandler::class;
+        return parent::supports($arguments) && $arguments instanceof CreateExpressCheckoutSessionStruct;
     }
 
     private function getCountryCodes(SalesChannelContext $context): array

diff --git a/...stParameter/Builder/AmazonPayExpress/GetCheckoutSessionDetailsRequestParameterBuilder.php b/...stParameter/Builder/AmazonPayExpress/GetCheckoutSessionDetailsRequestParameterBuilder.php
@@ -5,9 +5,6 @@
 namespace PayonePayment\Payone\RequestParameter\Builder\AmazonPayExpress;
 
 use PayonePayment\Components\GenericExpressCheckout\Struct\GetCheckoutSessionStruct;
-use PayonePayment\PaymentHandler\PayoneAmazonPayExpressPaymentHandler;
-use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
-use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
 
 class GetCheckoutSessionDetailsRequestParameterBuilder extends AbstractRequestParameterBuilder
@@ -17,16 +14,13 @@ class GetCheckoutSessionDetailsRequestParameterBuilder extends AbstractRequestPa
      */
     public function getRequestParameter(AbstractRequestParameterStruct $arguments): array
     {
-        return [
+        return array_merge(parent::getRequestParameter($arguments), [
             'add_paydata[action]' => 'getCheckoutSession',
-            'clearingtype' => AbstractAmazonRequestParameterBuilder::CLEARING_TYPE,
-            'wallettype' => AbstractAmazonRequestParameterBuilder::WALLET_TYPE,
-        ];
+        ]);
     }
 
     public function supports(AbstractRequestParameterStruct $arguments): bool
     {
-        return $arguments instanceof GetCheckoutSessionStruct
-            && $arguments->getPaymentMethod() === PayoneAmazonPayExpressPaymentHandler::class;
+        return parent::supports($arguments) && $arguments instanceof GetCheckoutSessionStruct;
     }
 }
diff --git a/...ayone/RequestParameter/Builder/AmazonPayExpress/UpdateCheckoutSessionParameterBuilder.php b/...ayone/RequestParameter/Builder/AmazonPayExpress/UpdateCheckoutSessionParameterBuilder.php
@@ -5,8 +5,6 @@
 namespace PayonePayment\Payone\RequestParameter\Builder\AmazonPayExpress;
 
 use PayonePayment\Components\Currency\CurrencyPrecisionInterface;
-use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
-use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
 use PayonePayment\Payone\RequestParameter\Struct\AmazonPayExpressUpdateCheckoutSessionStruct;
 use Shopware\Core\Checkout\Cart\SalesChannel\CartService;
@@ -28,19 +26,17 @@ public function getRequestParameter(AbstractRequestParameterStruct $arguments):
 
         $currency = $arguments->getSalesChannelContext()->getCurrency();
 
-        return [
+        return array_merge(parent::getRequestParameter($arguments), [
             'request' => self::REQUEST_ACTION_GENERIC_PAYMENT,
-            'clearingtype' => AbstractAmazonRequestParameterBuilder::CLEARING_TYPE,
-            'wallettype' => AbstractAmazonRequestParameterBuilder::WALLET_TYPE,
             'add_paydata[action]' => 'updateCheckoutSession',
             'amount' => $this->currencyPrecision->getRoundedTotalAmount($cart->getPrice()->getTotalPrice(), $currency),
             'currency' => $currency->getIsoCode(),
             'workorderid' => $arguments->getWorkorderId(),
-        ];
+        ]);
     }
 
     public function supports(AbstractRequestParameterStruct $arguments): bool
     {
-        return $arguments instanceof AmazonPayExpressUpdateCheckoutSessionStruct;
+        return parent::supports($arguments) && $arguments instanceof AmazonPayExpressUpdateCheckoutSessionStruct;
     }
 }
diff --git a/tests/Functional/Payment/AmazonPay/AuthorizePaymentRequestParameterTest.php b/tests/Functional/Payment/AmazonPay/AuthorizePaymentRequestParameterTest.php
@@ -54,6 +54,7 @@ public function testIfSuccessful(string $authMethod): void
         static::assertIsString($requestParams['backurl']);
         static::assertArrayHasKey('errorurl', $requestParams);
         static::assertIsString($requestParams['errorurl']);
+        static::assertArrayHasKey('add_paydata[platform_id]', $requestParams);
 
         // test only a few customer fields
         static::assertArrayHasKey('email', $requestParams);

diff --git a/tests/Functional/Payment/AmazonPayExpress/AuthorizePaymentRequestParameterTest.php b/tests/Functional/Payment/AmazonPayExpress/AuthorizePaymentRequestParameterTest.php
@@ -58,6 +58,8 @@ public function testIfSuccessful(string $authMethod): void
         static::assertIsString($requestParams['backurl']);
         static::assertArrayHasKey('errorurl', $requestParams);
         static::assertIsString($requestParams['errorurl']);
+        static::assertArrayHasKey('add_paydata[platform_id]', $requestParams);
+
 
         // test only a few customer fields
         static::assertArrayHasKey('email', $requestParams);

diff --git a/tests/Functional/Payment/AmazonPayExpress/CreateCheckoutSessionRequestParametersTest.php b/tests/Functional/Payment/AmazonPayExpress/CreateCheckoutSessionRequestParametersTest.php
@@ -35,6 +35,8 @@ public function testIfParametersGotCreatedSuccessfulWithoutRestriction(): void
             PayoneAmazonPayExpressPaymentHandler::class
         ));
 
+        static::assertArrayHasKey('request', $requestParams);
+        static::assertEquals('genericpayment', $requestParams['request']);
         static::assertArrayHasKey('clearingtype', $requestParams);
         static::assertEquals('wlt', $requestParams['clearingtype']);
         static::assertArrayHasKey('wallettype', $requestParams);
@@ -48,6 +50,7 @@ public function testIfParametersGotCreatedSuccessfulWithoutRestriction(): void
         static::assertArrayHasKey('backurl', $requestParams);
         static::assertArrayHasKey('errorurl', $requestParams);
         static::assertArrayNotHasKey('add_paydata[specialRestrictions]', $requestParams);
+        static::assertArrayHasKey('add_paydata[platform_id]', $requestParams);
     }
 
     /**

diff --git a/tests/Functional/Payment/AmazonPayExpress/GetCheckoutSessionRequestParametersTest.php b/tests/Functional/Payment/AmazonPayExpress/GetCheckoutSessionRequestParametersTest.php
@@ -35,5 +35,6 @@ public function testIfParametersGotCreatedSuccessful(): void
         static::assertEquals('getCheckoutSession', $requestParams['add_paydata[action]']);
         static::assertArrayHasKey('workorderid', $requestParams);
         static::assertEquals('woi-123456', $requestParams['workorderid']);
+        static::assertArrayHasKey('add_paydata[platform_id]', $requestParams);
     }
 }
diff --git a/tests/Functional/Payment/AmazonPayExpress/UpdateCheckoutSessionParameterBuilderTest.php b/tests/Functional/Payment/AmazonPayExpress/UpdateCheckoutSessionParameterBuilderTest.php
@@ -39,5 +39,6 @@ public function testIfSuccessful(): void
         static::assertIsString($requestParams['currency']);
         static::assertArrayHasKey('workorderid', $requestParams);
         static::assertEquals('test-123', $requestParams['workorderid']);
+        static::assertArrayHasKey('add_paydata[platform_id]', $requestParams);
     }
 }