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

fix buggy display of mondial relay selection

Browse Source
This commit is contained in:
ToutPratique 2016-09-27 13:33:45 +02:00
parent 60b2e7b197
commit 49e4ac2976
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/envoimoinscher/views/css/carrier.css
View File

@ -95,11 +95,13 @@ text-align:left;
}
.emc_hidden{
opacity:0.7;
opacity:0.5;
font-style: italic;
}
.emc_hidden .emc_warning{
color:red;
font-size:14px;
}
.emcCarrier .best_grade,
.emcCarrier .delivery_option_best{

3
modules/envoimoinscher/views/templates/hook/hookDisplayBeforeCarrier.tpl
View File

@ -51,9 +51,12 @@
} else {
$(this).removeClass('item').addClass('alternate_item');
}
/*
if (row == 0) {
$(this).css('border-top', 'none');
}
*/
row += 1;
});
});

4
override/controllers/front/OrderController.php
View File

@ -8,7 +8,7 @@ class OrderController extends OrderControllerCore
public function init()
{
self::$MONDIALRELAY_CARRIER_ID_REFERENCE = (_DB_NAME_=='prestashop')?39:18;
self::$MONDIALRELAY_EU_CARRIER_ID_REFERENCE = (_DB_NAME_=='prestashop')?38:18;
self::$MONDIALRELAY_EU_CARRIER_ID_REFERENCE = (_DB_NAME_=='prestashop')?38:17;
parent::init();
@ -99,7 +99,6 @@ class OrderController extends OrderControllerCore
if (Tools::isSubmit('processAddress'))
$this->processAddress();
// override add adress in step 2
$this->_assignAddress();
$this->processAddressFormat();
@ -116,6 +115,7 @@ class OrderController extends OrderControllerCore
if (Tools::isSubmit('processAddress'))
$this->processAddress();
// FIX ENVOIMOINSCHER
$cart = Context::getContext()->cart;
$carrier = new Carrier((int) $cart->id_carrier); // mondial relay

13
themes/toutpratique/ajax-order-carrier.tpl
View File

@ -2,6 +2,13 @@
{if isset($virtual_cart) && $virtual_cart}
<input id="input_virtual_carrier" class="hidden" type="hidden" name="id_carrier" value="0" />
{else}
<div id="HOOK_BEFORECARRIER">
{if isset($carriers) && isset($HOOK_BEFORECARRIER)}
{$HOOK_BEFORECARRIER}
{/if}
</div>
{if isset($delivery_option_list)}
{if isset($smarty.get.emc_choice_delivery) }
<div class='alert alert-danger'>
@ -11,8 +18,8 @@
{foreach $delivery_option_list as $id_address => $option_list}
<div class="delivery_options">
{foreach $option_list as $key => $option}
<div class="delivery-option clearfix delivery-{$key|replace:',':''} box-content">
<div class="col-lg-2 col-xs-3 radio-button">
<div class="delivery_option delivery-option clearfix delivery-{$key|replace:',':''} box-content">
<div class="col-lg-3 col-xs-3 radio-button">
{foreach $option.carrier_list as $carrier}
{if $carrier.logo}
<img class="hidden-xs" src="{$carrier.logo|escape:'htmlall':'UTF-8'}" alt="{$carrier.instance->name|escape:'htmlall':'UTF-8'}"/>
@ -24,7 +31,7 @@
</div>
<div class="col-lg-8 col-xs-6 desc">
<div class="col-lg-7 col-xs-6 desc">
{if isset($carrier.instance->delay[$cookie->id_lang])}
{$carrier.instance->delay[$cookie->id_lang]|escape:'htmlall':'UTF-8'}
{/if}