antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-modifCarriers' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-13 15:41:23 +02:00
commit 348be7d6f4
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
override/controllers/ParentOrderController.php
View File

@ -165,7 +165,8 @@ class ParentOrderController extends ParentOrderControllerCore {
$carriers_ah = array();
$carriers_ooh = array();
if(_THEME_NAME_ != "site_mobile") {
$config_carrier_ooh = array(47,48); // prod
// $config_carrier_ooh = array(88,89); // prod
$config_carrier_ooh = array(47,48); // dev
// $config_carrier_ooh = array(40,45); // local
foreach ($carriers as $carrier) {
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){

2
themes/site/order-address.tpl
View File

@ -166,7 +166,7 @@
{include file="$tpl_dir./errors.tpl"}
{if $smarty.get.domtom || $smarty.get.canaries}
<div class="error">
<p>{l s='There is'}{l s='error'} :</p>
<p>{l s='There is'} {l s='error'} :</p>
<ol>
{if $smarty.get.domtom}
<li>{l s='Nous sommes désolé, nous ne livrons pas dans le DOM-TOM'}</li>

12
themes/site_mobile/order-address.tpl
View File

@ -162,6 +162,18 @@
{include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"}
{if $smarty.get.domtom || $smarty.get.canaries}
<div class="error">
<p>{l s='There is'} {l s='error'} :</p>
<ol>
{if $smarty.get.domtom}
<li>{l s='Nous sommes désolé, nous ne livrons pas dans le DOM-TOM'}</li>
{elseif $smarty.get.canaries}
<li>{l s='Lo sentimos, en estos momentos no distribuimos nuestros productos en Canarias. Si deseas más información, puedes contactar con el Servicio de atención al cliente o llamar al 902 044 399.'}</li>
{/if}
</ol>
</div>
{/if}
<form action="{$link->getPageLink($back_order_page, true)}" method="post" class="form_address">
{else}
<h2>1. {l s='Addresses'}</h2>