Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix enter expense from client

This commit is contained in:
Hillel Coren 2018-05-08 23:16:35 +03:00
parent 5df2397c1c
commit e34c7ce44e
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientController.php
View File

@ -117,7 +117,7 @@ class ClientController extends BaseController
} }
if ($user->can('create', ENTITY_EXPENSE)) { 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(); $token = $client->getGatewayToken();

2
app/Ninja/Datatables/ClientDatatable.php
View File

@ -141,7 +141,7 @@ class ClientDatatable extends EntityDatatable
[ [
trans('texts.enter_expense'), trans('texts.enter_expense'),
function ($model) { function ($model) {
return URL::to("expenses/create/0/{$model->public_id}"); return URL::to("expenses/create/{$model->public_id}");
}, },
function ($model) { function ($model) {
return Auth::user()->can('create', ENTITY_EXPENSE); return Auth::user()->can('create', ENTITY_EXPENSE);

2
app/Ninja/Datatables/VendorDatatable.php
View File

@ -72,7 +72,7 @@ class VendorDatatable extends EntityDatatable
[ [
trans('texts.enter_expense'), trans('texts.enter_expense'),
function ($model) { function ($model) {
return URL::to("expenses/create/{$model->public_id}"); return URL::to("expenses/create/0/{$model->public_id}");
}, },
function ($model) { function ($model) {
return Auth::user()->can('create', ENTITY_EXPENSE); return Auth::user()->can('create', ENTITY_EXPENSE);

5
resources/views/vendors/show.blade.php vendored
View File

@ -53,7 +53,7 @@
@if ( ! $vendor->trashed()) @if ( ! $vendor->trashed())
@can('create', ENTITY_EXPENSE) @can('create', ENTITY_EXPENSE)
{!! Button::primary(trans("texts.new_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')) !!} ->appendIcon(Icon::create('plus-sign')) !!}
@endcan @endcan
@endif @endif
@ -203,9 +203,6 @@
$('.normalDropDown:not(.dropdown-toggle)').click(function(event) { $('.normalDropDown:not(.dropdown-toggle)').click(function(event) {
openUrlOnClick('{{ URL::to('vendors/' . $vendor->public_id . '/edit') }}', 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'); $('.nav-tabs a[href="#expenses"]').tab('show');
}); });

2
routes/web.php
View File

@ -267,7 +267,7 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
// Expense // Expense
Route::resource('expenses', 'ExpenseController'); 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('expenses/{expenses}/clone', 'ExpenseController@cloneExpense');
Route::get('api/expenses', 'ExpenseController@getDatatable'); Route::get('api/expenses', 'ExpenseController@getDatatable');
Route::get('api/vendor_expenses/{id}', 'ExpenseController@getDatatableVendor'); Route::get('api/vendor_expenses/{id}', 'ExpenseController@getDatatableVendor');