calculate and compound fields added

akaunting · Nov 5, 2018 · 2cb61e2 · 2cb61e2
1 parent bd94e83
commit 2cb61e2
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 0 deletions.
diff --git a/database/migrations/2018_11_05_000000_add_tax_columns.php b/database/migrations/2018_11_05_000000_add_tax_columns.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddTaxColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('taxes', function ($table) {
+            $table->boolean('calculate')->default(0);
+            $table->boolean('compound')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('taxes', function ($table) {
+            $table->dropColumn([
+                'calculate',
+                'compound',
+            ]);
+        });
+    }
+}
diff --git a/resources/lang/en-GB/taxes.php b/resources/lang/en-GB/taxes.php
@@ -4,5 +4,7 @@
 
     'rate'                  => 'Rate',
     'rate_percent'          => 'Rate (%)',
+    'calculate'             => 'Calculate as VAT/GST',
+    'compound'              => 'Compound',
 
 ];
diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php
@@ -12,6 +12,10 @@
 
             {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
+            {{ Form::selectGroup('calculate', trans('taxes.calculate'), 'calculator', ['0' => trans('general.no'), '1' => trans('general.yes')], null, []) }}
+
+            {{ Form::selectGroup('compound', trans('taxes.compound'), 'plus', ['0' => trans('general.no'), '1' => trans('general.yes')], null, []) }}
+
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>
         <!-- /.box-body -->
@@ -34,6 +38,14 @@
             $('#enabled_1').trigger('click');
 
             $('#name').focus();
+
+            $("#calculate").select2({
+                placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.calculate')]) }}"
+            });
+
+            $("#compound").select2({
+                placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.compound')]) }}"
+            });
         });
     </script>
 @endpush
diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php
@@ -17,6 +17,10 @@
 
             {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
+            {{ Form::selectGroup('calculate', trans('taxes.calculate'), 'calculator', ['0' => trans('general.no'), '1' => trans('general.yes')], null, []) }}
+
+            {{ Form::selectGroup('compound', trans('taxes.compound'), 'plus', ['0' => trans('general.no'), '1' => trans('general.yes')], null, []) }}
+
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>
         <!-- /.box-body -->
@@ -36,5 +40,17 @@
     <script type="text/javascript">
         var text_yes = '{{ trans('general.yes') }}';
         var text_no = '{{ trans('general.no') }}';
+
+        $(document).ready(function() {
+            $('#name').focus();
+
+            $("#calculate").select2({
+                placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.calculate')]) }}"
+            });
+
+            $("#compound").select2({
+                placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.compound')]) }}"
+            });
+        });
     </script>
 @endpush