Merge pull request #528 from Adyen/develop

Release 4.1.0

README.md

@@ -41,6 +41,7 @@ The plugin integrates card component (Secured Fields) using Adyen Checkout for a
  - Apple Pay
  - Bancontact
  - Blik
+ - Billie
  - Clearpay
  - Dotpay
  - Electronic Payment Service (EPS)

composer.json

@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "4.0.0",
+    "version": "4.1.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

src/AdyenPaymentShopware6.php

@@ -130,6 +130,10 @@ public function update(UpdateContext $updateContext): void
         if (\version_compare($currentVersion, '3.15.0', '<')) {
             $this->updateTo3150($updateContext);
         }
+
+        if (\version_compare($currentVersion, '4.1.0', '<')) {
+            $this->updateTo410($updateContext);
+        }
     }
 
     private function addPaymentMethod(PaymentMethods\PaymentMethodInterface $paymentMethod, Context $context): void
@@ -361,8 +365,8 @@ private function updateTo350(UpdateContext $updateContext): void
     {
         //Version 3.5.0 introduces Bancontact mobile
         foreach ([
-                     new PaymentMethods\BancontactMobilePaymentMethod()
-                 ] as $method) {
+            new PaymentMethods\BancontactMobilePaymentMethod()
+        ] as $method) {
             $this->addPaymentMethod(
                 $method,
                 $updateContext->getContext()
@@ -461,6 +465,22 @@ private function updateTo3150(UpdateContext $updateContext): void
         }
     }
 
+    private function updateTo410(UpdateContext $updateContext): void
+    {
+        /* Version 4.1.0 introduces following payment method.
+       * Billie
+       */
+        $this->addPaymentMethod(
+            new PaymentMethods\BilliePaymentMethod(),
+            $updateContext->getContext()
+        );
+        $this->setPaymentMethodIsActive(
+            true,
+            $updateContext->getContext(),
+            new PaymentMethods\BilliePaymentMethod()
+        );
+    }
+
     /**
      * @param UpdateContext $updateContext
      * @param string $paymentMethodHandler

src/Handlers/BilliePaymentMethodHandler.php

@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2021 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Shopware\Handlers;
+
+class BilliePaymentMethodHandler extends AbstractPaymentMethodHandler
+{
+    public static bool $isOpenInvoice = true;
+    public static bool $supportsManualCapture = true;
+    public static bool $supportsPartialCapture = true;
+
+    public static function getPaymentMethodCode()
+    {
+        return 'klarna_b2b';
+    }
+}

src/PaymentMethods/BilliePaymentMethod.php

@@ -0,0 +1,87 @@
+<?php declare(strict_types=1);
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2021 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Shopware\PaymentMethods;
+
+use Adyen\Shopware\Handlers\BilliePaymentMethodHandler;
+
+class BilliePaymentMethod implements PaymentMethodInterface
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return 'Billie';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDescription(): string
+    {
+        return 'Buy Now Pay Later with Billie';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPaymentHandler(): string
+    {
+        return BilliePaymentMethodHandler::class;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getGatewayCode(): string
+    {
+        return 'ADYEN_KLARNA_B2B';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTemplate(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLogo(): string
+    {
+        return 'billie.png';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getType(): string
+    {
+        return 'redirect';
+    }
+}

src/PaymentMethods/PaymentMethods.php

@@ -69,6 +69,7 @@ class PaymentMethods
         MbwayPaymentMethod::class,
         VippsPaymentMethod::class,
         MobilePayPaymentMethod::class,
-        OpenBankingPaymentMethod::class
+        OpenBankingPaymentMethod::class,
+        BilliePaymentMethod::class
     ];
 }

src/Resources/app/storefront/src/checkout/confirm-order.plugin.js

@@ -93,6 +93,7 @@ export default class ConfirmOrderPlugin extends Plugin {
             paymentMethodsConfiguration: {
                 card: {
                     hasHolderName: true,
+                    holderNameRequired: true,
                     clickToPayConfiguration: {
                         merchantDisplayName: merchantAccount,
                         shopperEmail: shopperDetails.shopperEmail
@@ -521,6 +522,10 @@ export default class ConfirmOrderPlugin extends Plugin {
             },
             onSubmit: function(state, component) {
                 if (state.isValid) {
+                    if (isOneClick) {
+                        state.data.paymentMethod.holderName = paymentMethod.holderName ?? '';
+                    }
+
                     let extraParams = {
                         stateData: JSON.stringify(state.data)
                     };

src/Resources/app/storefront/src/configuration/adyen.js

@@ -22,7 +22,7 @@
 
 export default {
     updatablePaymentMethods: [
-        'scheme', 'ideal', 'sepadirectdebit', 'oneclick', 'dotpay', 'bcmc', 'bcmc_mobile', 'blik', 'eps', 'facilypay_3x',
+        'scheme', 'ideal', 'sepadirectdebit', 'oneclick', 'dotpay', 'bcmc', 'bcmc_mobile', 'blik', 'klarna_b2b', 'eps', 'facilypay_3x',
         'facilypay_4x', 'facilypay_6x', 'facilypay_10x', 'facilypay_12x', 'afterpay_default', 'ratepay',
         'ratepay_directdebit', 'giftcard', 'paybright', 'affirm', 'multibanco', 'mbway', 'vipps', 'mobilepay',
         'wechatpayQR', 'wechatpayWeb', 'paybybank'
@@ -155,6 +155,7 @@ export default {
         'vipps': 'handler_adyen_vippspaymentmethodhandler',
         'affirm': 'handler_adyen_affirmpaymentmethodhandler',
         'paybright': 'handler_adyen_paybrightpaymentmethodhandler',
-        'paybybank': 'handler_adyen_openbankingpaymentmethodhandler'
+        'paybybank': 'handler_adyen_openbankingpaymentmethodhandler',
+        'klarna_b2b': 'handler_adyen_billiepaymentmethodhandler'
     }
 }

src/Resources/config/services/payment-handlers.xml

@@ -184,6 +184,10 @@
                  parent="Adyen\Shopware\Handlers\AbstractPaymentMethodHandler">
             <tag name="shopware.payment.method.async"/>
         </service>
+        <service id="Adyen\Shopware\Handlers\BilliePaymentMethodHandler"
+                 parent="Adyen\Shopware\Handlers\AbstractPaymentMethodHandler">
+            <tag name="shopware.payment.method.async"/>
+        </service>
         <service id="Adyen\Shopware\Handlers\GivexGiftCardPaymentMethodHandler"
                  parent="Adyen\Shopware\Handlers\AbstractPaymentMethodHandler">
             <tag name="shopware.payment.method.async"/>