shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #727 Fixed: Invoice/Bill new tax added get not selected

Browse Source
This commit is contained in:
cuneytsenturk 2019-01-15 15:58:28 +03:00
parent 7b65cedb41
commit 82e5a48d7d
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Modals/Taxes.php
View File

@ -33,7 +33,13 @@ class Taxes extends Controller
'compound' => trans('taxes.compound'), '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([ return response()->json([
'success' => true, 'success' => true,

2
resources/views/expenses/bills/create.blade.php
View File

@ -389,7 +389,7 @@
url: '{{ url("modals/taxes/create") }}', url: '{{ url("modals/taxes/create") }}',
type: 'GET', type: 'GET',
dataType: 'JSON', dataType: 'JSON',
data: {name: tax_name}, data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) { success: function(json) {
if (json['success']) { if (json['success']) {
$('body').append(json['html']); $('body').append(json['html']);

2
resources/views/expenses/bills/edit.blade.php
View File

@ -387,7 +387,7 @@
url: '{{ url("modals/taxes/create") }}', url: '{{ url("modals/taxes/create") }}',
type: 'GET', type: 'GET',
dataType: 'JSON', dataType: 'JSON',
data: {name: tax_name}, data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) { success: function(json) {
if (json['success']) { if (json['success']) {
$('body').append(json['html']); $('body').append(json['html']);

2
resources/views/incomes/invoices/create.blade.php
View File

@ -389,7 +389,7 @@
url: '{{ url("modals/taxes/create") }}', url: '{{ url("modals/taxes/create") }}',
type: 'GET', type: 'GET',
dataType: 'JSON', dataType: 'JSON',
data: {name: tax_name}, data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) { success: function(json) {
if (json['success']) { if (json['success']) {
$('body').append(json['html']); $('body').append(json['html']);

2
resources/views/incomes/invoices/edit.blade.php
View File

@ -387,7 +387,7 @@
url: '{{ url("modals/taxes/create") }}', url: '{{ url("modals/taxes/create") }}',
type: 'GET', type: 'GET',
dataType: 'JSON', dataType: 'JSON',
data: {name: tax_name}, data: {name: tax_name, tax_selector: '.tax-select2'},
success: function(json) { success: function(json) {
if (json['success']) { if (json['success']) {
$('body').append(json['html']); $('body').append(json['html']);

6
resources/views/modals/taxes/create.blade.php
View File

@ -65,6 +65,12 @@
$("#tax_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>'); $("#tax_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#tax_id').trigger('change'); $('#tax_id').trigger('change');
$("#tax_id").select2('refresh'); $("#tax_id").select2('refresh');
@if ($tax_selector)
$("{{ $tax_selector }}").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $tax_selector }}').trigger('change');
$("{{ $tax_selector }}").select2('refresh');
@endif
}, },
error: function(error, textStatus, errorThrown) { error: function(error, textStatus, errorThrown) {
$('#span-loading').remove(); $('#span-loading').remove();