// MERGE with 1.4 r7770
This commit is contained in:
@@ -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"> </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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user