dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl
This commit is contained in:
Kevin Granger
2013-07-29 16:21:31 +02:00
parent ae225dce4c b528b7b6fc
commit 483dbd7b53
6 changed files with 110 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/shipping/content.tpl
+78 -69
View File
@@ -24,80 +24,89 @@
*}
{$content}
<br /><br />
<h2>{l s='Fees by carrier, geographical zone and ranges'}</h2>
<form action="{$action_fees}" id="fees" name="fees" method="post">
<fieldset>
<legend><img src="../img/admin/delivery.gif" />{l s='Fees'}</legend>
<form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
<fieldset class="col-lg-12">
<legend>
<i class="icon-truck"></i>
{l s='Fees by carrier, geographical zone and ranges'}
</legend>
{if empty($carriers)}
{l s='If you only have free carriers, there\'s no need to configure delivery prices.'}
{else}
<b>{l s='Carrier:'} </b>
<select name="id_carrier2" onchange="$('#fees').attr('action', $('#fees').attr('action')+'&id_carrier='+$(this).attr('value')+'#fees'); $('#fees').submit();">
{foreach $carriers AS $carrier}
<option value="{$carrier['id_carrier']|intval}" {if $carrier['id_carrier'] == $id_carrier} selected="selected"{/if}>{$carrier['name']}</option>
{/foreach}
</select><br />
<table class="table space" cellpadding="0" cellspacing="0">
<tr>
<th>{l s='Zone / Range'}</th>
{if !$carrierSelected->is_free}
{foreach $ranges AS $range}
<th style="font-size: 11px;">{$range['delimiter1']|floatval}{$suffix} {l s='to'} {$range['delimiter2']|floatval}{$suffix}</th>
<div class="row">
<label class="control-label col-lg-3">{l s='Carrier:'} </label>
<div class="col-lg-6">
<select name="id_carrier2" onchange="$('#fees').attr('action', $('#fees').attr('action')+'&id_carrier='+$(this).attr('value')+'#fees'); $('#fees').submit();">
{foreach $carriers AS $carrier}
<option value="{$carrier['id_carrier']|intval}" {if $carrier['id_carrier'] == $id_carrier} selected="selected"{/if}>{$carrier['name']}</option>
{/foreach}
</select>
</div>
</div>
<table class="table" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th>{l s='Zone / Range'}</th>
{if !$carrierSelected->is_free}
{foreach $ranges AS $range}
<th>{$range['delimiter1']|floatval}{$suffix} {l s='to'} {$range['delimiter2']|floatval}{$suffix}</th>
{/foreach}
{/if}
</tr>
</thead>
<tbody>
{if sizeof($ranges) && !$carrierSelected->is_free}
{if sizeof($zones) > 1}
<tr>
<td>{l s='All'}</td>
{foreach $ranges AS $range}
<td>
<div class="input-group col-lg-9">
<span class="input-group-addon">{$currency->prefix}{$currency->suffix} {l s='(tax excl.)'}</span>
<input type="text" id="fees_all_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="if ((event.keyCode||event.which) != 9){ spreadFees({$range[$rangeIdentifier]})}" />
</div>
</td>
{/foreach}
</tr>
{/if}
{foreach $zones AS $zone}
<tr>
<td>{$zone['name']}</td>
{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}
<td>
<div class="input-group col-lg-9">
<span class="input-group-addon">{$currency->prefix}{$currency->suffix} {l s='(tax excl.)'}</span>
<input
type="text"
class="fees_{$range[$rangeIdentifier]}"
onchange="this.value = this.value.replace(/,/g, '.');" name="fees_{$zone['id_zone']}_{$range[$rangeIdentifier]}" onkeyup="clearAllFees({$range[$rangeIdentifier]})"
value="{$price|string_format:"%.6f"}"
/>
</div>
</td>
{/foreach}
</tr>
{/foreach}
{/if}
</tr>
{if sizeof($ranges) && !$carrierSelected->is_free}
{if sizeof($zones) > 1}
<tr>
<th style="height: 30px;">{l s='All'}</th>
{foreach $ranges AS $range}
<td class="center">
{$currency->getSign('left')}
<input type="text" id="fees_all_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="if ((event.keyCode||event.which) != 9){ spreadFees({$range[$rangeIdentifier]})}" style="width: 45px;" />
{$currency->getSign('right')} {l s='(tax excl.)'}
</td>
{/foreach}
</tr>
{/if}
{foreach $zones AS $zone}
<tr>
<th style="height: 30px;">{$zone['name']}</th>
{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}
<td class="center">
{$currency->getSign('left')}
<input
type="text"
class="fees_{$range[$rangeIdentifier]}"
onchange="this.value = this.value.replace(/,/g, '.');" name="fees_{$zone['id_zone']}_{$range[$rangeIdentifier]}" onkeyup="clearAllFees({$range[$rangeIdentifier]})"
value="{$price|string_format:"%.6f"}"
style="width: 45px;"
/>
{$currency->getSign('right')} {l s='(tax excl.)'}
</td>
{/foreach}
</tr>
{/foreach}
{/if}
<tr>
<td colspan="{$ranges|sizeof + 1}" class="center" style="border-bottom: none; height: 40px;">
<input type="hidden" name="submitFees{$table}" value="1" />
{if sizeof($ranges) && !$carrierSelected->is_free}
<input type="submit" value="{l s=' Save '}" class="button" />
{else if $carrierSelected->is_free}
{l s='This is a free carrier'}
{else}
{l s='No ranges is set for this carrier'}
{/if}
</td>
</tr>
<tr>
<td colspan="{$ranges|sizeof + 1}" class="text-center">
<input type="hidden" name="submitFees{$table}" value="1" />
{if sizeof($ranges) && !$carrierSelected->is_free}
<input type="submit" value="{l s='Save'}" class="btn btn-default" />
{else if $carrierSelected->is_free}
<span>{l s='This is a free carrier'}</span>
{else}
<span>{l s='No ranges is set for this carrier'}</span>
{/if}
</td>
</tr>
</tbody>
</table>
{/if}
<input type="hidden" name="id_carrier" value="{$id_carrier}" />
admin-dev/themes/default/template/helpers/options/options.tpl
+28 -23
View File
@@ -50,7 +50,7 @@
{* Category description *}
{if (isset($categoryData['description']) && $categoryData['description'])}
<div class="optionsDescription">{$categoryData['description']}</div>
<div>{$categoryData['description']}</div>
{/if}
{* Category info *}
{if (isset($categoryData['info']) && $categoryData['info'])}
@@ -58,8 +58,7 @@
{/if}
{if !$categoryData['hide_multishop_checkbox'] && $use_multishop}
<input type="checkbox" style="vertical-align: text-top" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check/uncheck all'}</b> {l s='(Check boxes if you want to set a custom value for this shop or group shop context)'}
<div class="separation"></div>
<input type="checkbox" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check/uncheck all'}</b> {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 @@
</div>
{elseif $field['type'] == 'radio'}
{foreach $field['choices'] AS $k => $v}
<div class="col-lg-9">
<div class="col-lg-9">
{foreach $field['choices'] AS $k => $v}
<p class="radio">
<input type="radio" name="{$key}" id="{$key}_{$k}" value="{$k}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
<label class="col-lg-3" for="{$key}_{$k}"> {$v}</label>
</p>
</div>
{/foreach}
{/foreach}
</div>
{elseif $field['type'] == 'checkbox'}
{foreach $field['choices'] AS $k => $v}
<div class="col-lg-9">
<div class="col-lg-9">
{foreach $field['choices'] AS $k => $v}
<p class="checkbox">
<input type="checkbox" name="{$key}" id="{$key}{$k}_on" value="{$k|intval}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
<label class="col-lg-3" for="{$key}{$k}_on"> {$v}</label>
</p>
</div>
{/foreach}
{/foreach}
</div>
{elseif $field['type'] == 'text'}
<div class="col-lg-9">
<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
@@ -164,8 +166,10 @@
<input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
</div>
{elseif $field['type'] == 'price'}
<div class="col-lg-9">
{$currency_left_sign}<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />{$currency_right_sign} {l s='(tax excl.)'}
<div class="input-group col-lg-9">
<span class="input-group-addon">{$currency->prefix}{$currency->suffix} {l s='(tax excl.)'}</span>
<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
</div>
{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
@@ -228,16 +232,17 @@
{elseif $field['type'] == 'selectLang'}
{foreach $languages as $language}
<div id="{$key}_{$language.id_lang}" style="display: {if $language.id_lang == $current_id_lang}block{else}none{/if};" class="col-lg-9">
<select name="{$key}_{$language.iso_code|upper}">
{foreach $field['list'] AS $k => $v}
<option value="{if isset($v.cast)}{$v.cast[$v[$field.identifier]]}{else}{$v[$field.identifier]}{/if}"
{if $field['value'][$language.id_lang] == $v['name']} selected="selected"{/if}>
{$v['name']}
</option>
{/foreach}
</select>
</div>
<div id="{$key}_{$language.id_lang}" style="display: {if $language.id_lang == $current_id_lang}block{else}none{/if};" class="col-lg-9">
<select name="{$key}_{$language.iso_code|upper}">
{foreach $field['list'] AS $k => $v}
<option value="{if isset($v.cast)}{$v.cast[$v[$field.identifier]]}{else}{$v[$field.identifier]}{/if}"
{if $field['value'][$language.id_lang] == $v['name']} selected="selected"{/if}>
{$v['name']}
</option>
{/foreach}
</select>
</div>
{/foreach}
{/if}
controllers/admin/AdminCarriersController.php
+1
View File
@@ -30,6 +30,7 @@ class AdminCarriersControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'carrier';
$this->className = 'Carrier';
$this->lang = false;
controllers/admin/AdminRangePriceController.php
+1 -2
View File
@@ -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)'),
controllers/admin/AdminRangeWeightController.php
+1
View File
@@ -28,6 +28,7 @@ class AdminRangeWeightControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'range_weight';
$this->className = 'RangeWeight';
$this->lang = false;
controllers/admin/AdminShippingController.php
+1
View File
@@ -30,6 +30,7 @@ class AdminShippingControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
$this->table = 'delivery';