From 6474ae8da675e80d995a11735a1cdcd435d55186 Mon Sep 17 00:00:00 2001 From: Lukasz756 Date: Tue, 13 Feb 2024 09:08:12 +0100 Subject: [PATCH 1/3] AD-105 Added views in backoffice and locales in properties for adyenNotification object. --- .../adyenv6backoffice-backoffice-config.xml | 42 ++++++++++++++++++- .../adyenv6backoffice-locales_en.properties | 1 + .../adyenv6core-locales_en.properties | 19 ++++++++- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml index 4453342d6..a6f9e9ce3 100644 --- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml +++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml @@ -88,7 +88,7 @@ - + @@ -125,4 +125,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties index dbf082166..5b26c021d 100644 --- a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties +++ b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties @@ -28,5 +28,6 @@ # # yourcustomlocalekey=value +hmc_adyen_notification_item=Adyen Notification Item hmc_adyen_notification=Adyen Notification diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties index a05ab8535..7d183353d 100644 --- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties +++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties @@ -145,4 +145,21 @@ type.NotificationItem.success.name=Success type.NotificationItem.paymentMethod.name=Payment method type.NotificationItem.additionalData.name=Additional data type.NotificationItem.createdAt.name=Created at -type.NotificationItem.processedAt.name=Processed at \ No newline at end of file +type.NotificationItem.processedAt.name=Processed at + +type.adyenNotification.name=Adyen Notification +type.adyenNotification.uuid.name=UUID +type.adyenNotification.amountValue.name=Amount value +type.adyenNotification.amountCurrency.name=Amount currency +type.adyenNotification.eventCode.name=Event code +type.adyenNotification.eventDate.name=Event date +type.adyenNotification.merchantAccountCode.name=Merchant account code +type.adyenNotification.merchantReference.name=Merchant reference +type.adyenNotification.originalReference.name=Original reference +type.adyenNotification.pspReference.name=PSP reference +type.adyenNotification.reason.name=Reason +type.adyenNotification.success.name=Success +type.adyenNotification.paymentMethod.name=Payment method +type.adyenNotification.additionalData.name=Additional data +type.adyenNotification.createdAt.name=Created at +type.adyenNotification.processedAt.name=Processed at \ No newline at end of file From 7c2f11bf638c48432044671f04fcf5229948bb7a Mon Sep 17 00:00:00 2001 From: Lukasz756 Date: Mon, 19 Feb 2024 10:54:39 +0100 Subject: [PATCH 2/3] AD-105 Splitted notifications in two separate extensions. --- .../adyenv6backoffice-backoffice-config.xml | 77 ------------------- .../adyenv6backoffice-locales_en.properties | 6 +- adyenv6core/resources/adyenv6core-items.xml | 2 +- .../adyenv6core-locales_en.properties | 34 -------- adyenv6notification/extensioninfo.xml | 2 + .../adyenv6notification-backoffice-config.xml | 51 ++++++++++++ .../adyenv6notification-locales_en.properties | 39 ++++++++++ adyenv6notificationv2/extensioninfo.xml | 4 +- adyenv6notificationv2/project.properties | 2 +- ...dyenv6notificationv2-backoffice-config.xml | 55 +++++++++++++ ...dyenv6notificationv2-backoffice-spring.xml | 15 ++++ ...yenv6notificationv2-backoffice-widgets.xml | 7 ++ ...dyenv6notificationv2-locales_en.properties | 18 +++++ 13 files changed, 192 insertions(+), 120 deletions(-) create mode 100644 adyenv6notification/resources/adyenv6notification-backoffice-config.xml create mode 100644 adyenv6notification/resources/localization/adyenv6notification-locales_en.properties create mode 100644 adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml create mode 100644 adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml create mode 100644 adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml index a6f9e9ce3..6c5b76a70 100644 --- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml +++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml @@ -86,83 +86,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties index 5b26c021d..1b13259fd 100644 --- a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties +++ b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties @@ -26,8 +26,4 @@ # type..description=XY # type...description=XY # -# yourcustomlocalekey=value - -hmc_adyen_notification_item=Adyen Notification Item -hmc_adyen_notification=Adyen Notification - +# yourcustomlocalekey=value \ No newline at end of file diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml index 4e3d83486..af5d91ce1 100644 --- a/adyenv6core/resources/adyenv6core-items.xml +++ b/adyenv6core/resources/adyenv6core-items.xml @@ -541,7 +541,7 @@ - + diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties index 7d183353d..33ee59893 100644 --- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties +++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties @@ -129,37 +129,3 @@ type.AmazonpayEnvironment.LIVE.name=LIVE type.AmazonpayRegion.EU.name=EU type.AmazonpayRegion.NA.name=NA type.AmazonpayRegion.JP.name=JP - -type.NotificationItem.name=Adyen Notification -type.NotificationItem.uuid.name=UUID -type.NotificationItem.amountValue.name=Amount value -type.NotificationItem.amountCurrency.name=Amount currency -type.NotificationItem.eventCode.name=Event code -type.NotificationItem.eventDate.name=Event date -type.NotificationItem.merchantAccountCode.name=Merchant account code -type.NotificationItem.merchantReference.name=Merchant reference -type.NotificationItem.originalReference.name=Original reference -type.NotificationItem.pspReference.name=PSP reference -type.NotificationItem.reason.name=Reason -type.NotificationItem.success.name=Success -type.NotificationItem.paymentMethod.name=Payment method -type.NotificationItem.additionalData.name=Additional data -type.NotificationItem.createdAt.name=Created at -type.NotificationItem.processedAt.name=Processed at - -type.adyenNotification.name=Adyen Notification -type.adyenNotification.uuid.name=UUID -type.adyenNotification.amountValue.name=Amount value -type.adyenNotification.amountCurrency.name=Amount currency -type.adyenNotification.eventCode.name=Event code -type.adyenNotification.eventDate.name=Event date -type.adyenNotification.merchantAccountCode.name=Merchant account code -type.adyenNotification.merchantReference.name=Merchant reference -type.adyenNotification.originalReference.name=Original reference -type.adyenNotification.pspReference.name=PSP reference -type.adyenNotification.reason.name=Reason -type.adyenNotification.success.name=Success -type.adyenNotification.paymentMethod.name=Payment method -type.adyenNotification.additionalData.name=Additional data -type.adyenNotification.createdAt.name=Created at -type.adyenNotification.processedAt.name=Processed at \ No newline at end of file diff --git a/adyenv6notification/extensioninfo.xml b/adyenv6notification/extensioninfo.xml index 4abaa4353..48aca035c 100644 --- a/adyenv6notification/extensioninfo.xml +++ b/adyenv6notification/extensioninfo.xml @@ -20,6 +20,8 @@ + + \ No newline at end of file diff --git a/adyenv6notification/resources/adyenv6notification-backoffice-config.xml b/adyenv6notification/resources/adyenv6notification-backoffice-config.xml new file mode 100644 index 000000000..39f64b048 --- /dev/null +++ b/adyenv6notification/resources/adyenv6notification-backoffice-config.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties b/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties new file mode 100644 index 000000000..313f197e1 --- /dev/null +++ b/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties @@ -0,0 +1,39 @@ +# ----------------------------------------------------------------------- +# Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. +# ----------------------------------------------------------------------- + +# put localizations of item types into this file +# Note that you can also add special locatizations which +# can be retrieved with the +# +# ...tools.localization.Localization.getLocalizedString(...) +# +# methods. +# +# syntax for type localizations: +# +# type..name=XY +# type...name=XY +# type..description=XY +# type...description=XY +# +# yourcustomlocalekey=value +hmc_adyen_notification_item=Adyen Notification Item + +type.NotificationItem.name=Adyen Notification +type.NotificationItem.uuid.name=UUID +type.NotificationItem.amountValue.name=Amount value +type.NotificationItem.amountCurrency.name=Amount currency +type.NotificationItem.eventCode.name=Event code +type.NotificationItem.eventDate.name=Event date +type.NotificationItem.merchantAccountCode.name=Merchant account code +type.NotificationItem.merchantReference.name=Merchant reference +type.NotificationItem.originalReference.name=Original reference +type.NotificationItem.pspReference.name=PSP reference +type.NotificationItem.reason.name=Reason +type.NotificationItem.success.name=Success +type.NotificationItem.paymentMethod.name=Payment method +type.NotificationItem.additionalData.name=Additional data +type.NotificationItem.createdAt.name=Created at +type.NotificationItem.processedAt.name=Processed at + diff --git a/adyenv6notificationv2/extensioninfo.xml b/adyenv6notificationv2/extensioninfo.xml index 637232b7e..ac5dda49d 100644 --- a/adyenv6notificationv2/extensioninfo.xml +++ b/adyenv6notificationv2/extensioninfo.xml @@ -9,14 +9,14 @@ - - + + diff --git a/adyenv6notificationv2/project.properties b/adyenv6notificationv2/project.properties index ce547cd06..d16db9c92 100644 --- a/adyenv6notificationv2/project.properties +++ b/adyenv6notificationv2/project.properties @@ -7,4 +7,4 @@ # Specifies the location of the spring context file putted automatically to the global platform application context. adyenv6notificationv2.application-context=adyenv6notificationv2-spring.xml -adyenv6notification.webroot=/adyenv6notificationv2 \ No newline at end of file +adyenv6notificationv2.webroot=/adyenv6notificationv2 \ No newline at end of file diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml new file mode 100644 index 000000000..b0d6181b8 --- /dev/null +++ b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml new file mode 100644 index 000000000..967036515 --- /dev/null +++ b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml new file mode 100644 index 000000000..98b6c6f5a --- /dev/null +++ b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties b/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties index e5a68631c..e8c80455c 100644 --- a/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties +++ b/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties @@ -18,4 +18,22 @@ # type...description=XY # # yourcustomlocalekey=value +hmc_adyen_notification=Adyen Notification + +type.AdyenNotification.name=Adyen Notification +type.AdyenNotification.uuid.name=UUID +type.AdyenNotification.amountValue.name=Amount value +type.AdyenNotification.amountCurrency.name=Amount currency +type.AdyenNotification.eventCode.name=Event code +type.AdyenNotification.eventDate.name=Event date +type.AdyenNotification.merchantAccountCode.name=Merchant account code +type.AdyenNotification.merchantReference.name=Merchant reference +type.AdyenNotification.originalReference.name=Original reference +type.AdyenNotification.pspReference.name=PSP reference +type.AdyenNotification.reason.name=Reason +type.AdyenNotification.success.name=Success +type.AdyenNotification.paymentMethod.name=Payment method +type.AdyenNotification.additionalData.name=Additional data +type.AdyenNotification.createdAt.name=Created at +type.AdyenNotification.processedAt.name=Processed at From 3508ca6dc32f7c0099a7333650473abe7efbd915 Mon Sep 17 00:00:00 2001 From: Lukasz756 Date: Mon, 19 Feb 2024 12:17:36 +0100 Subject: [PATCH 3/3] AD-105 Deleted unnecessary files. --- .../adyenv6notificationv2-backoffice-spring.xml | 15 --------------- .../adyenv6notificationv2-backoffice-widgets.xml | 7 ------- 2 files changed, 22 deletions(-) delete mode 100644 adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml delete mode 100644 adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml deleted file mode 100644 index 967036515..000000000 --- a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-spring.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml deleted file mode 100644 index 98b6c6f5a..000000000 --- a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-widgets.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -