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

Merge branch 'ticket/r12615-domtom' into dev

Browse Source
This commit is contained in:
Rodney Figaro 2017-03-17 13:31:03 +01:00
commit b2088d6bf9
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ class OrderController extends OrderControllerCore
$txt = sprintf('"%s" cannot be carried by plane. Please remove the product from your cart so that you can resume your order.', trim($restricted_product['name']));
}
$this->context->smarty->assign('restricted_product_txt', $txt);
$this->context->smarty->assign('restricted_product_id', $restricted_product['id_product']);
}
}

7
themes/default/js/cart-summary.js
View File

@ -450,7 +450,12 @@ function deleteProductFromSummary(id)
}
else
{
$('#product_'+ id).fadeOut('slow', function() {
$('#product_' + productId + '_' + productAttributeId + '_0_' + id_address_delivery).fadeOut('slow', function() {
if ($('#restricted_product_txt').hasClass('restricted_product_'+productId)) {
location.reload();
return;
}
$(this).remove();
cleanSelectAddressDelivery();
if (!customizationId)

2
themes/default/order-carrier-simple.tpl
View File

@ -89,7 +89,7 @@
<div>
{if isset($restricted_product_txt) && $restricted_product_txt!=''}
<p class="warning restricted_initial" id="restricted_product_txt">
<p class="warning restricted_initial {if isset($restricted_product_id)}restricted_product_{$restricted_product_id}{/if}" id="restricted_product_txt">
{$restricted_product_txt}
</p>
{else}

2
themes/default/order-carrier.tpl
View File

@ -88,7 +88,7 @@
<div>
{if isset($restricted_product_txt) && $restricted_product_txt!=''}
<p class="warning restricted_initial" id="restricted_product_txt">
<p class="warning restricted_initial {if isset($restricted_product_id)}restricted_product_{$restricted_product_id}{/if}" id="restricted_product_txt">
{$restricted_product_txt}
</p>
{else}

2
themes/default/shopping-cart.tpl
View File

@ -58,7 +58,7 @@
<p class="warning">{l s='This store has not accepted your new order.'}</p>
{else}
{if isset($restricted_product_txt) && $restricted_product_txt!=''}
<p class="warning" id="restricted_product_txt">
<p class="warning {if isset($restricted_product_id)}restricted_product_{$restricted_product_id}{/if}" id="restricted_product_txt">
{$restricted_product_txt}
</p>
{/if}