// Merge -> 10309

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
+6 -7
View File
@@ -1,5 +1,5 @@
<?php
include(dirname(__FILE__). '/../../config/config.inc.php');
include(dirname(__FILE__).'/dibs.php');
@@ -19,7 +19,7 @@ if (count($_POST))
$secure_cart = explode('_', $posted_values['uniqueoid']);
$arr_order_id = explode('_',$posted_values['orderid']);
$posted_values['orderid'] = $arr_order_id[0];
if ((string)$posted_values['merchant'] !== (string)dibs::$ID_MERCHANT)
$errors[] = Tools::displayError('You did not use the correct merchant ID.');
@@ -42,11 +42,10 @@ if (count($_POST))
$message = nl2br(strip_tags($message));
if ($valid_order === true)
{
$obj_dibs->setTransactionDetail($posted_values);
$obj_dibs->validateOrder((int)$posted_values['orderid'], Configuration::get('PS_OS_PAYMENT'),
$obj_dibs->setTransactionDetail($posted_values);
$obj_dibs->validateOrder((int)$posted_values['orderid'], Configuration::get('PS_OS_PAYMENT'),
(float)((int)$posted_values['amount'] / 100), $obj_dibs->displayName, $message, array(), NULL, false, $secure_cart[2]);
}
else if ($valid_order === false)
$obj_dibs->validateOrder((int)$posted_values['orderid'], Configuration::get('PS_OS_ERROR'), 0, $obj_dibs->displayName,
$message, array(), NULL, false, $secure_cart[2]);
}
$obj_dibs->validateOrder((int)$posted_values['orderid'], Configuration::get('PS_OS_ERROR'), 0, $obj_dibs->displayName, $message, array(), NULL, false, $secure_cart[2]);
}