[ECP-9206] Fix return type in checking adyen orders (#518)

* [ECP-9206] Fix return type in checking adyen orders * [ECP-9206] Return false from catch block in case of error --------- Co-authored-by: sushmita <[email protected]>
Adyen · Jul 17, 2024 · 2fc9de1 · 2fc9de1
1 parent 13b5a47
commit 2fc9de1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
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/css/adyen-payment-shopware6.css b/src/Resources/public/administration/css/adyen-payment-shopware6.css
@@ -1,4 +1,2 @@
 .adyen-capture-card-header{display:flex;height:30px;margin-bottom:15px}.adyen-capture-card-header-first{margin-top:auto;width:100%}
 .adyen-refund-card-header{display:flex;height:30px;margin-bottom:15px}.adyen-refund-card-header-first{margin-top:auto;width:100%}
-
-/*# sourceMappingURL=adyen-payment-shopware6.css.map*/
diff --git a/src/Resources/public/administration/js/adyen-payment-shopware6.js b/src/Resources/public/administration/js/adyen-payment-shopware6.js
diff --git a/src/Resources/public/static/css/adyen-payment-shopware6.css.map b/src/Resources/public/static/css/adyen-payment-shopware6.css.map
diff --git a/src/Resources/public/static/js/adyen-payment-shopware6.js.map b/src/Resources/public/static/js/adyen-payment-shopware6.js.map