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

[+] Dispatcher

Browse Source
This commit is contained in:
fBrignoli
2011-06-15 16:32:06 +00:00
parent 5f0fb35a1d
commit 1bb4a61a42
140 changed files with 936 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cheque/payment.php
+1 -1
View File
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../header.php');
include(dirname(__FILE__).'/cheque.php');
if (!$cookie->isLogged(true))
Tools::redirect('authentication.php?back=order.php');
Tools::redirect('index.php/authentication?back=order.php');
$cheque = new Cheque();
echo $cheque->execPayment($cart);
modules/cheque/payment.tpl
+2 -2
View File
@@ -25,8 +25,8 @@
*}
<p class="payment_module">
<a href="{$this_path_ssl}payment.php" title="{l s='Pay by cheque' mod='cheque'}">
<a href="{$this_path_ssl}payment" title="{l s='Pay by cheque' mod='cheque'}">
<img src="{$this_path}cheque.jpg" alt="{l s='Pay by cheque' mod='cheque'}" width="86" height="49" />
{l s='Pay by cheque (order process will be longer)' mod='cheque'}
</a>
</p>
</p>
modules/cheque/payment_execution.tpl
+1 -1
View File
@@ -73,7 +73,7 @@
<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='cheque'}.</b>
</p>
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cheque'}</a>
<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cheque'}</a>
<input type="submit" name="submit" value="{l s='I confirm my order' mod='cheque'}" class="exclusive_large" />
</p>
</form>
modules/cheque/payment_return.tpl
+2 -2
View File
@@ -33,11 +33,11 @@
<br /><br />- {l s='mail to' mod='cheque'} <span class="bold">{if $chequeAddress}{$chequeAddress}{else}___________{/if}</span>
<br /><br />{l s='An e-mail has been sent to you with this information.' mod='cheque'}
<br /><br /><span class="bold">{l s='Your order will be sent as soon as we receive your payment.' mod='cheque'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cheque'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cheque'}</a>.
</p>
{else}
<p class="warning">
{l s='We noticed a problem with your order. If you think this is an error, you can contact our' mod='cheque'}
<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cheque'}</a>.
<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cheque'}</a>.
</p>
{/if}
modules/cheque/validation.php
+4 -4
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -32,12 +32,12 @@ include(dirname(__FILE__).'/cheque.php');
$cheque = new Cheque();
if ($cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$cheque->active)
Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
Tools::redirectLink(__PS_BASE_URI__.'index.php/order?step=1');
$customer = new Customer((int)$cart->id_customer);
if (!Validate::isLoadedObject($customer))
Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
Tools::redirectLink(__PS_BASE_URI__.'index.php/order?step=1');
$currency = new Currency((int)(isset($_POST['currency_payement']) ? $_POST['currency_payement'] : $cookie->id_currency));
$total = (float)($cart->getOrderTotal(true, Cart::BOTH));
@@ -49,5 +49,5 @@ $mailVars = array(
$cheque->validateOrder((int)($cart->id), _PS_OS_CHEQUE_, $total, $cheque->displayName, NULL, $mailVars, (int)($currency->id), false, $customer->secure_key);
Tools::redirectLink(__PS_BASE_URI__.'order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($cheque->id).'&id_order='.$cheque->currentOrder.'&key='.$customer->secure_key);
Tools::redirectLink(__PS_BASE_URI__.'index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($cheque->id).'&id_order='.$cheque->currentOrder.'&key='.$customer->secure_key);