+ v-if="notifications.length"
+ :dataSource="notifications"
+ :columns="columns"
+ :showActions="true"
+ :showSelection="false"
+ :showSettings="true"
+ >
+ {% block sw_data_grid_body_columns %}
+ {% block sw_data_grid_column_actions %}
+
+ {% block sw_data_grid_column_actions_reschedule %}
+
+ {{ $tc('adyen.reprocessNotification') }}
+
+ {% endblock %}
+
+ {% endblock %}
+ {% endblock %}
+
{{ $tc('adyen.noNotificationsReceived') }}
-
\ No newline at end of file
+
diff --git a/src/Resources/app/administration/src/component/adyen-notifications/index.js b/src/Resources/app/administration/src/component/adyen-notifications/index.js
index 7b84b092..2e081bf2 100644
--- a/src/Resources/app/administration/src/component/adyen-notifications/index.js
+++ b/src/Resources/app/administration/src/component/adyen-notifications/index.js
@@ -20,7 +20,7 @@
*
*/
-const { Component } = Shopware;
+const { Component, Mixin } = Shopware;
import template from './adyen-notifications.html.twig';
@@ -29,6 +29,10 @@ Component.register('adyen-notifications', {
inject: ['adyenService'],
+ mixins: [
+ Mixin.getByName('notification')
+ ],
+
props: {
order: {
type: Object,
@@ -47,6 +51,8 @@ Component.register('adyen-notifications', {
{ property: 'status', label: this.$tc('adyen.columnHeaders.status') },
{ property: 'createdAt', label: this.$tc('adyen.columnHeaders.created') },
{ property: 'updatedAt', label: this.$tc('adyen.columnHeaders.updated') },
+ { property: 'errorCount', label: this.$tc('adyen.columnHeaders.errorCount') },
+ { property: 'errorMessage', label: this.$tc('adyen.columnHeaders.errorMessage') },
],
showWidget: false,
}
@@ -57,6 +63,17 @@ Component.register('adyen-notifications', {
this.adyenService.fetchNotifications(this.order.id).then((res) => {
this.notifications = res;
});
+ },
+
+ onReschedule(item) {
+ this.adyenService.rescheduleNotification(item.notificationId).then((response) => {
+ this.createNotificationSuccess({
+ title: this.$tc('adyen.reprocessNotification'),
+ message: this.$tc('adyen.notificationRescheduleSuccess')
+ });
+
+ this.fetchNotifications();
+ });
}
},
@@ -66,4 +83,4 @@ Component.register('adyen-notifications', {
this.fetchNotifications();
}
}
-})
\ No newline at end of file
+})
diff --git a/src/Resources/app/administration/src/service/adyenService.js b/src/Resources/app/administration/src/service/adyenService.js
index 835e425c..bd129e57 100644
--- a/src/Resources/app/administration/src/service/adyenService.js
+++ b/src/Resources/app/administration/src/service/adyenService.js
@@ -114,6 +114,21 @@ class ApiClient extends ApiService {
});
}
+ rescheduleNotification(notificationId) {
+ const headers = this.getBasicHeaders({});
+
+ return this.httpClient
+ .get(this.getApiBasePath() + '/reschedule-notification/' + notificationId , {
+ headers
+ })
+ .then((response) => {
+ return ApiService.handleResponse(response);
+ }).catch((error) => {
+ console.error('An error occurred: ' + error.message);
+ throw error;
+ });
+ }
+
isAdyenOrder(order) {
const orderTransactions = order.transactions;
let isAdyen = false;
diff --git a/src/Resources/app/administration/src/snippet/en_GB.json b/src/Resources/app/administration/src/snippet/en_GB.json
index ce675a8e..240ff452 100644
--- a/src/Resources/app/administration/src/snippet/en_GB.json
+++ b/src/Resources/app/administration/src/snippet/en_GB.json
@@ -19,8 +19,12 @@
"event": "Event",
"success": "Success",
"created": "Created",
- "updated": "Updated"
+ "updated": "Updated",
+ "errorCount": "Error Count",
+ "errorMessage": "Error Message"
},
+ "reprocessNotification": "Reprocess Notification",
+ "notificationRescheduleSuccess": "Notification will be processed again.",
"notificationsTitle": "Adyen Webhook Notifications",
"noNotificationsReceived": "No webhook notifications received.",
"adyenPaymentCaptureTitle": "Adyen Capture Requests",
diff --git a/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js b/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js
index 7e852a21..dc898fe4 100644
--- a/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js
+++ b/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js
@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["adyen-payment-shopware6"],{YcTq:function(e,t,n){"use strict";t.a={updatablePaymentMethods:["scheme","ideal","sepadirectdebit","oneclick","dotpay","bcmc","bcmc_mobile","blik","eps","facilypay_3x","facilypay_4x","facilypay_6x","facilypay_10x","facilypay_12x","afterpay_default","ratepay","ratepay_directdebit","giftcard"],componentsWithPayButton:{applepay:{extra:{},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)}},paywithgoogle:{extra:{buttonSizeMode:"fill"},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)},onError:function(e,t,n){"CANCELED"!==e.statusCode&&("statusMessage"in e?console.log(e.statusMessage):console.log(e.statusCode))}},paypal:{extra:{},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()},onError:function(e,t,n){t.setStatus("ready"),window.location.href=n.errorUrl.toString()},onCancel:function(e,t,n){t.setStatus("ready"),window.location.href=n.errorUrl.toString()},responseHandler:function(e,t){try{(t=JSON.parse(t)).isFinal&&(location.href=e.returnUrl),this.handleAction(t.action)}catch(e){console.error(e)}}},amazonpay:{extra:{productType:"PayAndShip",checkoutMode:"ProcessOrder",returnUrl:location.href},prePayRedirect:!0,sessionKey:"amazonCheckoutSessionId",onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)},onError:function(e,t){console.log(e),t.setStatus("ready")}}},paymentMethodTypeHandlers:{scheme:"handler_adyen_cardspaymentmethodhandler",ideal:"handler_adyen_idealpaymentmethodhandler",klarna:"handler_adyen_klarnapaylaterpaymentmethodhandler",klarna_account:"handler_adyen_klarnaaccountpaymentmethodhandler",klarna_paynow:"handler_adyen_klarnapaynowpaymentmethodhandler",ratepay:"handler_adyen_ratepaypaymentmethodhandler",ratepay_directdebit:"handler_adyen_ratepaydirectdebitpaymentmethodhandler",sepadirectdebit:"handler_adyen_sepapaymentmethodhandler",sofort:"handler_adyen_sofortpaymentmethodhandler",paypal:"handler_adyen_paypalpaymentmethodhandler",oneclick:"handler_adyen_oneclickpaymentmethodhandler",giropay:"handler_adyen_giropaypaymentmethodhandler",applepay:"handler_adyen_applepaypaymentmethodhandler",paywithgoogle:"handler_adyen_googlepaypaymentmethodhandler",dotpay:"handler_adyen_dotpaypaymentmethodhandler",bcmc:"handler_adyen_bancontactcardpaymentmethodhandler",bcmc_mobile:"handler_adyen_bancontactmobilepaymentmethodhandler",amazonpay:"handler_adyen_amazonpaypaymentmethodhandler",twint:"handler_adyen_twintpaymentmethodhandler",eps:"handler_adyen_epspaymentmethodhandler",swish:"handler_adyen_swishpaymentmethodhandler",alipay:"handler_adyen_alipaypaymentmethodhandler",alipay_hk:"handler_adyen_alipayhkpaymentmethodhandler",blik:"handler_adyen_blikpaymentmethodhandler",clearpay:"handler_adyen_clearpaypaymentmethodhandler",facilypay_3x:"handler_adyen_facilypay3xpaymentmethodhandler",facilypay_4x:"handler_adyen_facilypay4xpaymentmethodhandler",facilypay_6x:"handler_adyen_facilypay6xpaymentmethodhandler",facilypay_10x:"handler_adyen_facilypay10xpaymentmethodhandler",facilypay_12x:"handler_adyen_facilypay12xpaymentmethodhandler",afterpay_default:"handler_adyen_afterpaydefaultpaymentmethodhandler",trustly:"handler_adyen_trustlypaymentmethodhandler",paysafecard:"handler_adyen_paysafecardpaymentmethodhandler",givex:"handler_adyen_givexgiftcardpaymentmethodhandler",webshopgiftcard:"handler_adyen_webshopgiftcardpaymentmethodhandler",kadowereld:"handler_adyen_kadowereldgiftcardpaymentmethodhandler",tcstestgiftcard:"handler_adyen_tcstestgiftcardpaymentmethodhandler",albelligiftcard:"handler_adyen_albelligiftcardpaymentmethodhandler",bijcadeaucard:"handler_adyen_bijenkorfgiftcardpaymentmethodhandler",vvvgiftcard:"handler_adyen_vvvgiftcardpaymentmethodhandler",genericgiftcard:"handler_adyen_genericgiftcardpaymentmethodhandler",gallgall:"handler_adyen_gallgallgiftcardpaymentmethodhandler",hmlingerie:"handler_adyen_hunkemollerlingeriegiftcardpaymentmethodhandler",beautycadeaukaart:"handler_adyen_beautygiftcardpaymentmethodhandler",svs:"handler_adyen_svsgiftcardpaymentmethodhandler",fashioncheque:"handler_adyen_fashionchequegiftcardpaymentmethodhandler",decadeaukaart:"handler_adyen_decadeaukaartgiftcardpaymentmethodhandler"}}},j5lx:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return _}));var a=n("FGIj"),r=n("gHbT"),o=n("p4AR"),i=n("2Y4b"),d=n("u0Tz"),s=n("YcTq");function c(e){return(c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function h(){return(h=Object.assign||function(e){for(var t=1;t