Skip to content

Commit

Permalink
Merge pull request #346 from Adyen/feature/AD-105
Browse files Browse the repository at this point in the history
AD-105 Create Backoffice view with AdyenNotificationItem
  • Loading branch information
Lukasz756 authored Feb 19, 2024
2 parents ea4f23d + 3508ca6 commit 4c36b07
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,43 +86,6 @@
</editorArea:editorArea>
</context>

<context component="explorer-tree" merge-by="module">
<et:explorer-tree>
<et:type-node id="hmc_adyen_notification" code="NotificationItem"/>
</et:explorer-tree>
</context>

<context type="NotificationItem" component="advanced-search" merge-by="type" parent="GenericItem">
<as:advanced-search>
<as:field-list>
<as:field name="uuid"/>
<as:field name="amountValue"/>
<as:field name="amountCurrency"/>
<as:field name="eventCode"/>
<as:field name="eventDate"/>
<as:field name="merchantAccountCode"/>
<as:field name="merchantReference"/>
<as:field name="originalReference"/>
<as:field name="pspReference"/>
<as:field name="paymentMethod"/>
<as:field name="createdAt"/>
<as:field name="processedAt"/>
<as:field name="success"/>
</as:field-list>
</as:advanced-search>
</context>

<context merge-by="type" parent="GenericItem" type="NotificationItem" component="listview">
<lv:list-view>
<lv:column qualifier="uuid"/>
<lv:column qualifier="merchantReference"/>
<lv:column qualifier="pspReference"/>
<lv:column qualifier="amountValue"/>
<lv:column qualifier="amountCurrency"/>
<lv:column qualifier="paymentMethod"/>
<lv:column qualifier="eventCode"/>
<lv:column qualifier="success"/>
<lv:column qualifier="originalReference"/>
</lv:list-view>
</context>
</config>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@
# type.<code of type>.description=XY
# type.<code of type>.<qualifier of attribute>.description=XY
#
# yourcustomlocalekey=value

hmc_adyen_notification=Adyen Notification

# yourcustomlocalekey=value
2 changes: 1 addition & 1 deletion adyenv6core/resources/adyenv6core-items.xml
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
</attributes>
</itemtype>

<itemtype code="adyenNotification" generate="true" autocreate="true">
<itemtype code="AdyenNotification" generate="true" autocreate="true">
<deployment table="adyenNotification" typecode="22937"/>
<attributes>
<attribute qualifier="uuid" type="java.lang.String">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +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
2 changes: 2 additions & 0 deletions adyenv6notification/extensioninfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

<webmodule jspcompile="false" webroot="/adyenv6notification"/>

<meta key="backoffice-module" value="true"/>

</extension>

</extensioninfo>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>


<config xmlns="http://www.hybris.com/cockpit/config"
xmlns:et="http://www.hybris.com/cockpitng/config/explorertree"
xmlns:as="http://www.hybris.com/cockpitng/config/advancedsearch"
xmlns:lv="http://www.hybris.com/cockpitng/component/listView"
xmlns:explorer-tree="http://www.hybris.com/cockpitng/config/explorertree">


<context component="explorer-tree">
<et:explorer-tree>
<et:type-node id="hmc_adyen_notification_item" code="NotificationItem"/>
</et:explorer-tree>
</context>

<context type="NotificationItem" component="advanced-search" merge-by="type" parent="GenericItem">
<as:advanced-search>
<as:field-list>
<as:field name="uuid"/>
<as:field name="amountValue"/>
<as:field name="amountCurrency"/>
<as:field name="eventCode"/>
<as:field name="eventDate"/>
<as:field name="merchantAccountCode"/>
<as:field name="merchantReference"/>
<as:field name="originalReference"/>
<as:field name="pspReference"/>
<as:field name="paymentMethod"/>
<as:field name="createdAt"/>
<as:field name="processedAt"/>
<as:field name="success"/>
</as:field-list>
</as:advanced-search>
</context>

<context merge-by="type" parent="GenericItem" type="NotificationItem" component="listview">
<lv:list-view>
<lv:column qualifier="uuid"/>
<lv:column qualifier="merchantReference"/>
<lv:column qualifier="pspReference"/>
<lv:column qualifier="amountValue"/>
<lv:column qualifier="amountCurrency"/>
<lv:column qualifier="paymentMethod"/>
<lv:column qualifier="eventCode"/>
<lv:column qualifier="success"/>
<lv:column qualifier="originalReference"/>
</lv:list-view>
</context>

</config>
Original file line number Diff line number Diff line change
@@ -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.<code of type>.name=XY
# type.<code of type>.<qualifier of attribute>.name=XY
# type.<code of type>.description=XY
# type.<code of type>.<qualifier of attribute>.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

4 changes: 2 additions & 2 deletions adyenv6notificationv2/extensioninfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<requires-extension name="webservicescommons"/>
<requires-extension name="adyenv6core"/>
<requires-extension name="addonsupport"/>


<coremodule generated="true" manager="com.adyen.v6.jalo.Adyenv6notificationv2Manager" packageroot="com.adyen.v6"/>


<webmodule jspcompile="false" webroot="/adyenv6notificationv2"/>


<meta key="backoffice-module" value="true"/>

</extension>


Expand Down
2 changes: 1 addition & 1 deletion adyenv6notificationv2/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
adyenv6notificationv2.webroot=/adyenv6notificationv2
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>


<config xmlns="http://www.hybris.com/cockpit/config"
xmlns:et="http://www.hybris.com/cockpitng/config/explorertree"
xmlns:as="http://www.hybris.com/cockpitng/config/advancedsearch"
xmlns:lv="http://www.hybris.com/cockpitng/component/listView"
xmlns:explorer-tree="http://www.hybris.com/cockpitng/config/explorertree">


<context component="explorer-tree">
<explorer-tree:explorer-tree>
<et:type-node id="hmc_adyen_notification" code="AdyenNotification"/>
</explorer-tree:explorer-tree>
</context>



<context type="AdyenNotification" component="advanced-search" merge-by="type" parent="GenericItem">
<as:advanced-search>
<as:field-list>
<as:field name="uuid"/>
<as:field name="amountValue"/>
<as:field name="amountCurrency"/>
<as:field name="eventCode"/>
<as:field name="eventDate"/>
<as:field name="merchantAccountCode"/>
<as:field name="merchantReference"/>
<as:field name="originalReference"/>
<as:field name="pspReference"/>
<as:field name="paymentMethod"/>
<as:field name="createdAt"/>
<as:field name="processedAt"/>
<as:field name="success"/>
</as:field-list>
</as:advanced-search>
</context>


<context merge-by="type" parent="GenericItem" type="AdyenNotification" component="listview">
<lv:list-view>
<lv:column qualifier="uuid"/>
<lv:column qualifier="merchantReference"/>
<lv:column qualifier="pspReference"/>
<lv:column qualifier="amountValue"/>
<lv:column qualifier="amountCurrency"/>
<lv:column qualifier="paymentMethod"/>
<lv:column qualifier="eventCode"/>
<lv:column qualifier="success"/>
<lv:column qualifier="originalReference"/>
</lv:list-view>
</context>


</config>
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,22 @@
# type.<code of type>.<qualifier of attribute>.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

0 comments on commit 4c36b07

Please sign in to comment.