'reporting_authority_' . $i,
- 'id'=>'reporting_authority_' . $i,
+ 'name'=>'reporting_authority[]',
'class'=>'valid_chars form-control input-sm',
'placeholder'=>$this->lang->line('taxes_reporting_authority'),
'value'=>$reporting_authority
@@ -56,8 +54,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction)
'tax_group_sequence_' . $i,
- 'id'=>'tax_group_sequence_' . $i,
+ 'name'=>'tax_group_sequence[]',
'class'=>'valid_chars form-control input-sm',
'placeholder' => $this->lang->line('taxes_sequence'),
'value'=>$tax_group_sequence
@@ -68,8 +65,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction)
'cascade_sequence_' . $i,
- 'id'=>'cascade_sequence_' . $i,
+ 'name'=>'cascade_sequence[]',
'class'=>'valid_chars form-control input-sm',
'placeholder'=>$this->lang->line('taxes_cascade_sequence'),
'value'=>$cascade_sequence
@@ -80,77 +76,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction)
-
-
-
-
- lang->line('taxes_tax_jurisdiction') . ' 1', 'jurisdiction_name_1', array('class'=>'control-label col-xs-2')); ?>
-
- 'jurisdiction_name_1',
- 'id'=>'jurisdiction_name_1',
- 'class'=>'valid_chars form-control input-sm required',
- 'placeholder'=>$this->lang->line('taxes_jurisdiction_name'),
- 'value'=>''
- );
- echo form_input($form_data);
- ?>
-
-
- 'tax_group_1',
- 'id'=>'tax_group_1',
- 'class'=>'valid_chars form-control input-sm required',
- 'placeholder'=>$this->lang->line('taxes_tax_group'),
- 'value'=>''
- );
- echo form_input($form_data);
- ?>
-
-
- 'form-control')); ?>
-
-
- 'reporting_authority_1',
- 'id'=>'reporting_authority_1',
- 'class'=>'valid_chars form-control input-sm',
- 'placeholder'=>$this->lang->line('taxes_reporting_authority'),
- 'value'=>''
- );
- echo form_input($form_data);
- ?>
-
-
- 'tax_group_sequence_1',
- 'id'=>'tax_group_sequence_1',
- 'class'=>'valid_chars form-control input-sm',
- 'placeholder' => $this->lang->line('taxes_sequence'),
- 'value'=>''
- );
- echo form_input($form_data);
- ?>
-
-
- 'cascade_sequence_1',
- 'id'=>'cascade_sequence_1',
- 'class'=>'valid_chars form-control input-sm',
- 'placeholder'=>$this->lang->line('taxes_cascade_sequence'),
- 'value'=>''
- );
- echo form_input($form_data);
- ?>
-
-
-
-
-
+
1)
{
$(".remove_tax_category").show();
@@ -41,51 +41,59 @@
var id = $(this).parent().find('input').attr('id');
id = id.replace(/.*?_(\d+)$/g, "$1");
- var previous_tax_category_id_id = 'tax_category_id_' + id;
var previous_tax_category_id = 'tax_category_' + id;
- var previous_default_tax_rate_id = 'default_tax_rate_' + id;
- var previous_tax_group_sequence_id = 'tax_group_sequence_' + id;
var block = $(this).parent().clone(true);
var new_block = block.insertAfter($(this).parent());
- var new_tax_category_id_id = 'tax_category_id_' + ++tax_categories_count;
+ ++tax_categories_count;
var new_tax_category_id = 'tax_category_' + tax_categories_count;
- var new_default_tax_rate_id = 'default_tax_rate_' + tax_categories_count;
- var new_tax_group_sequence_id = 'tax_group_sequence_' + tax_categories_count;
$(new_block).find('label').html("lang->line('taxes_tax_category'); ?> " + tax_categories_count).attr('for', new_tax_category_id).attr('class', 'control-label col-xs-2');
- $(new_block).find("input[name='"+previous_tax_category_id_id+"']").attr('name', new_tax_category_id_id).val('-1');
- $(new_block).find("input[id='"+previous_tax_category_id+"']").attr('id', new_tax_category_id).removeAttr('disabled').attr('name', new_tax_category_id).attr('class', 'form-control input-sm').val('');
- $(new_block).find("input[id='"+previous_default_tax_rate_id+"']").attr('id', new_default_tax_rate_id).removeAttr('disabled').attr('name', new_default_tax_rate_id).attr('class', 'form-control input-sm').val('');
- $(new_block).find("input[id='"+previous_tax_group_sequence_id+"']").attr('id', new_tax_group_sequence_id).removeAttr('disabled').attr('name', new_tax_group_sequence_id).attr('class', 'form-control input-sm').val('');
- hide_show_remove();
+ $(new_block).find("input[name='tax_category[]']").attr('id', new_tax_category_id).removeAttr('disabled').attr('class', 'form-control input-sm required').val('');
+ $(new_block).find("input[name='tax_group_sequence[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='tax_category_id[]']").val('-1');
+ hide_show_remove_tax_category();
};
var remove_tax_category = function() {
$(this).parent().remove();
- hide_show_remove();
+ hide_show_remove_tax_category();
};
var init_add_remove_tax_categories = function() {
$('.add_tax_category').click(add_tax_category);
$('.remove_tax_category').click(remove_tax_category);
- hide_show_remove();
+ hide_show_remove_tax_category();
};
init_add_remove_tax_categories();
var duplicate_found = false;
+
// run validator once for all fields
- $.validator.addMethod('tax_category' , function(value, element) {
+ $.validator.addMethod("check4TaxCategoryDups" , function(value, element) {
var value_count = 0;
- $("input[name*='tax_category']").each(function() {
+ $('input[name="tax_category[]"]').each(function() {
value_count = $(this).val() == value ? value_count + 1 : value_count;
});
- return value_count < 2;
+ if (value_count > 1) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_category_duplicate'); ?>");
- $.validator.addMethod('valid_chars', function(value, element) {
- return value.indexOf('_') === -1;
+ $.validator.addMethod('validateTaxCategoryCharacters', function(value, element) {
+ if ((value.indexOf('_') != -1)) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_category_invalid_chars'); ?>");
+ $.validator.addMethod('requireTaxCategory', function(value, element) {
+ if (value .trim() == '') {
+ return false;
+ }
+ return true;
+ }, "lang->line('taxes_tax_category_required'); ?>");
+
$('#tax_categories_form').validate($.extend(form_support.handler, {
submitHandler: function(form) {
$(form).ajaxSubmit({
@@ -96,41 +104,25 @@
dataType: 'json'
});
},
-
- errorLabelContainer: "#tax_category_error_message_box",
-
- rules:
- {
- $tax_category_data)
- {
- ?>
- :
- {
- required: true,
- tax_category: true,
- valid_chars: true
+ invalidHandler: function(event, validator) {
+ $.notify("lang->line('common_correct_errors'); ?>");
},
-
- },
-
- messages:
- {
- $tax_category_data)
- {
- ?>
- : "lang->line('taxes_tax_category_required'); ?>",
-
- }
+ errorLabelContainer: "#tax_category_error_message_box"
}));
+
+ $tax_category_data)
+ {
+ ?>
+ $('').rules( "add", {
+ requireTaxCategory: true,
+ check4TaxCategoryDups: true,
+ validateTaxCategoryCharacters: true
+ });
+
+
});
diff --git a/application/views/taxes/tax_codes.php b/application/views/taxes/tax_codes.php
index ad2bd7220..d061fb500 100644
--- a/application/views/taxes/tax_codes.php
+++ b/application/views/taxes/tax_codes.php
@@ -26,7 +26,7 @@
tax_code_count = 1;
}
- var hide_show_remove = function() {
+ var hide_show_remove_tax_code = function() {
if ($("input[name*='tax_code']:enabled").length > 1)
{
$(".remove_tax_code").show();
@@ -38,59 +38,64 @@
};
var add_tax_code = function() {
- var id = $(this).parent().find('input').attr('id');
+ var id = $(this).parent().find("input[name='tax_code[]']").attr('id');
id = id.replace(/.*?_(\d+)$/g, "$1");
- var previous_tax_code_id_id = 'tax_code_id_' + id;
var previous_tax_code_id = 'tax_code_' + id;
- var previous_tax_code_name_id = 'tax_code_name_' + id;
- var previous_city_id = 'city_' + id;
- var previous_statte_id = 'state_' + id;
var block = $(this).parent().clone(true);
var new_block = block.insertAfter($(this).parent());
++tax_code_count;
- var new_tax_code_id_id = 'tax_code_id_' + tax_code_count;
var new_tax_code_id = 'tax_code_' + tax_code_count;
- var new_tax_code_name_id = 'tax_code_name_' + tax_code_count;
- var new_city_id = 'city_' + tax_code_count;
- var new_state_id = 'state_' + tax_code_count;
$(new_block).find('label').html("lang->line('taxes_tax_code'); ?> " + tax_code_count).attr('for', new_tax_code_id).attr('class', 'control-label col-xs-2');
- $(new_block).find("input[id='"+previous_tax_code_id+"']").attr('id', new_tax_code_id).removeAttr('disabled').attr('name', new_tax_code_id).attr('class', 'form-control text-uppercase required input-sm').val('');
- $(new_block).find("input[id='"+previous_tax_code_name_id+"']").attr('id', new_tax_code_name_id).removeAttr('disabled').attr('name', new_tax_code_name_id).attr('class', 'form-control required input-sm').val('');
- $(new_block).find("input[id='"+previous_city_id+"']").attr('id', new_city_id).removeAttr('disabled').attr('name', new_city_id).attr('class', 'form-control input-sm').val('');
- $(new_block).find("input[id='"+previous_statte_id+"']").attr('id', new_state_id).removeAttr('disabled').attr('name', new_state_id).attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='tax_code[]']").attr('id', new_tax_code_id).removeAttr('disabled').attr('class', 'form-control text-uppercase required input-sm').val('');
+ $(new_block).find("input[name='tax_code_name[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
+ $(new_block).find("input[name='city[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='state[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='tax_code_id[]']").val('-1');
- hide_show_remove();
+ hide_show_remove_tax_code();
};
var remove_tax_code = function() {
$(this).parent().remove();
- hide_show_remove();
+ hide_show_remove_tax_code();
};
var init_add_remove_tax_codes = function() {
$('.add_tax_code').click(add_tax_code);
$('.remove_tax_code').click(remove_tax_code);
- hide_show_remove();
+ hide_show_remove_tax_code();
};
init_add_remove_tax_codes();
- var duplicate_found = false;
// run validator once for all fields
- $.validator.addMethod('tax_code' , function(value, element) {
+ $.validator.addMethod('check4TaxCodeDups' , function(value, element) {
var value_count = 0;
- $("input[name*='tax_code']").each(function() {
+ $("input[name='tax_code[]']").each(function() {
value_count = $(this).val() == value ? value_count + 1 : value_count;
});
- return value_count < 2;
+ if (value_count > 1) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_code_duplicate'); ?>");
- $.validator.addMethod('valid_chars', function(value, element) {
- return value.indexOf('_') === -1;
+ $.validator.addMethod('validateTaxCodeCharacters', function(value, element) {
+ if ((value.indexOf('_') != -1)) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_code_invalid_chars'); ?>");
+ $.validator.addMethod('requireTaxCode', function(value, element) {
+ if (value .trim() == '') {
+ return false;
+ }
+ return true;
+ }, "lang->line('taxes_tax_code_required'); ?>");
+
$('#tax_codes_form').validate($.extend(form_support.handler, {
- submitHandler: function(form) {
+ submitHandler: function(form, event) {
$(form).ajaxSubmit({
success: function(response) {
$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
@@ -99,41 +104,25 @@
dataType: 'json'
});
},
-
- errorLabelContainer: "#tax_code_error_message_box",
-
- rules:
- {
- $tax_code_data)
- {
- ?>
- :
- {
- required: true,
- tax_code: true,
- valid_chars: true
- },
-
+ invalidHandler: function(event, validator) {
+ $.notify("lang->line('common_correct_errors'); ?>");
},
-
- messages:
- {
- $tax_code_data)
- {
- ?>
- : "lang->line('taxes_tax_code_required'); ?>",
-
- }
+ errorLabelContainer: "#tax_code_error_message_box"
}));
+
+ $tax_code_data)
+ {
+ ?>
+ $('').rules( "add", {
+ requireTaxCode: true,
+ check4TaxCodeDups: true,
+ validateTaxCodeCharacters: true
+ });
+
+
});
diff --git a/application/views/taxes/tax_jurisdictions.php b/application/views/taxes/tax_jurisdictions.php
index e72c98dd0..1327c54f6 100644
--- a/application/views/taxes/tax_jurisdictions.php
+++ b/application/views/taxes/tax_jurisdictions.php
@@ -27,7 +27,7 @@
}
var tax_type_options = '';
- var hide_show_remove = function() {
+ var hide_show_remove_tax_jurisdiction = function() {
if ($("input[name*='tax_jurisdiction']:enabled").length > 1)
{
$(".remove_tax_jurisdiction").show();
@@ -42,61 +42,61 @@
var id = $(this).parent().find('input').attr('id');
id = id.replace(/.*?_(\d+)$/g, "$1");
- var previous_jurisdiction_id = 'jurisdiction_id_' + id;
var previous_jurisdiction_name_id = 'jurisdiction_name_' + id;
- var previous_tax_group_id = 'tax_group_' + id;
- var previous_tax_type_id = 'tax_type_' + id;
- var previous_reporting_authority_id = 'reporting_authority_' + id;
- var previous_tax_group_sequence_id = 'tax_group_sequence_' + id;
- var previous_cascade_sequence_id = 'cascade_sequence_' + id;
var block = $(this).parent().clone(true);
var new_block = block.insertAfter($(this).parent());
++tax_jurisdictions_count;
- var new_jurisdiction_id = 'jurisdiction_id_' + tax_jurisdictions_count;
var new_jurisdiction_name_id = 'jurisdiction_name_' + tax_jurisdictions_count;
- var new_tax_group_id = 'tax_group_' + tax_jurisdictions_count;
- var new_tax_type_id = 'tax_type_' + tax_jurisdictions_count;
- var new_reporting_authority_id = 'reporting_authority_' + tax_jurisdictions_count;
- var new_tax_group_sequence_id = 'tax_group_sequence_' + tax_jurisdictions_count;
- var new_cascade_sequence_id = 'cascade_sequence_' + tax_jurisdictions_count;
$(new_block).find('label').html("lang->line('taxes_tax_jurisdiction'); ?> " + tax_jurisdictions_count).attr('for', new_jurisdiction_name_id).attr('class', 'control-label col-xs-2');
- $(new_block).find("input[name='"+previous_jurisdiction_id+"']").attr('name', new_jurisdiction_id).val('-1');
- $(new_block).find("input[id='"+previous_jurisdiction_name_id+"']").attr('id', new_jurisdiction_name_id).removeAttr('disabled').attr('name', new_jurisdiction_name_id).attr('class', 'form-control required input-sm').val('');
- $(new_block).find("input[id='"+previous_tax_group_id+"']").attr('id', new_tax_group_id).removeAttr('disabled').attr('name', new_tax_group_id).attr('class', 'form-control required input-sm').val('');
- $(new_block).find("select[name='"+previous_tax_type_id+"']").attr('name', new_tax_type_id).removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
- $(new_block).find("input[id='"+previous_reporting_authority_id+"']").attr('id', new_reporting_authority_id).removeAttr('disabled').attr('name', new_reporting_authority_id).attr('class', 'form-control input-sm').val('');
- $(new_block).find("input[id='"+previous_tax_group_sequence_id+"']").attr('id', new_tax_group_sequence_id).removeAttr('disabled').attr('name', new_tax_group_sequence_id).attr('class', 'form-control input-sm').val('');
- $(new_block).find("input[id='"+previous_cascade_sequence_id+"']").attr('id', new_cascade_sequence_id).removeAttr('disabled').attr('name', new_cascade_sequence_id).attr('class', 'form-control input-sm').val('');
- hide_show_remove();
+ $(new_block).find("input[name='jurisdiction_name[]']").attr('id', new_jurisdiction_name_id).removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
+ $(new_block).find("input[name='tax_group[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
+ $(new_block).find("select[name='tax_type[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
+ $(new_block).find("input[name='reporting_authority[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='tax_group_sequence[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='cascade_sequence[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
+ $(new_block).find("input[name='jurisdiction_id[]']").val('-1');
+ hide_show_remove_tax_jurisdiction();
};
var remove_tax_jurisdiction = function() {
$(this).parent().remove();
- hide_show_remove();
+ hide_show_remove_tax_jurisdiction();
};
var init_add_remove_tax_jurisdiction = function() {
$('.add_tax_jurisdiction').click(add_tax_jurisdiction);
$('.remove_tax_jurisdiction').click(remove_tax_jurisdiction);
- hide_show_remove();
+ hide_show_remove_tax_jurisdiction();
};
init_add_remove_tax_jurisdiction();
- var duplicate_found = false;
// run validator once for all fields
- $.validator.addMethod('tax_jurisdiction' , function(value, element) {
+ $.validator.addMethod('check4TaxJurisdictionDups' , function(value, element) {
var value_count = 0;
- $("input[name*='tax_jurisdiction']").each(function() {
+ $("input[name='jurisdiction_name[]']").each(function() {
value_count = $(this).val() == value ? value_count + 1 : value_count;
});
- return value_count < 2;
+ if (value_count > 1) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_jurisdiction_duplicate'); ?>");
- $.validator.addMethod('valid_chars', function(value, element) {
- return value.indexOf('_') === -1;
+ $.validator.addMethod('validateTaxJurisdictionCharacters', function(value, element) {
+ if ((value.indexOf('_') != -1)) {
+ return false;
+ }
+ return true;
}, "lang->line('taxes_tax_jurisdiction_invalid_chars'); ?>");
+ $.validator.addMethod('requireTaxJurisdiction', function(value, element) {
+ if (value .trim() == '') {
+ return false;
+ }
+ return true;
+ }, "lang->line('taxes_tax_jurisdiction_required'); ?>");
+
$('#tax_jurisdictions_form').validate($.extend(form_support.handler, {
submitHandler: function(form) {
$(form).ajaxSubmit({
@@ -107,41 +107,24 @@
dataType: 'json'
});
},
-
- errorLabelContainer: "#tax_jurisdiction_error_message_box",
-
- rules:
- {
- $tax_jurisdiction_data)
- {
- ?>
- :
- {
- required: true,
- tax_jurisdiction: true,
- valid_chars: true
- },
-
+ invalidHandler: function(event, validator) {
+ $.notify("lang->line('common_correct_errors'); ?>");
},
-
- messages:
- {
- $tax_jurisdiction_data)
- {
- ?>
- : "lang->line('taxes_tax_jurisdiction_required'); ?>",
-
- }
+ errorLabelContainer: "#tax_jurisdiction_error_message_box"
}));
+
+ $tax_jurisdiction_data)
+ {
+ ?>
+ $('').rules( "add", {
+ requireTaxJurisdiction: true,
+ check4TaxJurisdictionDups: true,
+ validateTaxJurisdictionCharacters: true
+ });
+
});