From b8958c9eb6df5f1e7a8e8ca10702585e913cc2e6 Mon Sep 17 00:00:00 2001
From: Jay Makwana <jaymakwana@gmail.com>
Date: Tue, 17 Mar 2020 19:20:42 +0530
Subject: [PATCH] add customer in expense

---
 app/Http/Controllers/ExpensesController.php   | 14 ++++++++---
 resources/assets/js/views/expenses/Create.vue | 25 ++++++++++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ExpensesController.php b/app/Http/Controllers/ExpensesController.php
index b2f15b50..90b4c1dc 100644
--- a/app/Http/Controllers/ExpensesController.php
+++ b/app/Http/Controllers/ExpensesController.php
@@ -53,9 +53,13 @@ class ExpensesController extends Controller
     public function create(Request $request)
     {
         $categories = ExpenseCategory::whereCompany($request->header('company'))->get();
+        $customers = User::customer()
+            ->whereCompany($request->header('company'))
+            ->get();
 
         return response()->json([
-            'categories' => $categories
+            'categories' => $categories,
+            'customers' => $customers
         ]);
     }
 
@@ -107,7 +111,9 @@ class ExpensesController extends Controller
     public function edit(Request $request,$id)
     {
         $categories = ExpenseCategory::whereCompany($request->header('company'))->get();
-        $customers = User::where('role', 'customer')->whereCompany($request->header('company'))->get();
+        $customers = User::customer()
+            ->whereCompany($request->header('company'))
+            ->get();
         $expense = Expense::with('category')->where('id', $id)->first();
 
         return response()->json([
@@ -205,7 +211,7 @@ class ExpensesController extends Controller
      * Retrive details of an expense receipt from storage.
      * @param   int $id
      * @return  \Illuminate\Http\JsonResponse
-     */ 
+     */
     public function showReceipt($id)
     {
         $expense = Expense::find($id);
@@ -239,7 +245,7 @@ class ExpensesController extends Controller
      * @param   int $id
      * @param   strig $hash
      * @return  \Symfony\Component\HttpFoundation\BinaryFileResponse | \Illuminate\Http\JsonResponse
-     */    
+     */
     public function downloadReceipt($id, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
diff --git a/resources/assets/js/views/expenses/Create.vue b/resources/assets/js/views/expenses/Create.vue
index 1acdecc7..6eadb5a4 100644
--- a/resources/assets/js/views/expenses/Create.vue
+++ b/resources/assets/js/views/expenses/Create.vue
@@ -102,6 +102,19 @@
                     <span v-if="!$v.formData.amount.minValue" class="text-danger">{{ $t('validation.price_minvalue') }}</span>
                   </div>
                 </div>
+                <div class="form-group col-sm-6">
+                  <label class="form-label">{{ $t('payments.customer') }}</label><span class="text-danger"> *</span>
+                  <base-select
+                    ref="baseSelect"
+                    v-model="customer"
+                    :options="customerList"
+                    :searchable="true"
+                    :show-labels="false"
+                    :placeholder="$t('customers.select_a_customer')"
+                    label="name"
+                    track-by="id"
+                  />
+                </div>
                 <div class="form-group col-sm-6">
                   <label for="description">{{ $t('expenses.note') }}</label>
                   <base-text-area
@@ -169,7 +182,8 @@ export default {
         expense_category_id: null,
         expense_date: new Date(),
         amount: null,
-        notes: ''
+        notes: '',
+        user_id: null
       },
       money: {
         decimal: '.',
@@ -185,7 +199,9 @@ export default {
       passData: [],
       contacts: [],
       previewReceipt: null,
-      fileSendUrl: '/api/expenses'
+      fileSendUrl: '/api/expenses',
+      customer: null,
+      customerList: []
     }
   },
   validations: {
@@ -297,6 +313,8 @@ export default {
     },
     async fetchInitialData () {
       this.fetchCategories()
+      let fetchData = await this.fetchCreateExpense()
+      this.customerList = fetchData.data.customers
       if (this.isEdit) {
         let response = await this.fetchExpense(this.$route.params.id)
         this.category = response.data.expense.category
@@ -319,9 +337,10 @@ export default {
         data.append('attachment_receipt', this.file)
       }
       data.append('expense_category_id', this.formData.expense_category_id)
-      data.append('expense_date',  moment(this.formData.expense_date).format('DD/MM/YYYY'))
+      data.append('expense_date', moment(this.formData.expense_date).format('DD/MM/YYYY'))
       data.append('amount', (this.formData.amount))
       data.append('notes', this.formData.notes ? this.formData.notes : '')
+      data.append('user_id', this.customer ? this.customer.id : '')
 
       if (this.isEdit) {
         this.isLoading = true