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/authorizeaim/validation.php
+2 -2
View File
@@ -60,7 +60,7 @@ if (!isset($response[7]) OR !isset($response[3]) OR !isset($response[9]))
}
if ($response[0] == 3)
Tools::redirect('order.php?step=3&aimerror=1');
Tools::redirect('index.php/order?step=3&aimerror=1');
else
{
/* Does the cart exist and is valid? */
@@ -82,6 +82,6 @@ else
else
$authorizeaim->validateOrder((int)$cart->id, _PS_OS_ERROR_, (float)$response[9], $authorizeaim->displayName, $message);
Tools::redirect('order-confirmation.php?id_module='.(int)$authorizeaim->id.'&id_cart='.(int)$cart->id.'&key='.$customer->secure_key);
Tools::redirect('index.php/order-confirmation?id_module='.(int)$authorizeaim->id.'&id_cart='.(int)$cart->id.'&key='.$customer->secure_key);
}
modules/bankwire/payment.php
+1 -1
View File
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../header.php');
include(dirname(__FILE__).'/bankwire.php');
if (!$cookie->isLogged(true))
Tools::redirect('authentication.php?back=order.php');
Tools::redirect('index.php/authentication?back=order.php');
$bankwire = new BankWire();
echo $bankwire->execPayment($cart);
modules/bankwire/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='bankwire'}.</b>
</p>
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='bankwire'}</a>
<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='bankwire'}</a>
<input type="submit" name="submit" value="{l s='I confirm my order' mod='bankwire'}" class="exclusive_large" />
</p>
</form>
modules/bankwire/payment_return.tpl
+2 -2
View File
@@ -35,11 +35,11 @@
<br /><br />- {l s='Do not forget to insert your order #' mod='bankwire'} <span class="bold">{$id_order}</span> {l s='in the subject of your bank wire' mod='bankwire'}
<br /><br />{l s='An e-mail has been sent to you with this information.' mod='bankwire'}
<br /><br /><span class="bold">{l s='Your order will be sent as soon as we receive your settlement.' mod='bankwire'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='bankwire'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='bankwire'}</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='bankwire'}
<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='bankwire'}</a>.
<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='bankwire'}</a>.
</p>
{/if}
modules/blockbestsellers/blockbestsellers.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
<!-- MODULE Block best sellers -->
<div id="best-sellers_block_right" class="block products_block">
<h4><a href="{$link->getPageLink('best-sales.php')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
<h4><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
<div class="block_content">
{if $best_sellers|@count > 0}
<ul class="product_images">
@@ -38,7 +38,7 @@
<dt class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$product.link}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}</a></dt>
{/foreach}
</dl>
<p><a href="{$link->getPageLink('best-sales.php')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
<p><a href="{$link->getPageLink('best-sales')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
{else}
<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
{/if}
modules/blockcart/ajax-cart.js
+9 -9
View File
@@ -119,11 +119,11 @@ var ajaxCart = {
//send the ajax request to the server
$.ajax({
type: 'GET',
url: baseDir + 'cart.php',
url: baseDir + 'index.php',
async: true,
cache: false,
dataType : "json",
data: 'ajax=true&token=' + static_token,
data: 'controller=cart&ajax=true&token=' + static_token,
success: function(jsonData)
{
ajaxCart.updateCart(jsonData);
@@ -180,11 +180,11 @@ var ajaxCart = {
//send the ajax request to the server
$.ajax({
type: 'POST',
url: baseDir + 'cart.php',
url: baseDir + 'index.php',
async: true,
cache: false,
dataType : "json",
data: 'add=1&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&token=' + static_token + ( (parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination): ''),
data: 'controller=cart&add=1&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&token=' + static_token + ( (parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination): ''),
success: function(jsonData,textStatus,jqXHR)
{
// add appliance to whishlist module
@@ -230,11 +230,11 @@ var ajaxCart = {
//send the ajax request to the server
$.ajax({
type: 'POST',
url: baseDir + 'cart.php',
url: baseDir + 'index.php',
async: true,
cache: false,
dataType : "json",
data: 'delete=1&id_product=' + idProduct + '&ipa=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&token=' + static_token + '&ajax=true',
data: 'controller=cart&delete=1&id_product=' + idProduct + '&ipa=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&token=' + static_token + '&ajax=true',
success: function(jsonData) {
ajaxCart.updateCart(jsonData);
if ($('body').attr('id') == 'order' || $('body').attr('id') == 'order-opc')
@@ -327,7 +327,7 @@ var ajaxCart = {
}
var removeLinks = $('#cart_block_product_' + domIdProduct).find('a.ajax_cart_block_remove_link');
if (!product.hasCustomizedDatas && !removeLinks.length)
$('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseDir + 'cart.php?delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '" title="' + removingLinkText + '"> </a>');
$('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '" title="' + removingLinkText + '"> </a>');
},
doesCustomizationStillExist : function (product, customizationId)
@@ -416,7 +416,7 @@ var ajaxCart = {
content += '<span class="quantity-formated"><span class="quantity">' + this.quantity + '</span>x</span>';
var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name);
content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>';
content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'cart.php?delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
content += '<span class="price">' + this.priceByLine + '</span>';
content += '</dt>';
if (this.hasAttributes)
@@ -483,7 +483,7 @@ var ajaxCart = {
// If the customization is already displayed on the cart, no update's needed
if($('#cart_block').find("div[id^=deleteCustomizableProduct_" + customizationId + "_]").length)
return ('');
content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ? productAttributeId : '0') + '"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'cart.php?delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';
content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ? productAttributeId : '0') + '"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';
// Give to the customized product the first textfield value as name
$(this.datas).each(function(){
modules/blockcart/blockcart-json.tpl
+1 -1
View File
@@ -86,7 +86,7 @@
"name": "{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|addslashes}",
"description": "{$discount.description|addslashes}",
"nameDescription": "{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'}",
"link": "{$link->getPageLink('order.php', true)}?deleteDiscount={$discount.id_discount}",
"link": "{$link->getPageLink('order', true)}?deleteDiscount={$discount.id_discount}",
"price": "-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_tax_exc}{else}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_real}{/if}{/if}"
{rdelim}
{if !$smarty.foreach.discounts.last},{/if}
modules/blockcart/blockcart.tpl
+6 -6
View File
@@ -38,7 +38,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
<!-- MODULE Block cart -->
<div id="cart_block" class="block exclusive">
<h4>
<a href="{$link->getPageLink("$order_process.php", true)}">{l s='Cart' mod='blockcart'}</a>
<a href="{$link->getPageLink("$order_process", true)}">{l s='Cart' mod='blockcart'}</a>
{if $ajax_allowed}
<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="hidden"{/if}>&nbsp;</span>
<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="hidden"{/if}>&nbsp;</span>
@@ -63,7 +63,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
<dt id="cart_block_product_{$product.id_product}{if $product.id_product_attribute}_{$product.id_product_attribute}{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
<span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span>
<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)}" title="{$product.name|escape:html:'UTF-8'}">{t text=$product.name length='10' encode='true'}</a>
<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
<span class="price">{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}</span>
</dt>
{if isset($product.attributes_small)}
@@ -77,7 +77,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
<ul class="cart_block_customizations" id="customization_{$productId}_{$productAttributeId}">
{foreach from=$customizedDatas.$productId.$productAttributeId key='id_customization' item='customization' name='customizations'}
<li name="customization">
<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}"> </a></div>
<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart')}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}"> </a></div>
<span class="quantity-formated"><span class="quantity">{$customization.quantity}</span>x</span>{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)}{t text=$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|replace:"<br />":" " length='28' encode='true'}
{else}
{l s='Customization #' mod='blockcart'}{$id_customization|intval}{l s=':' mod='blockcart'}
@@ -101,7 +101,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
<td class="price">-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}{/if}</td>
<td class="delete"><a href="{$link->getPageLink("$order_process.php", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
<td class="delete"><a href="{$link->getPageLink("$order_process", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
</tr>
{/foreach}
</tbody>
@@ -139,8 +139,8 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
{/if}
{/if}
<p id="cart-buttons">
{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process.php", true)}" class="button_small" title="{l s='Cart' mod='blockcart'}">{l s='Cart' mod='blockcart'}</a>{/if}
<a href="{$link->getPageLink("$order_process.php", true)}{if $order_process == 'order'}?step=1{/if}" id="button_order_cart" class="exclusive{if $order_process == 'order-opc'}_large{/if}" title="{l s='Check out' mod='blockcart'}">{l s='Check out' mod='blockcart'}</a>
{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process", true)}" class="button_small" title="{l s='Cart' mod='blockcart'}">{l s='Cart' mod='blockcart'}</a>{/if}
<a href="{$link->getPageLink("$order_process", true)}{if $order_process == 'order'}?step=1{/if}" id="button_order_cart" class="exclusive{if $order_process == 'order-opc'}_large{/if}" title="{l s='Check out' mod='blockcart'}">{l s='Check out' mod='blockcart'}</a>
</p>
</div>
</div>
modules/blockcms/blockcms.tpl
+6 -6
View File
@@ -38,7 +38,7 @@
{foreach from=$cms_title.cms item=cms_page}
{if isset($cms_page.link)}<li><a href="{$cms_page.link}" title="{$cms_page.meta_title|escape:html:'UTF-8'}">{$cms_page.meta_title|escape:html:'UTF-8'}</a></li>{/if}
{/foreach}
{if $cms_title.display_store}<li><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
{if $cms_title.display_store}<li><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
</ul>
</div>
{/foreach}
@@ -46,11 +46,11 @@
{else}
<!-- MODULE Block footer -->
<ul class="block_various_links" id="block_various_links_footer">
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop.php')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products.php')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales.php')}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
<li class="item"><a href="{$link->getPageLink('contact-form.php', true)}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
<li class="item"><a href="{$link->getPageLink('contact-form', true)}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
{foreach from=$cmslinks item=cmslink}
{if $cmslink.meta_title != ''}
<li class="item"><a href="{$cmslink.link|addslashes}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
modules/blockmanufacturer/blockmanufacturer.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
<!-- Block manufacturers module -->
<div id="manufacturers_block_left" class="block blockmanufacturer">
<h4>{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer.php')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
<h4>{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
<div class="block_content">
{if $manufacturers}
{if $text_list}
modules/blockmyaccount/blockmyaccount.tpl
+9 -9
View File
@@ -26,18 +26,18 @@
<!-- Block myaccount module -->
<div class="block myaccount">
<h4><a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
<h4><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
<div class="block_content">
<ul class="bullet">
<li><a href="{$link->getPageLink('history.php', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow.php', true)}" title="">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
<li><a href="{$link->getPageLink('order-slip.php', true)}" title="">{l s='My credit slips' mod='blockmyaccount'}</a></li>
<li><a href="{$link->getPageLink('addresses.php', true)}" title="">{l s='My addresses' mod='blockmyaccount'}</a></li>
<li><a href="{$link->getPageLink('identity.php', true)}" title="">{l s='My personal info' mod='blockmyaccount'}</a></li>
{if $voucherAllowed}<li><a href="{$link->getPageLink('discount.php', true)}" title="">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
<li><a href="{$link->getPageLink('history', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)}" title="">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
<li><a href="{$link->getPageLink('order-slip', true)}" title="">{l s='My credit slips' mod='blockmyaccount'}</a></li>
<li><a href="{$link->getPageLink('addresses', true)}" title="">{l s='My addresses' mod='blockmyaccount'}</a></li>
<li><a href="{$link->getPageLink('identity', true)}" title="">{l s='My personal info' mod='blockmyaccount'}</a></li>
{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)}" title="">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
{$HOOK_BLOCK_MY_ACCOUNT}
</ul>
<p class="logout"><a href="{$link->getPageLink('index.php')}?mylogout" title="{l s='Sign out' mod='blockmyaccount'}">{l s='Sign out' mod='blockmyaccount'}</a></p>
<p class="logout"><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccount'}">{l s='Sign out' mod='blockmyaccount'}</a></p>
</div>
</div>
<!-- /Block myaccount module -->
<!-- /Block myaccount module -->
modules/blocknewproducts/blocknewproducts.tpl
+3 -3
View File
@@ -26,7 +26,7 @@
<!-- MODULE Block new products -->
<div id="new-products_block_right" class="block products_block">
<h4><a href="{$link->getPageLink('new-products.php')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
<h4><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
<div class="block_content">
{if $new_products !== false}
<ul class="product_images clearfix">
@@ -42,10 +42,10 @@
{if $newproduct.description_short}<dd class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$newproduct.link}">{$newproduct.description_short|strip_tags:'UTF-8'|truncate:50:'...'}</a>&nbsp;<a href="{$newproduct.link}"><img src="{$img_dir}bullet.gif" alt="&gt;&gt;" width="10" height="7" /></a></dd>{/if}
{/foreach}
</dl>
<p><a href="{$link->getPageLink('new-products.php')}" title="{l s='All new products' mod='blocknewproducts'}" class="button_large">{l s='All new products' mod='blocknewproducts'}</a></p>
<p><a href="{$link->getPageLink('new-products')}" title="{l s='All new products' mod='blocknewproducts'}" class="button_large">{l s='All new products' mod='blocknewproducts'}</a></p>
{else}
<p>{l s='No new products at this time' mod='blocknewproducts'}</p>
{/if}
</div>
</div>
<!-- /MODULE Block new products -->
<!-- /MODULE Block new products -->
modules/blocknewsletter/blocknewsletter.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
{if isset($msg) && $msg}
<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
{/if}
<form action="{$link->getPageLink('index.php')}" method="post">
<form action="{$link->getPageLink('index')}" method="post">
<p><input type="text" name="email" size="18" value="{if isset($value) && $value}{$value}{else}{l s='your e-mail' mod='blocknewsletter'}{/if}" onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter'}')this.value='';" onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter'}';" /></p>
<p>
<select name="action">
modules/blockpermanentlinks/blockpermanentlinks-header.tpl
+2 -2
View File
@@ -26,8 +26,8 @@
<!-- Block permanent links module HEADER -->
<ul id="header_links">
<li id="header_link_contact"><a href="{$link->getPageLink('contact-form.php', true)}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='contact' mod='blockpermanentlinks'}</a></li>
<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap.php')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='sitemap' mod='blockpermanentlinks'}</a></li>
<li id="header_link_contact"><a href="{$link->getPageLink('contact-form', true)}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='contact' mod='blockpermanentlinks'}</a></li>
<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='sitemap' mod='blockpermanentlinks'}</a></li>
<li id="header_link_bookmark">
<script type="text/javascript">writeBookmarkLink('{$come_from}', '{$meta_title|addslashes|addslashes}', '{l s='bookmark' mod='blockpermanentlinks'}');</script>
modules/blockpermanentlinks/blockpermanentlinks.tpl
+4 -4
View File
@@ -28,13 +28,13 @@
<div id="permanent_links">
<!-- Sitemap -->
<div class="sitemap">
<a href="{$link->getPageLink('sitemap.php')}"><img src="{$img_dir}icon/sitemap.gif" alt="{l s='sitemap' mod='blockpermanentlinks'}" title="{l s='sitemap' mod='blockpermanentlinks'}" /></a>&nbsp;
<a href="{$link->getPageLink('sitemap.php')}">{l s='sitemap' mod='blockpermanentlinks'}</a>
<a href="{$link->getPageLink('sitemap')}"><img src="{$img_dir}icon/sitemap.gif" alt="{l s='sitemap' mod='blockpermanentlinks'}" title="{l s='sitemap' mod='blockpermanentlinks'}" /></a>&nbsp;
<a href="{$link->getPageLink('sitemap')}">{l s='sitemap' mod='blockpermanentlinks'}</a>
</div>
<!-- Contact -->
<div class="contact">
<a href="{$link->getPageLink('contact-form.php', true)}"><img src="{$img_dir}icon/contact.gif" alt="{l s='contact' mod='blockpermanentlinks'}" title="{l s='contact' mod='blockpermanentlinks'}" /></a>&nbsp;
<a href="{$link->getPageLink('contact-form.php', true)}">{l s='contact' mod='blockpermanentlinks'}</a>
<a href="{$link->getPageLink('contact-form', true)}"><img src="{$img_dir}icon/contact.gif" alt="{l s='contact' mod='blockpermanentlinks'}" title="{l s='contact' mod='blockpermanentlinks'}" /></a>&nbsp;
<a href="{$link->getPageLink('contact-form', true)}">{l s='contact' mod='blockpermanentlinks'}</a>
</div>
<!-- Bookmark -->
<div class="add_bookmark">
modules/blocksearch/blocksearch-top.tpl
+4 -4
View File
@@ -27,7 +27,7 @@
<!-- Block search module TOP -->
<div id="search_block_top">
<form method="get" action="{$link->getPageLink('search.php')}" id="searchbox">
<form method="get" action="{$link->getPageLink('search')}" id="searchbox">
<p>
<label for="search_query_top"><!-- image on background --></label>
<input type="hidden" name="orderby" value="position" />
@@ -62,7 +62,7 @@
if($(this).val().length > 0){
stopInstantSearchQueries();
instantSearchQuery = $.ajax({
url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}',
url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}',
data: 'instantSearch=1&id_lang={/literal}{$cookie->id_lang}{literal}&q='+$(this).val(),
dataType: 'html',
success: function(data){
@@ -98,7 +98,7 @@
$('document').ready( function() {
$("#search_query_top")
.autocomplete(
'{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}', {
'{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}', {
minChars: 3,
max: 10,
width: 500,
@@ -129,4 +129,4 @@
// ]]>
</script>
{/if}
<!-- /Block search module TOP -->
<!-- /Block search module TOP -->
modules/blocksearch/blocksearch.tpl
+3 -3
View File
@@ -27,7 +27,7 @@
<!-- Block search module -->
<div id="search_block_left" class="block exclusive">
<h4>{l s='Search' mod='blocksearch'}</h4>
<form method="get" action="{$link->getPageLink('search.php', true)}" id="searchbox">
<form method="get" action="{$link->getPageLink('search', true)}" id="searchbox">
<p class="block_content">
<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
<input type="hidden" name="orderby" value="position" />
@@ -62,7 +62,7 @@
if($(this).val().length > 0){
stopInstantSearchQueries();
instantSearchQuery = $.ajax({
url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}',
url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}',
data: 'instantSearch=1&id_lang={/literal}{$cookie->id_lang}{literal}&q='+$(this).val(),
dataType: 'html',
success: function(data){
@@ -98,7 +98,7 @@
$('document').ready( function() {
$("#search_query_block")
.autocomplete(
'{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}', {
'{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}', {
minChars: 3,
max: 10,
width: 500,
modules/blockspecials/blockspecials.tpl
+4 -3
View File
@@ -26,7 +26,7 @@
<!-- MODULE Block specials -->
<div id="special_block_right" class="block products_block exclusive blockspecials">
<h4><a href="{$link->getPageLink('prices-drop.php')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
<h4><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
<div class="block_content">
{if $special}
@@ -48,11 +48,12 @@
</li>
</ul>
<p>
<a href="{$link->getPageLink('prices-drop.php')}" title="{l s='All specials' mod='blockspecials'}" class="button_large">{l s='All specials' mod='blockspecials'}</a>
<a href="{$link->getPageLink('prices-drop')}" title="{l s='All specials' mod='blockspecials'}" class="button_large">{l s='All specials' mod='blockspecials'}</a>
</p>
{else}
<p>{l s='No specials at this time' mod='blockspecials'}</p>
{/if}
</div>
</div>
<!-- /MODULE Block specials -->
<!-- /MODULE Block specials -->
modules/blockstore/blockstore.tpl
+3 -3
View File
@@ -26,11 +26,11 @@
<!-- Block stores module -->
<div id="stores_block_left" class="block">
<h4><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
<h4><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
<div class="block_content blockstore">
<p>
<a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a><br />
<a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}">{l s='Discover our stores' mod='blockstore'}</a>
<a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a><br />
<a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Discover our stores' mod='blockstore'}</a>
</p>
</div>
</div>
modules/blocksupplier/blocksupplier.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
<!-- Block suppliers module -->
<div id="suppliers_block_left" class="block blocksupplier">
<h4>{if $display_link_supplier}<a href="{$link->getPageLink('supplier.php')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
<h4>{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
<div class="block_content">
{if $suppliers}
{if $text_list}
modules/blocktags/blocktags.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
<p class="block_content">
{if $tags}
{foreach from=$tags item=tag name=myLoop}
<a href="{$link->getPageLink('search.php')}?tag={$tag.name|urlencode}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
<a href="{$link->getPageLink('search')}?tag={$tag.name|urlencode}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
{/foreach}
{else}
{l s='No tags specified yet' mod='blocktags'}
modules/blockuserinfo/blockuserinfo.tpl
+4 -4
View File
@@ -30,15 +30,15 @@
{l s='Welcome' mod='blockuserinfo'},
{if $cookie->isLogged()}
<span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span>
(<a href="{$link->getPageLink('index.php')}?mylogout" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Log out' mod='blockuserinfo'}</a>)
(<a href="{$link->getPageLink('index')}?mylogout" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Log out' mod='blockuserinfo'}</a>)
{else}
<a href="{$link->getPageLink('my-account.php', true)}">{l s='Log in' mod='blockuserinfo'}</a>
<a href="{$link->getPageLink('my-account', true)}">{l s='Log in' mod='blockuserinfo'}</a>
{/if}
</p>
<ul id="header_nav">
{if !$PS_CATALOG_MODE}
<li id="shopping_cart">
<a href="{$link->getPageLink("$order_process.php", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
<a href="{$link->getPageLink("$order_process", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
<span class="ajax_cart_quantity{if $cart_qties == 0} hidden{/if}">{$cart_qties}</span>
<span class="ajax_cart_product_txt{if $cart_qties != 1} hidden{/if}">{l s='product' mod='blockuserinfo'}</span>
<span class="ajax_cart_product_txt_s{if $cart_qties < 2} hidden{/if}">{l s='products' mod='blockuserinfo'}</span>
@@ -56,7 +56,7 @@
<span class="ajax_cart_no_product{if $cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
</li>
{/if}
<li id="your_account"><a href="{$link->getPageLink('my-account.php', true)}" title="{l s='Your Account' mod='blockuserinfo'}">{l s='Your Account' mod='blockuserinfo'}</a></li>
<li id="your_account"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Your Account' mod='blockuserinfo'}">{l s='Your Account' mod='blockuserinfo'}</a></li>
</ul>
</div>
<!-- /Block user information module HEADER -->
modules/blockwishlist/mywishlist.php
+1 -1
View File
@@ -86,7 +86,7 @@ if ($cookie->isLogged())
}
else
{
Tools::redirect('authentication.php?back=modules/blockwishlist/mywishlist.php');
Tools::redirect('index.php/authentication?back=modules/blockwishlist/mywishlist.php');
}
$smarty->assign(array(
modules/blockwishlist/mywishlist.tpl
+2 -2
View File
@@ -31,7 +31,7 @@
</script>
<div id="mywishlist">
{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='My wishlists' mod='blockwishlist'}</h2>
@@ -94,7 +94,7 @@
{/if}
<ul class="footer_links">
<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='blockwishlist'}</a></li>
<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='blockwishlist'}</a></li>
<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='blockwishlist'}</a></li>
</ul>
</div>
modules/blockwishlist/view.tpl
+1 -1
View File
@@ -71,7 +71,7 @@
<a class="button_small clear" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)}" title="{l s='View' mod='blockwishlist'}">{l s='View' mod='blockwishlist'}</a>
{if isset($product.attribute_quantity) AND $product.attribute_quantity >= 1 OR !isset($product.attribute_quantity) AND $product.product_quantity >= 1}
{if !$ajax}
<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart.php')}" method="post">
<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart')}" method="post">
<p class="hidden">
<input type="hidden" name="id_product" value="{$product.id_product|intval}" id="product_page_product_id" />
<input type="hidden" name="add" value="1" />
modules/cashondelivery/confirmation.tpl
+1 -1
View File
@@ -28,5 +28,5 @@
<br /><br />
{l s='You have chosen the cash on delivery method.' mod='cashondelivery'}
<br /><br /><span class="bold">{l s='Your order will be sent very soon.' mod='cashondelivery'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='cashondelivery'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cashondelivery'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='cashondelivery'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cashondelivery'}</a>.
</p>
modules/cashondelivery/validation.tpl
+1 -1
View File
@@ -52,7 +52,7 @@
<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='cashondelivery'}.</b>
</p>
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cashondelivery'}</a>
<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cashondelivery'}</a>
<input type="submit" name="submit" value="{l s='I confirm my order' mod='cashondelivery'}" class="exclusive_large" />
</p>
</form>
modules/cashticket/payment.php
+3 -3
View File
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/cashticket.php');
$module = new CashTicket();
if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$currency = new Currency($cart->id_currency);
if (!$module->isCurrencyActive($currency->iso_code))
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$amount = number_format((float)($cart->getOrderTotal(true, Cart::BOTH)), 2, '.','');
if (Tools::getValue('hash') != md5(Configuration::get($module->prefix.'SALT') + $amount + $currency->iso_code))
@@ -98,7 +98,7 @@ if ($state == _PS_OS_ERROR_)
else
{
$order = new Order($module->currentOrder);
Tools::redirect('order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
Tools::redirect('index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
}
modules/cashticket/redirect.php
+2 -2
View File
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/cashticket.php');
$module = new CashTicket();
if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$currency = new Currency($cart->id_currency);
if (!$module->isCurrencyActive($currency->iso_code))
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$result = $module->createDisposition($cart);
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);
modules/gcheckout/confirm.tpl
+3 -3
View File
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='gcheckout'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Google Checkout' mod='gcheckout'}{/capture}
{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='gcheckout'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Google Checkout' mod='gcheckout'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='Order summary' mod='gcheckout'}</h2>
@@ -49,8 +49,8 @@
<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='gcheckout'}.</b>
</p>
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='gcheckout'}</a>
<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='gcheckout'}</a>
<a href="#" class="exclusive_large" onclick="$('#gcheckout_form').submit();return false;">{l s='I confirm my order' mod='gcheckout'}</a>
</p>
{$googleCheckoutExtraForm}
{$googleCheckoutExtraForm}
modules/gcheckout/payment.php
+1 -1
View File
@@ -30,7 +30,7 @@ include(dirname(__FILE__).'/../../init.php');
include(dirname(__FILE__).'/gcheckout.php');
if (!$cookie->isLogged(true))
Tools::redirect('authentication.php?back=order.php');
Tools::redirect('index.php/authentication?back=order.php');
elseif (!$cart->getOrderTotal(true, Cart::BOTH))
Tools::displayError('Error: Empty cart');
modules/gsitemap/config.xml
+1
View File
@@ -8,4 +8,5 @@
<tab>seo</tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
modules/gsitemap/gsitemap.php
+3
View File
@@ -185,6 +185,9 @@ XML;
'supplier' => false,
'store' => false);
foreach ($pages AS $page => $ssl)
foreach($langs as $lang)
$this->_addSitemapNode($xml, $link->getPageLink($page, $ssl, $lang['id_lang']), '0.5', 'monthly');
if(Configuration::get('PS_REWRITING_SETTINGS'))
foreach ($pages AS $page => $ssl)
modules/hipay/redirect.php
+1 -1
View File
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../init.php');
include(dirname(__FILE__).'/hipay.php');
if (!$cookie->isLogged(true))
Tools::redirect('authentication.php?back=order.php');
Tools::redirect('index.php/authentication?back=order.php');
$hipay = new HiPay();
$hipay->payment();
modules/homefeatured/homefeatured.tpl
+1 -1
View File
@@ -45,7 +45,7 @@
<a class="button" href="{$product.link}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>
{if ($product.id_product_attribute == 0 OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product.available_for_order AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
{if ($product.quantity > 0 OR $product.allow_oosp) AND $product.customizable != 2}
<a class="exclusive ajax_add_to_cart_button" rel="ajax_id_product_{$product.id_product}" href="{$link->getPageLink('cart.php')}?qty=1&amp;id_product={$product.id_product}&amp;token={$static_token}&amp;add" title="{l s='Add to cart' mod='homefeatured'}">{l s='Add to cart' mod='homefeatured'}</a>
<a class="exclusive ajax_add_to_cart_button" rel="ajax_id_product_{$product.id_product}" href="{$link->getPageLink('cart')}?qty=1&amp;id_product={$product.id_product}&amp;token={$static_token}&amp;add" title="{l s='Add to cart' mod='homefeatured'}">{l s='Add to cart' mod='homefeatured'}</a>
{else}
<span class="exclusive">{l s='Add to cart' mod='homefeatured'}</span>
{/if}
modules/loyalty/loyalty-program.php
+1 -1
View File
@@ -35,7 +35,7 @@ include_once(dirname(__FILE__).'/LoyaltyModule.php');
include_once(dirname(__FILE__).'/LoyaltyStateModule.php');
if (!$cookie->isLogged())
Tools::redirect('authentication.php?back=modules/loyalty/loyalty-program.php');
Tools::redirect('index.php/authentication?back=modules/loyalty/loyalty-program.php');
Tools::addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
modules/loyalty/loyalty.tpl
+2 -2
View File
@@ -30,7 +30,7 @@
-->
</script>
{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='My loyalty points' mod='loyalty'}</h2>
@@ -199,6 +199,6 @@ $(document).ready(function()
{/if}
<ul class="footer_links">
<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='loyalty'}</a></li>
<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='loyalty'}</a></li>
<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='loyalty'}</a></li>
</ul>
modules/mailalerts/myalerts.tpl
+2 -2
View File
@@ -31,7 +31,7 @@
</script>
<div id="myalerts">
{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='My alerts' mod='mailalerts'}</h2>
@@ -73,7 +73,7 @@
{/if}
<ul class="footer_links">
<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='mailalerts'}</a></li>
<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='mailalerts'}</a></li>
<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='mailalerts'}</a></li>
</ul>
</div>
modules/mondialrelay/mondialrelay.php
+1 -1
View File
@@ -340,7 +340,7 @@ class MondialRelay extends Module
{
if (empty($_POST['MR_Selected_Num_'.$cart->id_carrier])) // Case error : the customer didn't choose a 'relais' but selected Relais Colis TNT as a carrier
Tools::redirect('order.php?step=2&mr_null');
Tools::redirect('index.php/order?step=2&mr_null');
else
{
Db::getInstance()->delete(_DB_PREFIX_.'mr_selected','id_cart = "'.(int)($cart->id).'"');
modules/moneybookers/confirmation.tpl
+3 -3
View File
@@ -27,18 +27,18 @@
{if $status == 'ok'}
<p>{l s='Your order on' mod='moneybookers'} <span class="bold">{$shop_name}</span> {l s='is complete.' mod='moneybookers'}
<br /><br /><span class="bold">{l s='Your order will be shipped as soon as possible.' mod='moneybookers'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</a>.
</p>
{else}
{if $status == 'pending'}
<p>{l s='Your order on' mod='moneybookers'} <span class="bold">{$shop_name}</span> {l s='is pending.' mod='moneybookers'}
<br /><br /><span class="bold">{l s='Your order will be shipped as soon as we receive your bankwire.' mod='moneybookers'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</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='moneybookers'}
<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</a>.
</p>
{/if}
{/if}
modules/ogone/config.xml
+1
View File
@@ -8,4 +8,5 @@
<tab>payments_gateways</tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
modules/ogone/confirmation.php
+1 -1
View File
@@ -39,7 +39,7 @@ $smarty->assign(array(
'id_module' => $id_module,
'id_cart' => $id_cart,
'key' => $key,
'ogone_link' => (method_exists($link, 'getPageLink') ? $link->getPageLink('my-account.php') : _PS_BASE_URL_.'my-account.php')
'ogone_link' => (method_exists($link, 'getPageLink') ? $link->getPageLink('my-account') : _PS_BASE_URL_.'my-account')
));
echo $ogone->display(__FILE__, 'waiting.tpl');
modules/ogone/ogone.php
+1 -1
View File
@@ -186,7 +186,7 @@ class Ogone extends PaymentModule
else
$smarty->assign('status', 'failed');
$link = new Link();
$smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $link->getPageLink('contact-form.php', true) : Tools::getHttpHost(true).'contact-form.php'));
$smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $link->getPageLink('contact-form', true) : Tools::getHttpHost(true).'contact-form'));
return $this->display(__FILE__, 'hookorderconfirmation.tpl');
}
modules/paypal/confirm.tpl
+2 -2
View File
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='Order summary' mod='paypal'}</h2>
@@ -54,7 +54,7 @@
<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='paypal'}.</b>
</p>
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='paypal'}</a>
<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='paypal'}</a>
<input type="submit" name="submitPayment" value="{l s='I confirm my order' mod='paypal'}" class="exclusive_large" />
</p>
</form>
modules/paypal/confirmation.tpl
+1 -1
View File
@@ -28,5 +28,5 @@
<br /><br />
{l s='You have chosen the PayPal method.' mod='paypal'}
<br /><br /><span class="bold">{l s='Your order will be sent very soon.' mod='paypal'}</span>
<br /><br />{l s='For any questions or for further information, please contact our' mod='paypal'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='paypal'}</a>.
<br /><br />{l s='For any questions or for further information, please contact our' mod='paypal'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='paypal'}</a>.
</p>
modules/paypal/error.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{$message}</h2>
modules/paypal/express/login.tpl
+1 -1
View File
@@ -47,6 +47,6 @@
<input type="hidden" name="payerID" value="{$payerID|escape:'htmlall'|stripslashes}" />
<input type="submit" id="submitLogin" name="submitLogin" class="button" value="{l s='Log in' mod='paypal'}" />
</p>
<p class="lost_password center"><a href="{$link->getPageLink('password.php')}">{l s='Forgot your password?' mod='paypal'}</a></p>
<p class="lost_password center"><a href="{$link->getPageLink('password')}">{l s='Forgot your password?' mod='paypal'}</a></p>
</fieldset>
</form>
modules/paypal/express/submit.php
+1 -1
View File
@@ -88,7 +88,7 @@ function displayProcess($payerID)
$cookie->paypal_token = strval($cookie->paypal_token);
$cookie->paypal_payer_id = $payerID;
Tools::redirect('order.php?step=1&back=paypal');
Tools::redirect('index.php/order?step=1&back=paypal');
}
function displayConfirm()
modules/paysafecard/payment.php
+3 -3
View File
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/paysafecard.php');
$module = new PaysafeCard();
if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$currency = new Currency($cart->id_currency);
if (!$module->isCurrencyActive($currency->iso_code))
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$amount = number_format((float)($cart->getOrderTotal(true, Cart::BOTH)), 2, '.','');
if (Tools::getValue('hash') != md5(Configuration::get($module->prefix.'SALT') + $amount + $currency->iso_code))
@@ -95,7 +95,7 @@ if ($state == _PS_OS_ERROR_)
else
{
$order = new Order($module->currentOrder);
Tools::redirect('order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
Tools::redirect('index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
}
modules/paysafecard/redirect.php
+2 -2
View File
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/paysafecard.php');
$module = new PaysafeCard();
if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$currency = new Currency($cart->id_currency);
if (!$module->isCurrencyActive($currency->iso_code))
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
$result = $module->createDisposition($cart);
modules/referralprogram/referralprogram-program.php
+1 -1
View File
@@ -33,7 +33,7 @@ require_once(dirname(__FILE__).'/../../init.php');
include_once(dirname(__FILE__).'/ReferralProgramModule.php');
if (!$cookie->isLogged())
Tools::redirect('authentication.php?back=modules/referralprogram/referralprogram-program.php');
Tools::redirect('index.php/authentication?back=modules/referralprogram/referralprogram-program.php');
Tools::addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
modules/referralprogram/referralprogram-program.tpl
+2 -2
View File
@@ -38,7 +38,7 @@
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Referral Program' mod='referralprogram'}{/capture}
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Referral Program' mod='referralprogram'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h2>{l s='Referral program' mod='referralprogram'}</h2>
@@ -218,6 +218,6 @@
</div>
<ul class="footer_links">
<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='referralprogram'}</a></li>
<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='referralprogram'}</a></li>
<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir_ssl}">{l s='Home' mod='referralprogram'}</a></li>
</ul>
modules/socolissimo/validation.php
+1 -1
View File
@@ -63,7 +63,7 @@ if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['
if (!$cart->update())
Tools::redirect();
else
Tools::redirect('order.php?step=3');
Tools::redirect('index.php/order?step=3');
}
else
echo '<div class="alert error"><img src="' . _PS_IMG_ . 'admin/forbbiden.gif" alt="nok" />&nbsp;'.$so->displaySoError('999').'
modules/trackingfront/stats.php
+1 -1
View File
@@ -31,7 +31,7 @@ include(dirname(__FILE__).'/trackingfront.php');
$tf = new TrackingFront();
if (!$tf->active)
Tools::redirect('404.php');
Tools::redirect('index.php/404');
$tf->postProcess();
echo $tf->isLogged() ? $tf->displayAccount() : $tf->displayLogin();