dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] MO : Fixed bug #PNM-284. Use correctly the new controller for the validation process

Browse Source
This commit is contained in:
vSchoener
2012-06-28 15:32:09 +00:00
parent 48ed0a96ae
commit cb7a097cbd
3 changed files with 3 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cashondelivery/config.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>cashondelivery</name>
<displayName><![CDATA[Cash on delivery (COD)]]></displayName>
<displayName><![CDATA[Comptant &agrave; la livraison]]></displayName>
<version><![CDATA[0.4]]></version>
<description><![CDATA[Accept cash on delivery payments]]></description>
<description><![CDATA[Accepte le paiement lors de la livraison]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[payments_gateways]]></tab>
<is_configurable>0</is_configurable>
modules/cashondelivery/validation.php
-76
View File
@@ -1,76 +0,0 @@
<?php
/*
* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision: 14011 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
include(dirname(__FILE__).'/../../config/config.inc.php');
Tools::displayFileAsDeprecated();
include(dirname(__FILE__).'/../../header.php');
include(dirname(__FILE__).'/cashondelivery.php');
$cashOnDelivery = new CashOnDelivery();
if ($cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$cashOnDelivery->active)
Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
// Check that this payment option is still available in case the customer changed his address just before the end of the checkout process
$authorized = false;
foreach (Module::getPaymentModules() as $module)
if ($module['name'] == 'cashondelivery')
{
$authorized = true;
break;
}
if (!$authorized)
die(Tools::displayError('This payment method is not available.'));
$customer = new Customer((int)$cart->id_customer);
if (!Validate::isLoadedObject($customer))
Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
/* Validate order */
if (Tools::getValue('confirm'))
{
$customer = new Customer((int)$cart->id_customer);
$total = $cart->getOrderTotal(true, Cart::BOTH);
$cashOnDelivery->validateOrder((int)$cart->id, Configuration::get('PS_OS_PREPARATION'), $total, $cashOnDelivery->displayName, NULL, array(), NULL, false, $customer->secure_key);
$order = new Order((int)$cashOnDelivery->currentOrder);
Tools::redirectLink(__PS_BASE_URI__.'order-confirmation.php?key='.$customer->secure_key.'&id_cart='.(int)($cart->id).'&id_module='.(int)$cashOnDelivery->id.'&id_order='.(int)$cashOnDelivery->currentOrder);
}
else
{
/* or ask for confirmation */
$smarty->assign(array(
'total' => $cart->getOrderTotal(true, Cart::BOTH),
'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/cashondelivery/'
));
$smarty->assign('this_path', __PS_BASE_URI__.'modules/cashondelivery/');
$template = 'validation.tpl';
echo Module::display('cashondelivery', $template);
}
include(dirname(__FILE__).'/../../footer.php');
modules/cashondelivery/views/templates/front/validation.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
<h3>{l s='Cash on delivery (COD) payment' mod='cashondelivery'}</h3>
<form action="{$this_path_ssl}validation.php" method="post">
<form action="{$link->getModuleLink('cashondelivery', 'validation', [], true)}" method="post">
<input type="hidden" name="confirm" value="1" />
<p>
<img src="{$this_path}cashondelivery.jpg" alt="{l s='Cash on delivery (COD) payment' mod='cashondelivery'}" style="float:left; margin: 0px 10px 5px 0px;" />