From e34c7ce44e0aa0de46ac4b45c3954d0b41534848 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 8 May 2018 23:16:35 +0300
Subject: [PATCH] Fix enter expense from client

---
 app/Http/Controllers/ClientController.php | 2 +-
 app/Ninja/Datatables/ClientDatatable.php  | 2 +-
 app/Ninja/Datatables/VendorDatatable.php  | 2 +-
 resources/views/vendors/show.blade.php    | 5 +----
 routes/web.php                            | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 7352b4e817f0..d19923f26e6e 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -117,7 +117,7 @@ class ClientController extends BaseController
         }
 
         if ($user->can('create', ENTITY_EXPENSE)) {
-            $actionLinks[] = ['label' => trans('texts.enter_expense'), 'url' => URL::to('/expenses/create/0/'.$client->public_id)];
+            $actionLinks[] = ['label' => trans('texts.enter_expense'), 'url' => URL::to('/expenses/create/'.$client->public_id)];
         }
 
         $token = $client->getGatewayToken();
diff --git a/app/Ninja/Datatables/ClientDatatable.php b/app/Ninja/Datatables/ClientDatatable.php
index b74eb5fc08ea..4c6263e559b5 100644
--- a/app/Ninja/Datatables/ClientDatatable.php
+++ b/app/Ninja/Datatables/ClientDatatable.php
@@ -141,7 +141,7 @@ class ClientDatatable extends EntityDatatable
             [
                 trans('texts.enter_expense'),
                 function ($model) {
-                    return URL::to("expenses/create/0/{$model->public_id}");
+                    return URL::to("expenses/create/{$model->public_id}");
                 },
                 function ($model) {
                     return Auth::user()->can('create', ENTITY_EXPENSE);
diff --git a/app/Ninja/Datatables/VendorDatatable.php b/app/Ninja/Datatables/VendorDatatable.php
index df5415df01b2..8e87b2782fae 100644
--- a/app/Ninja/Datatables/VendorDatatable.php
+++ b/app/Ninja/Datatables/VendorDatatable.php
@@ -72,7 +72,7 @@ class VendorDatatable extends EntityDatatable
             [
                 trans('texts.enter_expense'),
                 function ($model) {
-                    return URL::to("expenses/create/{$model->public_id}");
+                    return URL::to("expenses/create/0/{$model->public_id}");
                 },
                 function ($model) {
                     return Auth::user()->can('create', ENTITY_EXPENSE);
diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php
index 7bb0f63ed7c0..fa6d4f03a96a 100644
--- a/resources/views/vendors/show.blade.php
+++ b/resources/views/vendors/show.blade.php
@@ -53,7 +53,7 @@
                   @if ( ! $vendor->trashed())
                       @can('create', ENTITY_EXPENSE)
                           {!! Button::primary(trans("texts.new_expense"))
-                                  ->asLinkTo(URL::to("/expenses/create/{$vendor->public_id}"))
+                                  ->asLinkTo(URL::to("/expenses/create/0/{$vendor->public_id}"))
                                   ->appendIcon(Icon::create('plus-sign')) !!}
                       @endcan
                   @endif
@@ -203,9 +203,6 @@
 		$('.normalDropDown:not(.dropdown-toggle)').click(function(event) {
             openUrlOnClick('{{ URL::to('vendors/' . $vendor->public_id . '/edit') }}', event)
 		});
-		$('.primaryDropDown:not(.dropdown-toggle)').click(function(event) {
-			openUrlOnClick('{{ URL::to('expenses/create/' . $vendor->public_id ) }}', event);
-		});
 
         $('.nav-tabs a[href="#expenses"]').tab('show');
 	});
diff --git a/routes/web.php b/routes/web.php
index b8d76db8769d..969dbc7acc3f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -267,7 +267,7 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
 
     // Expense
     Route::resource('expenses', 'ExpenseController');
-    Route::get('expenses/create/{vendor_id?}/{client_id?}/{category_id?}', 'ExpenseController@create');
+    Route::get('expenses/create/{client_id?}/{vendor_id?}/{category_id?}', 'ExpenseController@create');
     Route::get('expenses/{expenses}/clone', 'ExpenseController@cloneExpense');
     Route::get('api/expenses', 'ExpenseController@getDatatable');
     Route::get('api/vendor_expenses/{id}', 'ExpenseController@getDatatableVendor');