From 4c3bc16d423b600fc6dd1e4213990a911c8b805e Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Wed, 12 Oct 2011 15:27:06 +0000 Subject: [PATCH] // Added states to HelperForm --- admin-dev/themes/template/form.tpl | 28 +++++++++++-- classes/HelperForm.php | 5 ++- js/form.js | 63 ++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 js/form.js diff --git a/admin-dev/themes/template/form.tpl b/admin-dev/themes/template/form.tpl index d779faf1b..c074e6094 100644 --- a/admin-dev/themes/template/form.tpl +++ b/admin-dev/themes/template/form.tpl @@ -26,22 +26,36 @@ {if $firstCall} + {/if}
@@ -57,6 +71,9 @@ {elseif $key == 'input'} {foreach $field as $input} + {if $input.name == 'id_state'} +
+ {/if}
{if $input.type == 'text'} @@ -116,6 +133,9 @@

{/if}
+ {if $input.name == 'id_state'} +
+ {/if} {/foreach} {elseif $key == 'submit'}
diff --git a/classes/HelperForm.php b/classes/HelperForm.php index d9d2cb5ae..d721b5951 100644 --- a/classes/HelperForm.php +++ b/classes/HelperForm.php @@ -84,7 +84,10 @@ class HelperFormCore extends Helper 'back' => Tools::getValue('back'), 'fields' => $this->fields_form, 'fields_value' => $this->fields_value, - 'requiredFields' => $this->getFieldsRequired() + 'requiredFields' => $this->getFieldsRequired(), + 'vat_number' => file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'), + 'module_dir' => _MODULE_DIR_, + 'contains_states' => Country::containsStates($this->fields_value['id_country']) )); return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/'.$this->tpl); diff --git a/js/form.js b/js/form.js new file mode 100644 index 000000000..ab6579a14 --- /dev/null +++ b/js/form.js @@ -0,0 +1,63 @@ +/* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 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/osl-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 +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +function ajaxStates () +{ + $.ajax({ + url: "ajax.php", + cache: false, + data: "ajaxStates=1&id_country="+$('#id_country').val() + "&id_state=" + $('#id_state').val(), + success: function(html) + { + if (html == 'false') + { + $("#contains_states").fadeOut(); + $('#id_state option[value=0]').attr("selected", "selected"); + } + else + { + $("#id_state").html(html); + $("#contains_states").fadeIn(); + $('#id_state option[value={$obj->id_state}]').attr("selected", "selected"); + } + } + }); + + if (module_dir && vat_number) + { + $.ajax({ + type: "GET", + url: module_dir + "vatnumber/ajax.php?id_country=" + $('#id_country').val(), + success: function(isApplicable) + { + if(isApplicable == 1) + $('#vat_area').show(); + else + $('#vat_area').hide(); + } + }); + } +} \ No newline at end of file