diff --git a/app/Http/Controllers/Modals/Taxes.php b/app/Http/Controllers/Modals/Taxes.php
index 1cb1512b8..ec0234b7d 100644
--- a/app/Http/Controllers/Modals/Taxes.php
+++ b/app/Http/Controllers/Modals/Taxes.php
@@ -33,7 +33,13 @@ class Taxes extends Controller
'compound' => trans('taxes.compound'),
];
- $html = view('modals.taxes.create', compact('types'))->render();
+ $tax_selector = false;
+
+ if (request()->has('tax_selector')) {
+ $tax_selector = request()->get('tax_selector');
+ }
+
+ $html = view('modals.taxes.create', compact('types', 'tax_selector'))->render();
return response()->json([
'success' => true,
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index 733de81fb..a183dac44 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/create.blade.php
@@ -389,7 +389,7 @@
url: '{{ url("modals/taxes/create") }}',
type: 'GET',
dataType: 'JSON',
- data: {name: tax_name},
+ data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) {
if (json['success']) {
$('body').append(json['html']);
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index ddec63301..736cdf228 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/edit.blade.php
@@ -387,7 +387,7 @@
url: '{{ url("modals/taxes/create") }}',
type: 'GET',
dataType: 'JSON',
- data: {name: tax_name},
+ data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) {
if (json['success']) {
$('body').append(json['html']);
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
index 90ac7dc98..20c6a0465 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/incomes/invoices/create.blade.php
@@ -389,7 +389,7 @@
url: '{{ url("modals/taxes/create") }}',
type: 'GET',
dataType: 'JSON',
- data: {name: tax_name},
+ data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) {
if (json['success']) {
$('body').append(json['html']);
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
index 56834895d..c62194d9d 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/incomes/invoices/edit.blade.php
@@ -387,7 +387,7 @@
url: '{{ url("modals/taxes/create") }}',
type: 'GET',
dataType: 'JSON',
- data: {name: tax_name},
+ data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) {
if (json['success']) {
$('body').append(json['html']);
diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
index 4b140da6f..5c6b1f095 100644
--- a/resources/views/modals/taxes/create.blade.php
+++ b/resources/views/modals/taxes/create.blade.php
@@ -65,6 +65,12 @@
$("#tax_id").append('');
$('#tax_id').trigger('change');
$("#tax_id").select2('refresh');
+
+ @if ($tax_selector)
+ $("{{ $tax_selector }}").append('');
+ $('{{ $tax_selector }}').trigger('change');
+ $("{{ $tax_selector }}").select2('refresh');
+ @endif
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();