[*] BO : you can now affect a zone to multiple countries and to multiple states
This commit is contained in:
vChabot
@@ -996,3 +996,15 @@ if (Tools::isSubmit('ajaxUpdateTaxRule'))
|
||||
die(Tools::jsonEncode($output));
|
||||
}
|
||||
|
||||
if (Tools::isSubmit('getZones'))
|
||||
{
|
||||
$zones = Zone::getZones();
|
||||
$html = '<select id="zone_to_affect" name="zone_to_affect">';
|
||||
foreach ($zones as $z)
|
||||
{
|
||||
$html .= '<option value="'.$z['id_zone'].'">'.$z['name'].'</option>';
|
||||
}
|
||||
$html .= '</select>';
|
||||
$array = array('hasError' => false, 'errors' => '', 'data' => $html);
|
||||
die(Tools::jsonEncode($html));
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
{*
|
||||
* 2007-2011 PrestaShop
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Academic Free License (AFL 3.0)
|
||||
* that is bundled with this package in the file LICENSE.txt.
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* http://opensource.org/licenses/afl-3.0.php
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to license@prestashop.com so we can send you a copy immediately.
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2011 PrestaShop SA
|
||||
* @version Release: $Revision: 9432 $
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
</table>
|
||||
{if $bulk_actions}
|
||||
<p>
|
||||
{if $bulk_actions|count > 1}
|
||||
<select id="select_submitBulk" name="select_submitBulk">
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
<option value="{$key}">{$params.text}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<input type="submit" class="button" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
|
||||
{else}
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
{if $key == 'affectzone'}
|
||||
<select id="zone_to_affect" name="zone_to_affect">
|
||||
{foreach $zones as $z}
|
||||
<option value="{$z['id_zone']}">{$z['name']}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{/if}
|
||||
<input type="submit" class="button" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
|
||||
{/foreach}
|
||||
{/if}
|
||||
</p>
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input type="hidden" name="token" value="{$token}" />
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
var confirmation = new Array();
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
{if isset($params.confirm)}
|
||||
confirmation['{$key}{$table}'] = "{$params.confirm}";
|
||||
{/if}
|
||||
{/foreach}
|
||||
|
||||
$(document).ready(function(){
|
||||
{if $bulk_actions|count > 1}
|
||||
$('#submitBulk').click(function(){
|
||||
if (confirmation[$(this).val()])
|
||||
return confirm(confirmation[$(this).val()]);
|
||||
else
|
||||
return true;
|
||||
});
|
||||
$('#select_submitBulk').change(function(){
|
||||
if ($(this).val() == 'affectzone')
|
||||
loadZones();
|
||||
else if (loaded)
|
||||
$('#zone_to_affect').fadeOut('slow');
|
||||
});
|
||||
{/if}
|
||||
});
|
||||
var loaded = false;
|
||||
function loadZones()
|
||||
{
|
||||
if (!loaded)
|
||||
{
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: 'ajax.php',
|
||||
data: 'getZones=true&token={$token}',
|
||||
async : true,
|
||||
cache: false,
|
||||
dataType: 'json',
|
||||
success: function(data) {
|
||||
var html = $(data);
|
||||
html.hide();
|
||||
$('#select_submitBulk').after(html);
|
||||
html.fadeIn('slow');
|
||||
}
|
||||
});
|
||||
loaded = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#zone_to_affect').fadeIn('slow');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,107 @@
|
||||
{*
|
||||
* 2007-2011 PrestaShop
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Academic Free License (AFL 3.0)
|
||||
* that is bundled with this package in the file LICENSE.txt.
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* http://opensource.org/licenses/afl-3.0.php
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to license@prestashop.com so we can send you a copy immediately.
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2011 PrestaShop SA
|
||||
* @version Release: $Revision: 9432 $
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
</table>
|
||||
{if $bulk_actions}
|
||||
<p>
|
||||
{if $bulk_actions|count > 1}
|
||||
<select id="select_submitBulk" name="select_submitBulk">
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
<option value="{$key}">{$params.text}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<input type="submit" class="button" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
|
||||
{else}
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
{if $key == 'affectzone'}
|
||||
<select id="zone_to_affect" name="zone_to_affect">
|
||||
{foreach $zones as $z}
|
||||
<option value="{$z['id_zone']}">{$z['name']}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{/if}
|
||||
<input type="submit" class="button" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
|
||||
{/foreach}
|
||||
{/if}
|
||||
</p>
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input type="hidden" name="token" value="{$token}" />
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
var confirmation = new Array();
|
||||
{foreach $bulk_actions as $key => $params}
|
||||
{if isset($params.confirm)}
|
||||
confirmation['{$key}{$table}'] = "{$params.confirm}";
|
||||
{/if}
|
||||
{/foreach}
|
||||
|
||||
$(document).ready(function(){
|
||||
{if $bulk_actions|count > 1}
|
||||
$('#submitBulk').click(function(){
|
||||
if (confirmation[$(this).val()])
|
||||
return confirm(confirmation[$(this).val()]);
|
||||
else
|
||||
return true;
|
||||
});
|
||||
$('#select_submitBulk').change(function(){
|
||||
if ($(this).val() == 'affectzone')
|
||||
loadZones();
|
||||
else if (loaded)
|
||||
$('#zone_to_affect').fadeOut('slow');
|
||||
});
|
||||
{/if}
|
||||
});
|
||||
var loaded = false;
|
||||
function loadZones()
|
||||
{
|
||||
if (!loaded)
|
||||
{
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: 'ajax.php',
|
||||
data: 'getZones=true&token={$token}',
|
||||
async : true,
|
||||
cache: false,
|
||||
dataType: 'json',
|
||||
success: function(data) {
|
||||
var html = $(data);
|
||||
html.hide();
|
||||
$('#select_submitBulk').after(html);
|
||||
html.fadeIn('slow');
|
||||
}
|
||||
});
|
||||
loaded = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#zone_to_affect').fadeIn('slow');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user