Skip to content

Commit

Permalink
Merge pull request #13 from Adyen/develop
Browse files Browse the repository at this point in the history 
Updates for release 17.1.0
  • Loading branch information
@rikterbeek
rikterbeek authored Feb 15, 2017
2 parents 88acd8b + bd55833 commit 5115787
Show file tree
Hide file tree
Showing 65 changed files with 749 additions and 278 deletions.
Empty file modified cartridges/bm_adyen/.tern-project
100644 → 100755
View file
Empty file.
Empty file modified cartridges/int_adyen/.tern-project
100644 → 100755
View file
Empty file.
Empty file modified cartridges/int_adyen/cartridge/js/adyen-cse.js
100644 → 100755
View file
Empty file.
17 changes: 15 additions & 2 deletions cartridges/int_adyen/cartridge/scripts/adyen3DVerification.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ importScript('libs/libAdyen.ds');
//script include
var AdyenHelper = require ("int_adyen/cartridge/scripts/util/AdyenHelper");

function execute( args : PipelineDictionary ) : Number
{
var result = verify(args);
if (result == PIPELET_ERROR){
return PIPELET_ERROR;
}
return PIPELET_NEXT;
}

function execute( args : PipelineDictionary ) : Number {
function verify( args : PipelineDictionary ) : Number {

var VERSION : String = "4";
var MERCHANTACCOUNT : String = Site.getCurrent().getCustomPreferenceValue("Adyen_merchantCode");
Expand Down Expand Up @@ -140,5 +148,10 @@ function execute( args : PipelineDictionary ) : Number {
return PIPELET_ERROR;
}

return PIPELET_NEXT;
return args;
}

module.exports = {
'execute': execute,
'verify': verify
}
32 changes: 21 additions & 11 deletions cartridges/int_adyen/cartridge/scripts/adyenCancel.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,19 @@ var AdyenHelper = require ("int_adyen/cartridge/scripts/util/AdyenHelper");

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var order : Order = args.Order;
var decision = cancel(args.Order);

if (decision == PIPELET_ERROR){
args.Decision = "ERROR";
return PIPELET_ERROR;
}

args.Decision = decision;
return PIPELET_NEXT;
}

function cancel( order : Order ) : Number
{
// Check the input parameters
if (order == null) {
Logger.getLogger("Adyen").fatal("Cancellation of order payment has failed. No order was provided.");
Expand All @@ -28,6 +38,7 @@ function execute( args : PipelineDictionary ) : Number

// Get orderNo which is needed for some functions (error handling)
var orderNo : String = order.getOrderNo();
var decision = "ERROR";

// Error handling configuration
var fatalErrMsgPrefix : String = "Cancellation of payment for order #" + orderNo + " has failed. ";
Expand Down Expand Up @@ -84,7 +95,7 @@ function execute( args : PipelineDictionary ) : Number
if (!empty(result)) {
if (result.indexOf("cancel-received") != -1) {
// Define the result of script execution
args.Decision = "SUCCESS";
decision = "SUCCESS";

// Update the order
order.custom.Adyen_eventCode = "CANCELLATION";
Expand All @@ -99,7 +110,7 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Cancellation");
} else {
// Define the result of script execution
args.Decision = "REFUSED";
decision = "REFUSED";

// Update the order
order.custom.Adyen_eventCode = "CANCELLATION REFUSED";
Expand All @@ -108,22 +119,21 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Cancellation Refused");
}
} else {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "The call to Adyen API did not return any result.");
return PIPELET_ERROR;
}
}
catch (e) {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "An error occurred during the call to Adyen API.");
return PIPELET_ERROR;
}

return PIPELET_NEXT;
return decision;
}

module.exports = {
'execute': execute,
'cancel': cancel
}
32 changes: 21 additions & 11 deletions cartridges/int_adyen/cartridge/scripts/adyenCancelOrRefund.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,19 @@ var AdyenHelper = require ("int_adyen/cartridge/scripts/util/AdyenHelper");

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var order : Order = args.Order;
var decision = cancelOrRefund(args.Order);

if (decision == PIPELET_ERROR){
args.Decision = "ERROR";
return PIPELET_ERROR;
}

args.Decision = decision;
return PIPELET_NEXT;
}

