diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl index 4ab2ff01a..520f25aff 100644 --- a/admin-dev/themes/default/template/controllers/shipping/content.tpl +++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl @@ -24,80 +24,89 @@ *} {$content} -

-

{l s='Fees by carrier, geographical zone and ranges'}

-
-
- {l s='Fees'} + + +
+ + + {l s='Fees by carrier, geographical zone and ranges'} + {if empty($carriers)} {l s='If you only have free carriers, there\'s no need to configure delivery prices.'} {else} - {l s='Carrier:'} -
- - - - - {if !$carrierSelected->is_free} - {foreach $ranges AS $range} - +
+ +
+ +
+
+
{l s='Zone / Range'}{$range['delimiter1']|floatval}{$suffix} {l s='to'} {$range['delimiter2']|floatval}{$suffix}
+ + + + {if !$carrierSelected->is_free} + {foreach $ranges AS $range} + + {/foreach} + {/if} + + + + {if sizeof($ranges) && !$carrierSelected->is_free} + {if sizeof($zones) > 1} + + + {foreach $ranges AS $range} + + {/foreach} + + {/if} + {foreach $zones AS $zone} + + + {foreach $ranges AS $range} + {if isset($deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]])} + {$price = $deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]]} + {else} + {$price = '0.00'} + {/if} + + {/foreach} + {/foreach} {/if} - - {if sizeof($ranges) && !$carrierSelected->is_free} - {if sizeof($zones) > 1} - - - {foreach $ranges AS $range} - - {/foreach} - - {/if} - - {foreach $zones AS $zone} - - - {foreach $ranges AS $range} - {if isset($deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]])} - {$price = $deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]]} - {else} - {$price = '0.00'} - {/if} - - {/foreach} - - {/foreach} - {/if} - - - + + + +
{l s='Zone / Range'}{$range['delimiter1']|floatval}{$suffix} {l s='to'} {$range['delimiter2']|floatval}{$suffix}
{l s='All'} +
+ {$currency->prefix}{$currency->suffix} {l s='(tax excl.)'} + +
+
{$zone['name']} +
+ {$currency->prefix}{$currency->suffix} {l s='(tax excl.)'} + +
+
{l s='All'} - {$currency->getSign('left')} - - {$currency->getSign('right')} {l s='(tax excl.)'} -
{$zone['name']} - {$currency->getSign('left')} - - {$currency->getSign('right')} {l s='(tax excl.)'} -
- - {if sizeof($ranges) && !$carrierSelected->is_free} - - {else if $carrierSelected->is_free} - {l s='This is a free carrier'} - {else} - {l s='No ranges is set for this carrier'} - {/if} -
+ + {if sizeof($ranges) && !$carrierSelected->is_free} + + {else if $carrierSelected->is_free} + {l s='This is a free carrier'} + {else} + {l s='No ranges is set for this carrier'} + {/if} +
{/if} diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index 469dd4f74..d3e7f34cc 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -50,7 +50,7 @@ {* Category description *} {if (isset($categoryData['description']) && $categoryData['description'])} -
{$categoryData['description']}
+
{$categoryData['description']}
{/if} {* Category info *} {if (isset($categoryData['info']) && $categoryData['info'])} @@ -58,8 +58,7 @@ {/if} {if !$categoryData['hide_multishop_checkbox'] && $use_multishop} - {l s='Check/uncheck all'} {l s='(Check boxes if you want to set a custom value for this shop or group shop context)'} -
+ {l s='Check/uncheck all'} {l s='(Check boxes if you want to set a custom value for this shop or group shop context)'} {/if} {foreach $categoryData['fields'] AS $key => $field} @@ -119,23 +118,26 @@ {elseif $field['type'] == 'radio'} - {foreach $field['choices'] AS $k => $v} -
+
+ {foreach $field['choices'] AS $k => $v} +

-
- {/foreach} + {/foreach} +
{elseif $field['type'] == 'checkbox'} - {foreach $field['choices'] AS $k => $v} -
+ +
+ {foreach $field['choices'] AS $k => $v} +

-
- {/foreach} + {/foreach} +
{elseif $field['type'] == 'text'}
@@ -164,8 +166,10 @@
{elseif $field['type'] == 'price'} -
- {$currency_left_sign}{$currency_right_sign} {l s='(tax excl.)'} + +
+ {$currency->prefix}{$currency->suffix} {l s='(tax excl.)'} +
{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'} @@ -228,16 +232,17 @@ {elseif $field['type'] == 'selectLang'} {foreach $languages as $language} -
- -
+ +
+ +
{/foreach} {/if} diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 84a51b04d..5f9ac467d 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -30,6 +30,7 @@ class AdminCarriersControllerCore extends AdminController public function __construct() { + $this->bootstrap = true; $this->table = 'carrier'; $this->className = 'Carrier'; $this->lang = false; diff --git a/controllers/admin/AdminRangePriceController.php b/controllers/admin/AdminRangePriceController.php index f0baa613c..51de218fe 100644 --- a/controllers/admin/AdminRangePriceController.php +++ b/controllers/admin/AdminRangePriceController.php @@ -28,6 +28,7 @@ class AdminRangePriceControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->table = 'range_price'; $this->className = 'RangePrice'; $this->lang = false; @@ -81,7 +82,6 @@ class AdminRangePriceControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('From:'), 'name' => 'delimiter1', - 'size' => 5, 'required' => true, 'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'), 'desc' => $this->l('Start range (included)'), @@ -91,7 +91,6 @@ class AdminRangePriceControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('To:'), 'name' => 'delimiter2', - 'size' => 5, 'required' => true, 'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'), 'desc' => $this->l('End range (excluded)'), diff --git a/controllers/admin/AdminRangeWeightController.php b/controllers/admin/AdminRangeWeightController.php index 25f1ca895..a26f7c21d 100644 --- a/controllers/admin/AdminRangeWeightController.php +++ b/controllers/admin/AdminRangeWeightController.php @@ -28,6 +28,7 @@ class AdminRangeWeightControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->table = 'range_weight'; $this->className = 'RangeWeight'; $this->lang = false; diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php index 7d804b0f9..7200f51b5 100644 --- a/controllers/admin/AdminShippingController.php +++ b/controllers/admin/AdminShippingController.php @@ -30,6 +30,7 @@ class AdminShippingControllerCore extends AdminController public function __construct() { + $this->bootstrap = true; parent::__construct(); $this->table = 'delivery';