-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #171 from Adyen/develop
Release 6.4.0
- Loading branch information
Showing
10 changed files
with
192 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
adyenv6ordermanagement/resources/adyenv6ordermanagement/process/email-process-spring.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| [y] hybris Platform | ||
| Copyright (c) 2018 SAP SE or an SAP affiliate company. | ||
| All rights reserved. | ||
| This software is the confidential and proprietary information of SAP | ||
| ("Confidential Information"). You shall not disclose such Confidential | ||
| Information and shall use it only in accordance with the terms of the | ||
| license agreement you entered into with SAP. | ||
| --> | ||
|
|
||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:context="http://www.springframework.org/schema/context" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
| http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://www.springframework.org/schema/context | ||
| http://www.springframework.org/schema/context/spring-context.xsd"> | ||
|
|
||
| <context:annotation-config/> | ||
|
|
||
| <bean id="generateOrderConfirmationEmail" parent="abstractGenerateEmailAction"> | ||
| <property name="frontendTemplateName" value="OrderConfirmationEmailTemplate"/> | ||
| </bean> | ||
| </beans> |
149 changes: 149 additions & 0 deletions
149
adyenv6ordermanagement/resources/adyenv6ordermanagement/process/order-process.1905.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ ###### | ||
| ~ ###### | ||
| ~ ############ ####( ###### #####. ###### ############ ############ | ||
| ~ ############# #####( ###### #####. ###### ############# ############# | ||
| ~ ###### #####( ###### #####. ###### ##### ###### ##### ###### | ||
| ~ ###### ###### #####( ###### #####. ###### ##### ##### ##### ###### | ||
| ~ ###### ###### #####( ###### #####. ###### ##### ##### ###### | ||
| ~ ############# ############# ############# ############# ##### ###### | ||
| ~ ############ ############ ############# ############ ##### ###### | ||
| ~ ###### | ||
| ~ ############# | ||
| ~ ############ | ||
| ~ | ||
| ~ Adyen Hybris Extension | ||
| ~ | ||
| ~ Copyright (c) 2017 Adyen B.V. | ||
| ~ This file is open source and available under the MIT license. | ||
| ~ See the LICENSE file for more info. | ||
| --> | ||
| <process xmlns="http://www.hybris.de/xsd/processdefinition" start="checkOrder" | ||
| name="order-process" processClass="de.hybris.platform.orderprocessing.model.OrderProcessModel"> | ||
|
|
||
| <!-- Check Order --> | ||
| <action id="checkOrder" bean="checkOrderAction"> | ||
| <transition name="OK" to="adyenCheckAuthorization"/> | ||
| <transition name="NOK" to="error"/> | ||
| </action> | ||
|
|
||
| <!-- Wait for HPP/3Ds authorization --> | ||
| <action id="adyenCheckAuthorization" bean="adyenCheckAuthorizationAction"> | ||
| <transition name="OK" to="fraudCheck"/> | ||
| <transition name="NOK" to="error"/> | ||
| <transition name="WAIT" to="waitForAdyenAuthorization"/> | ||
| </action> | ||
|
|
||
| <!--Check authorization completion--> | ||
| <wait id="waitForAdyenAuthorization" then="adyenCheckAuthorization" prependProcessCode="true"> | ||
| <event>AdyenAuthorized</event> | ||
| </wait> | ||
|
|
||
| <!-- Fraud Check --> | ||
| <action id="fraudCheck" bean="fraudCheckOrderInternalAction"> | ||
| <transition name="OK" to="sendOrderPlacedNotification"/> | ||
| <transition name="POTENTIAL" to="manualOrderCheckCSA"/> | ||
| <transition name="FRAUD" to="cancelOrder"/> | ||
| </action> | ||
|
|
||
| <!-- Fraud Check : OK --> | ||
| <action id="sendOrderPlacedNotification" bean="sendOrderPlacedNotificationAction"> | ||
| <transition name="OK" to="geocodeShippingAddress"/> | ||
| </action> | ||
|
|
||
| <!-- Fraud Check : FRAUD --> | ||
| <action id="cancelOrder" bean="cancelOrderAction"> | ||
| <transition name="OK" to="notifyCustomer"/> | ||
| </action> | ||
|
|
||
| <action id="notifyCustomer" bean="notifyCustomerAboutFraudAction"> | ||
| <transition name="OK" to="failed"/> | ||
| </action> | ||
|
|
||
| <!-- Fraud Check : POTENTIAL --> | ||
| <action id="manualOrderCheckCSA" bean="prepareOrderForManualCheckAction"> | ||
| <transition name="OK" to="waitForManualOrderCheckCSA"/> | ||
| </action> | ||
|
|
||
| <wait id="waitForManualOrderCheckCSA" then="orderManualChecked" prependProcessCode="true"> | ||
| <event>CSAOrderVerified</event> | ||
| </wait> | ||
|
|
||
| <action id="orderManualChecked" bean="orderManualCheckedAction"> | ||
| <transition name="OK" to="sendOrderPlacedNotification"/> | ||
| <transition name="NOK" to="cancelOrder"/> | ||
| <transition name="CANCELLED" to="success"/> | ||
| </action> | ||
|
|
||
| <!-- Sourcing and Allocation --> | ||
| <action id="geocodeShippingAddress" bean="geocodeShippingAddressAction"> | ||
| <transition name="OK" to="sourceOrder"/> | ||
| </action> | ||
|
|
||
| <action id="sourceOrder" bean="sourceOrderAction"> | ||
| <transition name="OK" to="waitForOrderAction"/> | ||
| </action> | ||
|
|
||
| <!-- Wait to perform action on Order --> | ||
| <wait id="waitForOrderAction" prependProcessCode="true" then="failed"> | ||
| <case event="OrderActionEvent"> | ||
| <choice id="consignmentProcessEnded" then="verifyOrderCompletion"/> | ||
| <choice id="cancelOrder" then="processOrderCancellation"/> | ||
| <choice id="cancelled" then="success"/> | ||
| <choice id="reSource" then="sourceOrder"/> | ||
| </case> | ||
| </wait> | ||
|
|
||
| <!-- Wait for order cancellation to be completed --> | ||
| <action id="processOrderCancellation" bean="processOrderCancellationAction"> | ||
| <transition name="OK" to="adyenCancelOrRefund"/> | ||
| <transition name="WAIT" to="waitForOrderAction"/> | ||
| <transition name="SOURCING" to="sourceOrder"/> | ||
| </action> | ||
|
|
||
| <action id="adyenCancelOrRefund" bean="adyenCancelOrRefundAction"> | ||
| <transition name="OK" to="verifyOrderCompletion"/> | ||
| </action> | ||
|
|
||
| <action id="verifyOrderCompletion" bean="verifyOrderCompletionAction"> | ||
| <transition name="OK" to="postTaxes"/> | ||
| <transition name="WAIT" to="waitForOrderAction"/> | ||
| <transition name="CANCELLED" to="success"/> | ||
| </action> | ||
|
|
||
| <!-- Tax and Payment --> | ||
| <action id="postTaxes" bean="postTaxesAction"> | ||
| <transition name="OK" to="takePayment"/> | ||
| </action> | ||
|
|
||
| <action id="takePayment" bean="takePaymentAction"> | ||
| <transition name="OK" to="adyenCheckCapture"/> | ||
| <transition name="NOK" to="sendPaymentFailedNotification"/> | ||
| </action> | ||
|
|
||
| <!--Check if the payment is already captured--> | ||
| <action id="adyenCheckCapture" bean="adyenCheckCaptureAction"> | ||
| <transition name="OK" to="completeOrder"/> | ||
| <transition name="NOK" to="sendPaymentFailedNotification"/> | ||
| <transition name="WAIT" to="waitForAdyenCapture"/> | ||
| </action> | ||
|
|
||
| <!--Check Capture completion--> | ||
| <wait id="waitForAdyenCapture" then="adyenCheckCapture" prependProcessCode="true"> | ||
| <event>AdyenCaptured</event> | ||
| </wait> | ||
|
|
||
| <action id="completeOrder" bean="completeOrderAction"> | ||
| <transition name="OK" to="success"/> | ||
| </action> | ||
|
|
||
| <action id="sendPaymentFailedNotification" bean="sendPaymentFailedNotificationAction"> | ||
| <transition name="OK" to="failed"/> | ||
| </action> | ||
|
|
||
| <end id="error" state="ERROR">Order process error.</end> | ||
| <end id="failed" state="FAILED">Order process failed.</end> | ||
| <end id="success" state="SUCCEEDED">Order process completed.</end> | ||
|
|
||
| </process> |