Merge branch 'ticket-13508-HMAC' into develop

This commit is contained in:
Marion Muszynski 2017-07-05 11:25:04 +02:00
commit e01ae068ca

View File

@ -265,7 +265,7 @@ class Paybox extends PaymentModule
$pbx_cmd = $cart->id;
$pbx_total = (int)sprintf('%f', number_format(Tools::convertPrice($cart->getOrderTotal(), null, false), 2, '.', '') * 100);
$pbx_devise = 978; // euro
$pbx_ipn = $ps_url.'modules/'.$module->name.'/validation.php';
$pbx_ipn = $ps_url.'modules/'.$this->name.'/validation.php';
$pbx_porteur = $customer->email;
$pbx_refabonne = $customer->email;
$pbx_retour = 'm:M;r:R;t:T;a:A;b:B;p:P;c:C;s:S;y:Y;e:E;n:N;j:J;d:D;i:I;k:K';
@ -311,10 +311,10 @@ class Paybox extends PaymentModule
}
if (version_compare(_PS_VERSION_, '1.5', '>')){
$pbx_confurl = $ps_url.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$module->id.'&key='.$customer->secure_key;
$pbx_confurl = $ps_url.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->id.'&key='.$customer->secure_key;
$pbx_cancelurl = $ps_url.'index.php?controller=order&step=3';
} else {
$pbx_confurl = $ps_url.'order-confirmation.php?id_cart='.$cart->id.'&id_module='.$module->id.'&key='.$customer->secure_key;
$pbx_confurl = $ps_url.'order-confirmation.php?id_cart='.$cart->id.'&id_module='.$this->id.'&key='.$customer->secure_key;
$pbx_cancelurl = $ps_url.'order.php?step=3';
}