function cancelOrRefund( order : Order ) : Number
{
// Check the input parameters
if (order == null) {
Logger.getLogger("Adyen").fatal("Cancellation or refund of order payment has failed. No order was provided.");
Expand All @@ -28,6 +38,7 @@ function execute( args : PipelineDictionary ) : Number

// Get orderNo which is needed for some functions (error handling)
var orderNo : String = order.getOrderNo();
var decision = "ERROR";

// Error handling configuration
var fatalErrMsgPrefix : String = "Cancellation or refund of payment for order #" + orderNo + " has failed. ";
Expand Down Expand Up @@ -85,7 +96,7 @@ function execute( args : PipelineDictionary ) : Number
if (!empty(result)) {
if (result.indexOf("cancelOrRefund-received") != -1) {
// Define the result of script execution
args.Decision = "SUCCESS";
decision = "SUCCESS";

// Update the order
order.custom.Adyen_eventCode = "CANCELLATION OR REFUND";
Expand All @@ -100,7 +111,7 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Cancellation Or Refund");
} else {
// Define the result of script execution
args.Decision = "REFUSED";
decision = "REFUSED";

// Update the order
order.custom.Adyen_eventCode = "CANCELLATION OR REFUND REFUSED";
Expand All @@ -109,22 +120,21 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Cancellation Or Refund Refused");
}
} else {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "The call to Adyen API did not return any result.");
return PIPELET_ERROR;
}
}
catch (e) {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "An error occurred during the call to Adyen API.");
return PIPELET_ERROR;
}

return PIPELET_NEXT;
return decision;
}

module.exports = {
'execute': execute,
'cancelOrRefund': cancelOrRefund
}
32 changes: 21 additions & 11 deletions cartridges/int_adyen/cartridge/scripts/adyenCapture.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,19 @@ var AdyenHelper = require ("int_adyen/cartridge/scripts/util/AdyenHelper");

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var order : Order = args.Order;
var decision = capture(args.Order);

if (decision == PIPELET_ERROR){
args.Decision = "ERROR";
return PIPELET_ERROR;
}

args.Decision = decision;
return PIPELET_NEXT;
}

function capture( order : Order ) : Number
{
// Check the input parameters
if (order == null) {
Logger.getLogger("Adyen").fatal("Capturing of order payment has failed. No order was provided.");
Expand All @@ -28,6 +38,7 @@ function execute( args : PipelineDictionary ) : Number

// Get orderNo which is needed for the API call and some other functions (error handling)
var orderNo : String = order.getOrderNo();
var decision = "ERROR";

// Error handling configuration
var fatalErrMsgPrefix : String = "Payment capturing of order #" + orderNo + " has failed. ";
Expand Down Expand Up @@ -95,7 +106,7 @@ function execute( args : PipelineDictionary ) : Number
if (!empty(result)) {
if (result.indexOf("capture-received") != -1) {
// Define the result of script execution
args.Decision = "SUCCESS";
decision = "SUCCESS";

// Update the order
order.custom.Adyen_eventCode = "CAPTURING";
Expand All @@ -110,7 +121,7 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Capturing");
} else {
// Define the result of script execution
args.Decision = "REFUSED";
decision = "REFUSED";

// Update the order
order.custom.Adyen_eventCode = "CAPTURING REFUSED";
Expand All @@ -119,22 +130,21 @@ function execute( args : PipelineDictionary ) : Number
Logger.getLogger("Adyen").info("Payment modification result for order #" + orderNo + ": Capturing Refused");
}
} else {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "The call to Adyen API did not return any result.");
return PIPELET_ERROR;
}
}
catch (e) {
// Define the result of script execution
args.Decision = "ERROR";

// Log the error and exit
Logger.getLogger("Adyen").fatal(fatalErrMsgPrefix + "An error occurred during the call to Adyen API.");
return PIPELET_ERROR;
}

return PIPELET_NEXT;
return decision;
}

