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

13013 - fix minimum_amount in other related files

Browse Source
This commit is contained in:
Rodney Figaro 2017-04-13 17:26:16 +02:00
parent 7cfd4d5665
commit ff2fe882ef
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/blockcart/blockcart.php
View File

@ -153,7 +153,6 @@ class BlockCart extends Module
'total' => Tools::displayPrice($totalToPay, $currency),
'remaining_for_free_shipping' => $remaining_for_free_shipping,
'notEligible' => $notEligible,
// Antadis 24/02/2017 : "minimum_amount" is never used in no tpls. Comment it rather remove it, in case of...
'minimum_amount' => $minimum_amount,
'order_process' => Configuration::get('PS_ORDER_PROCESS_TYPE') ? 'order-opc' : 'order',
'ajax_allowed' => (int)(Configuration::get('PS_BLOCK_CART_AJAX')) == 1 ? true : false,

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

@ -186,8 +186,7 @@ class OrderController extends OrderControllerCore
$this->context->smarty->assign('remaining_for_free_shipping', $remaining_for_free_shipping);
$this->context->smarty->assign('notEligible', $notEligible);
$this->context->smarty->assign('free_shipping_ok', $free_shipping_ok);
// Antadis 24/02/2017 : "minimum_amount" is never used in no tpls. Comment it rather remove it, in case of...
//$this->context->smarty->assign('minimum_amount', $minimum_amount);
$this->context->smarty->assign('minimum_amount', $minimum_amount);
$this->context->smarty->assign('totalWithoutShippingAndTax', $totalWithoutShippingAndTax);
$this->context->smarty->assign('totalWithoutShipping', $totalWithoutShipping);
/** end @Override [ticket 7902] */
@ -332,6 +331,7 @@ class OrderController extends OrderControllerCore
$remaining_for_free_shipping = 0;
}
$this->context->smarty->assign('minimum_amount', $minimum_amount);
$this->context->smarty->assign('remaining_for_free_shipping', $remaining_for_free_shipping);
$this->context->smarty->assign('notEligible', $notEligible);
$this->context->smarty->assign('free_shipping_ok', $free_shipping_ok);

6
themes/site/shopping-cart.tpl
View File

@ -505,7 +505,7 @@
{include file='./shopping-cart-delivery-dates.tpl'}
</div>
<div class="clearfix"></div>
{elseif $free_shipping_ok == true || $totalWithoutShipping>=79}
{elseif $free_shipping_ok == true || $totalWithoutShipping>=$minimum_amount}
<div id="cart_free_shipping" class="free-shipping ">
<span class="cart_free_shipping_block">
<span class="exclam-img"></span>
@ -527,8 +527,10 @@
<div class="clearfix"></div>
{/if}
{if (!isset($notEligible) || !$notEligible) && !(isset($free_shipping_ok) && isset($totalWithoutShipping) && ($free_shipping_ok || $totalWithoutShipping>=79))}
{if (!isset($notEligible) || !$notEligible) && !(isset($free_shipping_ok) && isset($totalWithoutShipping) && ($free_shipping_ok || $totalWithoutShipping>=$minimum_amount))}
{if $minimum_amount == 79}
<div class="box-shipping">{l s='Les frais de port sont calculés définitivement à l’étape livraison' }</div>
{/if}
{/if}
<div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div>
<p class="cart_navigation clearfix">