-
Notifications
You must be signed in to change notification settings - Fork 27
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 #122 from Adyen/develop
Release 5.0.0
- Loading branch information
Showing
47 changed files
with
1,873 additions
and
132 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,10 @@ Required for the checkout: | |
| <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6b2ccheckoutaddon"/> | ||
| <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6backoffice"/> | ||
| ``` | ||
| Required for the notifications: | ||
| ``` | ||
| <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6notification"/> | ||
| ``` | ||
|
|
||
| Additionally, required when using yacceleratorordermanagement (b2c_acc_oms recipe): | ||
| ``` | ||
|
|
@@ -33,9 +37,9 @@ Additionally, required when using yacceleratorfulfilment (b2c_acc recipe): | |
| <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6fulfilmentprocess"/> | ||
| ``` | ||
|
|
||
| ### 3. Modify local.properties | ||
| ### 3. Modify local.properties | ||
|
|
||
| Modify config/local.properties file: | ||
| Modify config/local.properties file: | ||
| append ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ to the value of csrf.allowed.url.patterns | ||
|
|
||
| ### 4. Build | ||
|
|
@@ -56,12 +60,11 @@ Please make sure your merchant has Variant true in API and responses section so | |
|
|
||
| ### Credit Cards | ||
|
|
||
| Credit Card payments are supported using [Client Side Encryption](https://docs.adyen.com/support/payment-glossary/client-side-encryption-cse). | ||
| Credit Card payments are supported using Checkout Components. | ||
|
|
||
| ### Klarna | ||
| ### Ratepay | ||
|
|
||
| Klarna is supported via Adyen API. | ||
| Requires shopper data listed in: https://developers.klarna.com/en/se/kpm/test-credentials | ||
| Ratepay is supported via Adyen API. | ||
|
|
||
| ### Boleto | ||
|
|
||
|
|
@@ -79,7 +82,7 @@ More details can be found here: https://docs.adyen.com/developers/payment-method | |
|
|
||
| ### Other alternative payment methods | ||
|
|
||
| Supported via Adyen [Hosted Payment Pages](https://docs.adyen.com/developers/products-and-subscriptions/hosted-payment-pages). | ||
| Supported via Adyen Checkout. | ||
|
|
||
|
|
||
| ## Usage with OCC | ||
|
|
@@ -109,7 +112,7 @@ For Credit Card payments - it expects encrypted card holder data obtained from y | |
| For Stored Cards payments - selected Adyen recurringReference of the card and encrypted cvc | ||
|
|
||
| For Boleto payments - social security number | ||
|
|
||
|
|
||
| 3. OrderData authorisePayment(CartData cartData) throws Exception; | ||
|
|
||
|
|
@@ -124,13 +127,18 @@ It returns an instance of OrderWSDTO obtained from OrderData of the placed order | |
| For Boleto, it will contain the pdf url, the base64 encoded data, expiration date and due date | ||
| https://docs.adyen.com/developers/payment-methods/boleto-bancario/boleto-payment-request | ||
|
|
||
| ## 3DS2 configuration | ||
| By default 3DS2 is disabled. If you want to enable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server. | ||
| ``` | ||
| is3DS2allowed = true | ||
| ``` | ||
|
|
||
| ## Documentation | ||
| https://docs.adyen.com/developers/plugins/hybris | ||
|
|
||
| ## Support | ||
| You can create issues on our Magento Repository. In case of specific problems with your account, please contact | ||
| [email protected]. | ||
|
|
||
| ## License | ||
| MIT license. For more information, see the LICENSE file. | ||
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
72 changes: 0 additions & 72 deletions
72
.../acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenNotificationController.java
This file was deleted.
Oops, something went wrong.
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
2 changes: 1 addition & 1 deletion
2
adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
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
97 changes: 97 additions & 0 deletions
97
...celeratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
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,97 @@ | ||
| <%@ page trimDirectiveWhitespaces="true" %> | ||
| <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> | ||
| <html> | ||
| <head> | ||
|
|
||
| <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.js"></script> | ||
| <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/> | ||
|
|
||
| <script type="text/javascript"> | ||
| function initiateCheckout ( locale, loadingContext, originKey ) { | ||
| var configuration = { | ||
| locale: locale,// shopper's locale | ||
| loadingContext: loadingContext, | ||
| originKey: originKey, | ||
| risk: { | ||
| enabled: false | ||
| } | ||
| }; | ||
| this.checkout = new AdyenCheckout( configuration ); | ||
| } | ||
| function perform3DS2Operations () { | ||
| initiateCheckout( "${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" ); | ||
| var challengeToken = "${challengeToken}"; | ||
| var fingerprintToken = "${fingerprintToken}"; | ||
| if ( challengeToken ) { | ||
| initiate3DS2ChallengeShopper( challengeToken ); | ||
| } else { | ||
| if ( fingerprintToken ) { | ||
| initiate3DS2IdentifyShopper( fingerprintToken ); | ||
| } | ||
| } | ||
| } | ||
| function initiate3DS2IdentifyShopper ( fingerprintToken ) { | ||
| var threeDS2IdentifyShopperNode = document.getElementById( 'threeDS2' ); | ||
| var identifyShopperComponent = this.checkout.create( 'threeDS2DeviceFingerprint', { | ||
| fingerprintToken: fingerprintToken, | ||
| onComplete: function ( fingerprintData ) { | ||
| fingerprintResult = fingerprintData.data.details[ "threeds2.fingerprint" ]; | ||
| var fingerprintResultField = document.getElementById( 'fingerprintResult' ); | ||
| fingerprintResultField.value = fingerprintResult; | ||
| document.getElementById( "3ds2-form" ).submit(); | ||
| }, // Gets triggered whenever the ThreeDS2 component has a result | ||
| onError: function ( error ) { | ||
| //alert( "Payment Refused with error ["+ error.errorCode +"] and reason is "+ error.message ); | ||
| console.log(JSON.stringify(error)); | ||
| } // Gets triggered on error | ||
| } ); | ||
| identifyShopperComponent.mount( threeDS2IdentifyShopperNode ); | ||
| } | ||
| function initiate3DS2ChallengeShopper ( challengeToken ) { | ||
| var threeDS2ChallengeShopperNode = document.getElementById( 'threeDS2' ); | ||
| var challengeShopperComponent = this.checkout | ||
| .create( 'threeDS2Challenge', { | ||
| challengeToken: challengeToken, | ||
| onComplete: function ( challengeData ) { | ||
| challengeResult = challengeData.data.details[ "threeds2.challengeResult" ]; | ||
| var challengeResultField = document.getElementById( 'challengeResult' ); | ||
| challengeResultField.value = challengeResult; | ||
| document.getElementById( "3ds2-form" ).submit(); | ||
| }, | ||
| onError: function ( error ) { | ||
| console.log(JSON.stringify(error)); | ||
| // alert( "Payment Refused with error ["+ error.errorCode +"] and reason is "+ error.message ); | ||
| }, // Gets triggered on error | ||
| size: '05' // Defaults to '01' | ||
| } ); | ||
| challengeShopperComponent.mount( threeDS2ChallengeShopperNode ); | ||
| } | ||
| </script> | ||
|
|
||
| </head> | ||
| <body onload=perform3DS2Operations()> | ||
| <form method="post" | ||
| class="create_update_payment_form" | ||
| id="3ds2-form" | ||
| action="3ds2-adyen-response"> | ||
| <div class="row"> | ||
| <div class="col-sm-6"> | ||
| <div id="threeDS2"></div> | ||
| <input type="hidden" name="challengeToken" value="${challengeToken}"/> | ||
| <input type="hidden" name="fingerprintToken" value="${fingerprintToken}"/> | ||
| <input type="hidden" id="fingerprintResult" name="fingerprintResult"/> | ||
| <input type="hidden" id="challengeResult" name="challengeResult"/> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </body> | ||
| </html> |
Oops, something went wrong.