From 82ab5d0f0e9b7dbbcc89958759b356c4e7acc249 Mon Sep 17 00:00:00 2001 From: Jay Patel Date: Wed, 11 Feb 2015 10:11:10 +0530 Subject: [PATCH] [FIX] payment_adyen: update keys used to generate the merchant signature + correctly raise errors in validation. --- addons/payment_adyen/models/adyen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/payment_adyen/models/adyen.py b/addons/payment_adyen/models/adyen.py index ab210fed890..672faed9d63 100644 --- a/addons/payment_adyen/models/adyen.py +++ b/addons/payment_adyen/models/adyen.py @@ -59,7 +59,7 @@ class AcquirerAdyen(osv.Model): if inout == 'in': keys = "paymentAmount currencyCode shipBeforeDate merchantReference skinCode merchantAccount sessionValidity shopperEmail shopperReference recurringContract allowedMethods blockedMethods shopperStatement merchantReturnData billingAddressType deliveryAddressType offset".split() else: - keys = "authResult pspReference merchantReference skinCode paymentMethod shopperLocale merchantReturnData".split() + keys = "authResult pspReference merchantReference skinCode merchantReturnData".split() def get_value(key): if values.get(key): @@ -135,7 +135,7 @@ class TxAdyen(osv.Model): if shasign_check != data.get('merchantSig'): error_msg = 'Adyen: invalid merchantSig, received %s, computed %s' % (data.get('merchantSig'), shasign_check) _logger.warning(error_msg) - # raise ValidationError(error_msg) + raise ValidationError(error_msg) return tx