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

close #651 Fixed: Invoice/Bill create page, if you add new tax. it missing tax type column

Browse Source
This commit is contained in:
cuneytsenturk 2018-11-29 11:47:20 +03:00
parent 3fac930d80
commit 1d63b2d85a
7 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,13 @@ class Taxes extends Controller
*/ */
public function create() public function create()
{ {
$html = view('modals.taxes.create')->render(); $types = [
'normal' => trans('taxes.normal'),
'inclusive' => trans('taxes.inclusive'),
'compound' => trans('taxes.compound'),
];
$html = view('modals.taxes.create', compact('types'))->render();
return response()->json([ return response()->json([
'success' => true, 'success' => true,

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

@ -371,6 +371,8 @@
$(document).on('click', '#tax-add-new', function(e) { $(document).on('click', '#tax-add-new', function(e) {
tax_name = $('.select2-search__field').val(); tax_name = $('.select2-search__field').val();
$('body > .select2-container.select2-container--default.select2-container--open').remove();
$('#modal-create-tax').remove(); $('#modal-create-tax').remove();
$.ajax({ $.ajax({

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

@ -379,6 +379,8 @@
$(document).on('click', '#tax-add-new', function(e) { $(document).on('click', '#tax-add-new', function(e) {
tax_name = $('.select2-search__field').val(); tax_name = $('.select2-search__field').val();
$('body > .select2-container.select2-container--default.select2-container--open').remove();
$('#modal-create-tax').remove(); $('#modal-create-tax').remove();
$.ajax({ $.ajax({

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

@ -371,6 +371,8 @@
$(document).on('click', '#tax-add-new', function(e) { $(document).on('click', '#tax-add-new', function(e) {
tax_name = $('.select2-search__field').val(); tax_name = $('.select2-search__field').val();
$('body > .select2-container.select2-container--default.select2-container--open').remove();
$('#modal-create-tax').remove(); $('#modal-create-tax').remove();
$.ajax({ $.ajax({

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

@ -379,6 +379,8 @@
$(document).on('click', '#tax-add-new', function(e) { $(document).on('click', '#tax-add-new', function(e) {
tax_name = $('.select2-search__field').val(); tax_name = $('.select2-search__field').val();
$('body > .select2-container.select2-container--default.select2-container--open').remove();
$('#modal-create-tax').remove(); $('#modal-create-tax').remove();
$.ajax({ $.ajax({

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

@ -11,6 +11,8 @@
{{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }} {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
{{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }}
{!! Form::hidden('enabled', '1', []) !!} {!! Form::hidden('enabled', '1', []) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
@ -28,6 +30,12 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#modal-create-tax').modal('show'); $('#modal-create-tax').modal('show');
$('#rate').focus();
$("#type").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.types', 1)]) }}"
});
}); });
$(document).on('click', '#button-create-tax', function (e) { $(document).on('click', '#button-create-tax', function (e) {

6
resources/views/modules/item/show.blade.php
View File

@ -74,7 +74,7 @@
@foreach($module->screenshots as $screenshot) @foreach($module->screenshots as $screenshot)
@php if (empty($status)) { $status = 5; } else { $status = 1; } @endphp @php if (empty($status)) { $status = 5; } else { $status = 1; } @endphp
<div class="item @if($status == 5) {{ 'active' }} @endif"> <div class="item @if($status == 5) {{ 'active' }} @endif">
<a data-toggle="lightbox" href="{{ $screenshot->path_string }}" data-gallery="{{ $module->slug}}"> <a href="{{ $screenshot->path_string }}" data-toggle="lightbox" data-gallery="{{ $module->slug}}">
<img class="img-fluid d-block w-100" src="{{ $screenshot->path_string }}" alt="{{ $screenshot->alt_attribute }}"> <img class="img-fluid d-block w-100" src="{{ $screenshot->path_string }}" alt="{{ $screenshot->alt_attribute }}">
</a> </a>
@ -86,11 +86,11 @@
<div class="carousel-navigation-message"> <div class="carousel-navigation-message">
@if (($item->module && (count($module->screenshots) > 1)) || (!$item->module && (count($module->screenshots) > 1))) @if (($item->module && (count($module->screenshots) > 1)) || (!$item->module && (count($module->screenshots) > 1)))
<a class="left carousel-control" href="#carousel-screenshot-generic" role="button" data-slide="prev"> <a href="#carousel-screenshot-generic" class="left carousel-control" role="button" data-slide="prev">
<i class="fa fa-chevron-left"></i> <i class="fa fa-chevron-left"></i>
<span class="sr-only">{{ trans('pagination.previous') }}</span> <span class="sr-only">{{ trans('pagination.previous') }}</span>
</a> </a>
<a class="right carousel-control" href="#carousel-screenshot-generic" role="button" data-slide="next"> <a href="#carousel-screenshot-generic" class="right carousel-control" role="button" data-slide="next">
<i class="fa fa-chevron-right"></i> <i class="fa fa-chevron-right"></i>
<span class="sr-only">{{ trans('pagination.next') }}</span> <span class="sr-only">{{ trans('pagination.next') }}</span>
</a> </a>