diff --git a/app/Http/Controllers/ExpensesController.php b/app/Http/Controllers/ExpensesController.php index 90b4c1dc..7cf4dd2b 100644 --- a/app/Http/Controllers/ExpensesController.php +++ b/app/Http/Controllers/ExpensesController.php @@ -37,8 +37,13 @@ class ExpensesController extends Controller ->select('expenses.*', 'expense_categories.name') ->paginate($limit); + $customers = User::customer() + ->whereCompany($request->header('company')) + ->get(); + return response()->json([ 'expenses' => $expenses, + 'customers' => $customers, 'currency' => Currency::findOrFail( CompanySetting::getSetting('currency', $request->header('company')) ) diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json index c87df61b..fa784699 100644 --- a/resources/assets/js/plugins/ar.json +++ b/resources/assets/js/plugins/ar.json @@ -412,6 +412,7 @@ "title": "النفقات", "expenses_list": "قائمة النفقات", "expense_title": "Title", + "select_a_customer": "حدد عميلاً", "customer": "العميل", "contact": "تواصل", "category": "الفئة", diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json index 969350d6..a7e00b8d 100644 --- a/resources/assets/js/plugins/de.json +++ b/resources/assets/js/plugins/de.json @@ -201,6 +201,7 @@ "action": "Aktion", "add_expense": "Aufwendung hinzufügen", "add_new_expense": "Neue Aufwendung hinzufügen", + "select_a_customer": "Wählen Sie einen Kunden aus", "amount": "Summe", "categories": { "actions": "Aktionen", diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index 4e6ef582..430ca4b1 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -426,6 +426,7 @@ "expenses": { "title": "Expenses", "expenses_list": "Expenses List", + "select_a_customer": "Select a customer", "expense_title": "Title", "customer": "Customer", "contact": "Contact", diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json index 7082bd1b..4d571df1 100644 --- a/resources/assets/js/plugins/es.json +++ b/resources/assets/js/plugins/es.json @@ -413,6 +413,7 @@ "expense_title": "Título", "contact": "Contacto", "customer": "Cliente", + "select_a_customer": "Selecciona un cliente", "category": "Categoría", "from_date": "Desde la fecha", "to_date": "Hasta la fecha", diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json index 49a0b4e7..689a1537 100644 --- a/resources/assets/js/plugins/fr.json +++ b/resources/assets/js/plugins/fr.json @@ -411,6 +411,7 @@ "expense_title": "Titre", "contact": "Contact", "customer": "Client Client", + "select_a_customer": "Sélectionnez un client", "category": "Catégorie", "from_date": "A partir de la date", "to_date": "À ce jour", diff --git a/resources/assets/js/views/expenses/Index.vue b/resources/assets/js/views/expenses/Index.vue index d8790ecd..98f98e4d 100644 --- a/resources/assets/js/views/expenses/Index.vue +++ b/resources/assets/js/views/expenses/Index.vue @@ -43,7 +43,19 @@
-
+
+ + +
+
-
+
-
+
{