Commit a66742dc authored by sluc23's avatar sluc23
Browse files

Merge branch 'master' into 'dev-clean-log'

# Conflicts:
#   CRM/Core/Payment/Redsys.php
parents ee09c3ab dfb5abba
......@@ -246,7 +246,7 @@ class CRM_Core_Payment_Redsys extends CRM_Core_Payment {
$miObj->setParameter("Ds_Merchant_PayMethods", 'z');
}
if (!empty($params["is_token"])) {
$miObj->setParameter("DS_MERCHANT_IDENTIFIER", 'REQUIRED');
$miObj->setParameter("Ds_Merchant_Identifier", 'REQUIRED');
}
$version = "HMAC_SHA256_V1";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment