Merge pull request #264 from Adyen/develop

Release 3.5.0

.github/CODEOWNERS

@@ -1 +1 @@
-* @acampos1916 @rikterbeek @peterojo @morerice @AlexandrosMor @candemiralp
+* @acampos1916 @rikterbeek @peterojo @morerice @AlexandrosMor @candemiralp @RokPopov

composer.json

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

src/AdyenPaymentShopware6.php

@@ -123,6 +123,10 @@ public function update(UpdateContext $updateContext): void
         if (\version_compare($currentVersion, '3.2.0', '<')) {
             $this->updateTo320($updateContext);
         }
+
+        if (\version_compare($currentVersion, '3.5.0', '<')) {
+            $this->updateTo350($updateContext);
+        }
     }
 
     private function addPaymentMethod(PaymentMethods\PaymentMethodInterface $paymentMethod, Context $context): void
@@ -446,6 +450,24 @@ private function updateTo320(UpdateContext $updateContext): void
             ], $updateContext->getContext());
         }
     }
+
+    private function updateTo350(UpdateContext $updateContext): void
+    {
+        //Version 3.5.0 introduces Bancontact mobile
+        foreach ([
+                     new PaymentMethods\BancontactMobilePaymentMethod()
+                 ] as $method) {
+            $this->addPaymentMethod(
+                $method,
+                $updateContext->getContext()
+            );
+            $this->setPaymentMethodIsActive(
+                true,
+                $updateContext->getContext(),
+                $method
+            );
+        }
+    }
 }
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {

src/Controller/AdminController.php

@@ -74,7 +74,7 @@ class AdminController
     /**
      * @var NotificationService
      */
-    private NotificationService $notificationService;
+    private $notificationService;
 
     /** @var CurrencyFormatter */
     private $currencyFormatter;
@@ -133,9 +133,12 @@ public function check(RequestDataBag $dataBag): JsonResponse
     {
         try {
             $client = new Client();
-            $client->setXApiKey($dataBag->get(ConfigurationService::BUNDLE_NAME . '.config.apiKeyTest'));
+            $environment = $dataBag->get(ConfigurationService::BUNDLE_NAME . '.config.environment') ? 'live' : 'test';
+            $client->setXApiKey(
+                $dataBag->get(ConfigurationService::BUNDLE_NAME . '.config.apiKey' . ucfirst($environment))
+            );
             $client->setEnvironment(
-                $dataBag->get(ConfigurationService::BUNDLE_NAME . '.config.environment') ? 'live' : 'test',
+                $environment,
                 $dataBag->get(ConfigurationService::BUNDLE_NAME . '.config.liveEndpointUrlPrefix')
             );
             $service = new Checkout($client);