diff --git a/resources/assets/js/views/banking/transactions.js b/resources/assets/js/views/banking/transactions.js index 712547d24..29b658554 100644 --- a/resources/assets/js/views/banking/transactions.js +++ b/resources/assets/js/views/banking/transactions.js @@ -19,7 +19,7 @@ import BulkAction from './../../plugins/bulk-action'; Vue.use(DashboardPlugin); const app = new Vue({ - el: '#app', + el: '#main-body', mixins: [ Global diff --git a/resources/assets/js/views/purchases/payments.js b/resources/assets/js/views/purchases/payments.js deleted file mode 100644 index ccf850426..000000000 --- a/resources/assets/js/views/purchases/payments.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * First we will load all of this project's JavaScript dependencies which - * includes Vue and other libraries. It is a great starting point when - * building robust, powerful web applications using Vue and Laravel. - */ - -require('./../../bootstrap'); - -import Vue from 'vue'; - -import DashboardPlugin from './../../plugins/dashboard-plugin'; - -import Global from './../../mixins/global'; - -import Form from './../../plugins/form'; -import BulkAction from './../../plugins/bulk-action'; - -// plugin setup -Vue.use(DashboardPlugin); - -const app = new Vue({ - el: '#app', - - mixins: [ - Global - ], - - data: function () { - return { - form: new Form('payment'), - bulk_action: new BulkAction('payments'), - } - }, -}); diff --git a/resources/assets/js/views/sales/revenues.js b/resources/assets/js/views/sales/revenues.js deleted file mode 100644 index 5a7b41c58..000000000 --- a/resources/assets/js/views/sales/revenues.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * First we will load all of this project's JavaScript dependencies which - * includes Vue and other libraries. It is a great starting point when - * building robust, powerful web applications using Vue and Laravel. - */ - -require('./../../bootstrap'); - -import Vue from 'vue'; - -import DashboardPlugin from './../../plugins/dashboard-plugin'; - -import Global from './../../mixins/global'; - -import Form from './../../plugins/form'; -import BulkAction from './../../plugins/bulk-action'; - -// plugin setup -Vue.use(DashboardPlugin); - -const app = new Vue({ - el: '#app', - - mixins: [ - Global - ], - - data: function () { - return { - form: new Form('revenue'), - bulk_action: new BulkAction('revenues') - } - } -}); diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php index 0ff1146b6..0dd8b1ceb 100644 --- a/resources/views/purchases/payments/create.blade.php +++ b/resources/views/purchases/payments/create.blade.php @@ -6,7 +6,7 @@
{!! Form::open([ 'route' => 'payments.store', - 'id' => 'payment', + 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', 'files' => true, @@ -56,5 +56,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php index 09d043d85..6e0f7d85c 100644 --- a/resources/views/purchases/payments/edit.blade.php +++ b/resources/views/purchases/payments/edit.blade.php @@ -27,7 +27,7 @@ 'files' => true, 'route' => ['payments.update', $payment->id], 'role' => 'form', - 'id' => 'payment', + 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', 'class' => 'form-loading-button', @@ -80,5 +80,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index 803aedaef..76c59d175 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -125,5 +125,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php index 5d943090e..676e4e667 100644 --- a/resources/views/sales/revenues/create.blade.php +++ b/resources/views/sales/revenues/create.blade.php @@ -6,7 +6,7 @@
{!! Form::open([ 'route' => 'revenues.store', - 'id' => 'revenue', + 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', 'files' => true, @@ -56,5 +56,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php index 3f5c5d696..60179550e 100644 --- a/resources/views/sales/revenues/edit.blade.php +++ b/resources/views/sales/revenues/edit.blade.php @@ -27,7 +27,7 @@ 'files' => true, 'route' => ['revenues.update', $revenue->id], 'role' => 'form', - 'id' => 'revenue', + 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', 'class' => 'form-loading-button', @@ -80,5 +80,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 96761911d..a15ae6c8d 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -55,7 +55,7 @@ {{ $item->contact->name }} - @if($item->invoice) + @if ($item->invoice) @if ($item->invoice->status == 'paid') + @endpush diff --git a/webpack.mix.js b/webpack.mix.js index bb98be4f7..f39f4eda3 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -46,11 +46,9 @@ mix .js('resources/assets/js/views/common/reports.js', 'public/js/common') // Sales - .js('resources/assets/js/views/sales/revenues.js', 'public/js/sales') .js('resources/assets/js/views/sales/customers.js', 'public/js/sales') // Purchases - .js('resources/assets/js/views/purchases/payments.js', 'public/js/purchases') .js('resources/assets/js/views/purchases/vendors.js', 'public/js/purchases') // Install