Merge branch 'develop' into ECP-9277

Adyen · Jul 18, 2024 · c422ad5 · c422ad5
2 parents bd9c249 + 2fc9de1
commit c422ad5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "4.0.0-rc1",
+    "version": "4.0.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

diff --git a/src/Resources/app/administration/src/component/adyen-notifications/index.js b/src/Resources/app/administration/src/component/adyen-notifications/index.js
@@ -77,8 +77,8 @@ Component.register('adyen-notifications', {
         }
     },
 
-    beforeMount() {
-        this.showWidget = this.adyenService.isAdyenOrder(this.order);
+    async beforeMount() {
+        this.showWidget = await this.adyenService.isAdyenOrder(this.order);
         if (this.showWidget) {
             this.fetchNotifications();
         }

diff --git a/src/Resources/app/administration/src/component/adyen-partial-payments/index.js b/src/Resources/app/administration/src/component/adyen-partial-payments/index.js
@@ -57,9 +57,9 @@ Component.register('adyen-partial-payments', {
         }
     },
 
-    beforeMount() {
+    async beforeMount() {
         this.isVersionOlderThan65 = VersionHelper.isVersionOlderThan65();
-        this.showWidget = this.adyenService.isAdyenOrder(this.order);
+        this.showWidget = await this.adyenService.isAdyenOrder(this.order);
 
         if (this.showWidget) {
             this.fetchAdyenPartialPayments();

diff --git a/src/Resources/app/administration/src/component/adyen-refund/index.js b/src/Resources/app/administration/src/component/adyen-refund/index.js
@@ -120,8 +120,8 @@ Component.register('adyen-refund', {
         },
     },
 
-    beforeMount() {
-        this.showWidget = this.adyenService.isAdyenOrder(this.order);
+    async beforeMount() {
+        this.showWidget = await this.adyenService.isAdyenOrder(this.order);
         if (this.showWidget) {
             this.fetchRefunds();
         }

diff --git a/src/Resources/app/administration/src/service/adyenService.js b/src/Resources/app/administration/src/service/adyenService.js
@@ -173,7 +173,7 @@ class ApiClient extends ApiService {
             })
             .catch((error) => {
                 console.error('An error occurred: ' + error.message);
-                throw error;
+                return false;
             });
     }
 

diff --git a/src/Resources/public/administration/js/adyen-payment-shopware6.js b/src/Resources/public/administration/js/adyen-payment-shopware6.js