Revenue/Payment js file enhancement and fixed show page delete button.

akaunting · Aug 18, 2021 · de9a060 · de9a060
1 parent 2507a86
commit de9a060
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 82 deletions.
diff --git 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
diff --git a/resources/assets/js/views/sales/revenues.js b/resources/assets/js/views/sales/revenues.js
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
@@ -6,7 +6,7 @@
     <div class="card">
         {!! 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')
-    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git 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')
-    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
@@ -125,5 +125,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
@@ -6,7 +6,7 @@
     <div class="card">
         {!! 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')
-    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git 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')
-    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
@@ -55,7 +55,7 @@
                                 <td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
                                     {{ $item->contact->name }}
 
-                                    @if($item->invoice)
+                                    @if ($item->invoice)
                                         @if ($item->invoice->status == 'paid')
                                             <el-tooltip content="{{ $item->invoice->document_number }} / {{ trans('documents.statuses.paid') }}"
                                             effect="success"
@@ -125,5 +125,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/banking/transactions.js?v=' . version('short')) }}"></script>
 @endpush
diff --git 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