module.exports = {
'execute': execute,
'capture': capture
}
22 changes: 17 additions & 5 deletions cartridges/int_adyen/cartridge/scripts/adyenCreditVerification.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* @input PaymentInstrument : dw.order.PaymentInstrument
* @input CurrentSession : dw.system.Session
* @input CurrentRequest : dw.system.Request
* @input CreditCardForm : dw.web.Form
*
* @output Decision : String
* @output PaymentStatus : String
Expand All @@ -34,7 +35,16 @@ importScript('libs/libAdyen.ds');
//script include
var AdyenHelper = require ("int_adyen/cartridge/scripts/util/AdyenHelper");

function execute( args : PipelineDictionary ) : Number {
function execute( args : PipelineDictionary ) : Number
{
var result = verify(args);
if (result == PIPELET_ERROR){
return PIPELET_ERROR;
}
return PIPELET_NEXT;
}

function verify( args : PipelineDictionary ) : Number {

var VERSION : String = "4";
var MERCHANTACCOUNT : String = Site.getCurrent().getCustomPreferenceValue("Adyen_merchantCode");
Expand All @@ -57,9 +67,7 @@ function execute( args : PipelineDictionary ) : Number {
var orderNo = order.currentOrderNo;
var a = Math.floor(Math.random()*10000);
var c : Object = args.PaymentInstrument;

var f : Object = args.CurrentForms;
var card : Object = f.billing.paymentMethods.creditCard;
var card : Object = args.CreditCardForm.object;
var cardnr : String = card.number.value;
var cardcvc : String = card.cvn.value;

Expand Down Expand Up @@ -223,6 +231,10 @@ function execute( args : PipelineDictionary ) : Number {
return PIPELET_ERROR;
}

return PIPELET_NEXT;
return args;
}

module.exports = {
'execute': execute,
'verify': verify
}
14 changes: 9 additions & 5 deletions cartridges/int_adyen/cartridge/scripts/adyenHppCancelledPayment.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ importPackage( dw.util );

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var hpm : Object = args.CurrentHttpParameterMap;
var order : Order = args.Order;
return handle(args.CurrentHttpParameterMap, args.Order);
}

function handle (hpm : Object, order : Order) : Number {
// Log detailed response to ScriptLog and log file
var msg : String = createLogMessage(hpm);
Logger.getLogger("Adyen").debug(msg);
Expand Down Expand Up @@ -66,7 +66,6 @@ function execute( args : PipelineDictionary ) : Number

return PIPELET_NEXT;
}

function createLogMessage(hpm) {
var VERSION : String= "4d";
var msg = "";
Expand All @@ -85,3 +84,8 @@ function createLogMessage(hpm) {
}
return msg;
}

module.exports = {
'execute': execute,
'handle': handle
}
13 changes: 9 additions & 4 deletions cartridges/int_adyen/cartridge/scripts/adyenHppPendingPayment.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ importPackage( dw.util );

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var hpm : Object = args.CurrentHttpParameterMap;
var order : Order = args.Order;
return handle(args.CurrentHttpParameterMap, args.Order);
}

function handle (hpm : Object, order : Order) : Number {
// Log detailed response to ScriptLog and log file
var msg : String = createLogMessage(hpm);
Logger.getLogger("Adyen").debug(msg);
Expand Down Expand Up @@ -85,3 +85,8 @@ function createLogMessage(hpm) {
}
return msg;
}

module.exports = {
'execute': execute,
'handle': handle
}
14 changes: 10 additions & 4 deletions cartridges/int_adyen/cartridge/scripts/adyenHppRefusedPayment.ds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ importPackage( dw.util );

function execute( args : PipelineDictionary ) : Number
{
// Get the input parameters
var hpm : Object = args.CurrentHttpParameterMap;
var order : Order = args.Order;
return handle(args.CurrentHttpParameterMap, args.Order);
}

function handle (hpm : Object, order : Order) : Number {
// Log detailed response to ScriptLog and log file
var msg : String = createLogMessage(hpm);
Logger.getLogger("Adyen").debug(msg);
Expand Down Expand Up @@ -75,3 +75,9 @@ function createLogMessage(hpm) {
msg = msg + "\npaymentMethod : " + hpm.paymentMethod.stringValue;
return msg;
}


module.exports = {
'execute': execute,
'handle': handle
}
Empty file modified cartridges/int_adyen/cartridge/scripts/adyenRedirectVerificationSHA1.ds
100644 → 100755
View file
Empty file.
Loading

0 comments on commit 5115787

Please sign in to comment.