Merge pull request #443 from Adyen/develop

Release 3.14.3

composer.json

@@ -6,13 +6,13 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "3.14.2",
+    "version": "3.14.3",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {
-        "shopware/core": "^6.4.0.0 || ^6.5.0.0",
-        "shopware/storefront": "^6.4.0.0 || ^6.5.0.0",
-        "adyen/php-api-library": "15.0.0",
+        "shopware/core": "~6.4.0 || ~6.5.0",
+        "shopware/storefront": "~6.4.0 || ~6.5.0",
+        "adyen/php-api-library": "^15.0.0",
         "adyen/php-webhook-module": "0.8.0",
         "ext-json": "*"
     },

src/AdyenPaymentShopware6.php

@@ -50,31 +50,25 @@
 
 class AdyenPaymentShopware6 extends Plugin
 {
-    public function build(ContainerBuilder $container): void
-    {
-        parent::build($container);
-        $this->installJsAssets($container->getParameter('kernel.shopware_version'));
-    }
-
     public function installJsAssets($shopwareVersion)
     {
         $storefrontAssetPath = __DIR__ . '/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js';
         $adminAssetPath = __DIR__ . '/Resources/public/administration/js/adyen-payment-shopware6.js';
         if (\version_compare($shopwareVersion, '6.5.0.0', '<')) {
-            $resultStorefront = copy(
+            $resultStorefront = $this->safeCopyAsset(
                 __DIR__ . '/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware64.js.dist',
                 $storefrontAssetPath
             );
-            $resultAdmin = copy(
+            $resultAdmin = $this->safeCopyAsset(
                 __DIR__ . '/Resources/public/administration/js/adyen-payment-shopware64.js.dist',
                 $adminAssetPath
             );
         } else {
-            $resultStorefront = copy(
+            $resultStorefront = $this->safeCopyAsset(
                 __DIR__ . '/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware65.js.dist',
                 $storefrontAssetPath
             );
-            $resultAdmin = copy(
+            $resultAdmin = $this->safeCopyAsset(
                 __DIR__ . '/Resources/public/administration/js/adyen-payment-shopware64.js.dist',
                 $adminAssetPath
             );
@@ -103,6 +97,7 @@ public function install(InstallContext $installContext): void
 
     public function activate(ActivateContext $activateContext): void
     {
+        $this->installJsAssets($activateContext->getCurrentShopwareVersion());
         foreach (PaymentMethods\PaymentMethods::PAYMENT_METHODS as $paymentMethod) {
             $this->setPaymentMethodIsActive(true, $activateContext->getContext(), new $paymentMethod());
         }
@@ -568,6 +563,15 @@ private function updateTo3100(UpdateContext $updateContext): void
             );
         }
     }
+
+    private function safeCopyAsset($source, $destination): bool
+    {
+        try {
+            return copy($source, $destination);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {