close #651 Fixed: Invoice/Bill create page, if you add new tax. it mi…

…ssing tax type column
akaunting · Nov 29, 2018 · 1d63b2d · 1d63b2d
1 parent 3fac930
commit 1d63b2d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/app/Http/Controllers/Modals/Taxes.php b/app/Http/Controllers/Modals/Taxes.php
@@ -27,7 +27,13 @@ public function __construct()
      */
     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([
             'success' => true,

diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
@@ -371,6 +371,8 @@
         $(document).on('click', '#tax-add-new', function(e) {
             tax_name = $('.select2-search__field').val();
 
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
             $('#modal-create-tax').remove();
 
             $.ajax({

diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
@@ -379,6 +379,8 @@
         $(document).on('click', '#tax-add-new', function(e) {
             tax_name = $('.select2-search__field').val();
 
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
             $('#modal-create-tax').remove();
 
             $.ajax({

diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
@@ -371,6 +371,8 @@
         $(document).on('click', '#tax-add-new', function(e) {
             tax_name = $('.select2-search__field').val();
 
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
             $('#modal-create-tax').remove();
 
             $.ajax({

diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
@@ -379,6 +379,8 @@
         $(document).on('click', '#tax-add-new', function(e) {
             tax_name = $('.select2-search__field').val();
 
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
             $('#modal-create-tax').remove();
 
             $.ajax({

diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
@@ -11,6 +11,8 @@
 
                     {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
+                    {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }}
+
                     {!! Form::hidden('enabled', '1', []) !!}
                 </div>
                 {!! Form::close() !!}
@@ -28,6 +30,12 @@
 <script type="text/javascript">
     $(document).ready(function(){
         $('#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) {

diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
@@ -74,7 +74,7 @@
                                         @foreach($module->screenshots as $screenshot)
                                             @php if (empty($status)) { $status = 5; } else { $status = 1; } @endphp
                                             <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 }}">
                                                 </a>
 
@@ -86,11 +86,11 @@
 
                                         <div class="carousel-navigation-message">
                                             @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>
                                                 <span class="sr-only">{{ trans('pagination.previous') }}</span>
                                             </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>
                                                 <span class="sr-only">{{ trans('pagination.next') }}</span>
                                             </a>