// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
+9 -9
View File
@@ -24,8 +24,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
if (!defined('_CAN_LOAD_FILES_'))
exit;
class Ogone extends PaymentModule
{
@@ -36,7 +34,6 @@ class Ogone extends PaymentModule
$this->name = 'ogone';
$this->tab = 'payments_gateways';
$this->version = '2.0';
$this->need_instance = 0;
parent::__construct();
@@ -142,6 +139,11 @@ class Ogone extends PaymentModule
<div class="clear">&nbsp;</div>';
}
public function getIgnoreKeyList()
{
return $this->_ignoreKeyList;
}
public function hookPayment($params)
{
global $smarty;
@@ -165,7 +167,7 @@ class Ogone extends PaymentModule
$ogoneParams['OWNERADDRESS'] = ($address->address1);
$ogoneParams['OWNERCTY'] = $country->iso_code;
$ogoneParams['OWNERTOWN'] = $address->city;
$ogoneParams['paramplus'] = 'secure_key='.$params['cart']->secure_key;
$ogoneParams['PARAMPLUS'] = 'secure_key='.$params['cart']->secure_key;
if (!empty($address->phone))
$ogoneParams['OWNERTELNO'] = $address->phone;
@@ -178,7 +180,7 @@ class Ogone extends PaymentModule
$smarty->assign('ogone_params', $ogoneParams);
$smarty->assign('OGONE_MODE', Configuration::get('OGONE_MODE'));
return $this->display(dirname(__FILE__), 'ogone.tpl');
return $this->display(__FILE__, 'ogone.tpl');
}
public function hookOrderConfirmation($params)
@@ -195,7 +197,7 @@ class Ogone extends PaymentModule
$context->smarty->assign('status', 'failed');
$context->smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $context->link->getPageLink('contact', true) : Tools::getHttpHost(true).'contact'));
return $this->display(dirname(__FILE__), 'hookorderconfirmation.tpl');
return $this->display(__FILE__, 'hookorderconfirmation.tpl');
}
public function validate($id_cart, $id_order_state, $amount, $message = '', $secure_key)
@@ -216,6 +218,4 @@ class Ogone extends PaymentModule
$pcc->add();
}
}
}
}