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

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
root 2017-06-01 12:27:38 +02:00
commit b89a5ed2e0
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/soflexibilite/js/front_flexibilite.js
View File

@ -222,10 +222,12 @@ $(document).ready(function () {
if (selected_carrier == bpr_id) {
$('[id^="PR"].BPR, [id^="PR"].BDP, [id^="PR"].CDI, [id^="PR"].ACP').show();
$('#super-selector option[value="choixPoste"]').attr('selected', true);
$('#super-selector option[value="choixCom"]').hide();
}
else if (selected_carrier == a2p_id) {
$('[id^="PR"].A2P, [id^="PR"].CMT, [id^="PR"].PCS').show();
$('#super-selector option[value="choixCom"]').attr('selected', true);
$('#super-selector option[value="choixPoste"]').hide();
}
$('#soflexibilite_overlay').fadeIn('fast', function () {

4
override/controllers/ParentOrderController.php
View File

@ -230,10 +230,12 @@ class ParentOrderController extends ParentOrderControllerCore {
self::$smarty->assign(array(
'checked' => $this->_setDefaultCarrierSelection($carriers),
'carriers' => $carriers,
'carriers_ah' => $carriers_ah,
'carriers_ooh' => $carriers_ooh,
'carrier_shipping_cost' => $carrier_shipping_cost ? $carrier_shipping_cost:0,
'sale_delivery' => array_unique($sale_delivery),
'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT'))
'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT')),
'country_delivery' => $address->id_country
));
self::$smarty->assign(array(
'HOOK_EXTRACARRIER' => Module::hookExec('extraCarrier', array('address' => $address)),

8
themes/site/order-carrier.tpl
View File

@ -126,6 +126,7 @@
{/if}
<p class="warning" id="noCarrierWarning" {if isset($carriers) && $carriers && count($carriers)}style="display:none;"{/if}>{l s='There are no carriers available that deliver to this address.'}</p>
<table id="carrierTable" class="std" {if !isset($carriers) || !$carriers || !count($carriers)}style="display:none;"{/if}>
{if isset($carriers_ah) && !empty($carriers_ah)}
<thead>
<tr>
<th class="carrier_action first_item" colspan="2">{l s='At home'}</th>
@ -135,7 +136,6 @@
</tr>
</thead>
<tbody>
{if isset($carriers)}
{foreach from=$carriers item=carrier name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
<td class="carrier_action radio">
@ -145,8 +145,8 @@
<label for="id_carrier{$carrier.id_carrier|intval}">
{if $only_gifts}E-mail{else}
{if $carrier.img}
{if $cookie->id_lang == 3}
<img src="/img/s/es.png" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />
{if $cookie->id_lang == 3 || $country_delivery == 6}
<img src="/img/s/seur.jpg" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />
{else}
<img src="{$carrier.img|escape:'htmlall':'UTF-8'}" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />
{/if}
@ -200,8 +200,8 @@
</tr>
{/foreach}
<tr id="HOOK_EXTRACARRIER">{$HOOK_EXTRACARRIER}</tr>
{/if}
</tbody>
{/if}
{if count($carriers_ooh) > 0}
<thead>
<tr>

4
themes/site_mobile/order-carrier.tpl
View File

@ -129,6 +129,7 @@
{/if}
<p class="warning" id="noCarrierWarning" {if isset($carriers) && $carriers && count($carriers)}style="display:none;"{/if}>{l s='There are no carriers available that deliver to this address.'}</p>
<table id="carrierTable" class="std" {if !isset($carriers) || !$carriers || !count($carriers)}style="display:none;"{/if}>
{if isset($carriers_ah) && !empty($carriers_ah)}
<thead>
<tr>
<th class="carrier_action first_item" colspan="2">{l s='At home'}</th>
@ -138,7 +139,6 @@
</tr>
</thead>
<tbody>
{if isset($carriers)}
{foreach from=$carriers item=carrier name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
<td class="carrier_action radio">
@ -175,8 +175,8 @@
</tr>
{/foreach}
<tr id="HOOK_EXTRACARRIER">{$HOOK_EXTRACARRIER}</tr>
{/if}
</tbody>
{/if}
{if count($carriers_ooh) > 0}
<thead style="display: table-header-group; border-top: 20px solid #f1f1f1;">
<tr>