Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 09:24:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add new task/expense button after saving project/expense category

Browse Source
This commit is contained in:
Hillel Coren 2017-01-15 23:23:46 +02:00
parent 21795b683d
commit b18f11f3da
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ class ExpenseCategoryController extends BaseController
Session::flash('message', trans('texts.created_expense_category'));
return redirect()->to('/expense_categories');
return redirect()->to($category->getRoute());
}
public function update(UpdateExpenseCategoryRequest $request)

4
app/Http/routes.php
View File

@ -136,7 +136,7 @@ Route::group(['middleware' => 'auth:user'], function() {
Route::resource('tasks', 'TaskController');
Route::get('api/tasks/{client_id?}', 'TaskController@getDatatable');
Route::get('tasks/create/{client_id?}', 'TaskController@create');
Route::get('tasks/create/{client_id?}/{project_id?}', 'TaskController@create');
Route::post('tasks/bulk', 'TaskController@bulk');
Route::get('projects', 'ProjectController@index');
Route::get('api/projects', 'ProjectController@getDatatable');
@ -203,7 +203,7 @@ Route::group(['middleware' => 'auth:user'], function() {
// Expense
Route::resource('expenses', 'ExpenseController');
Route::get('expenses/create/{vendor_id?}/{client_id?}', 'ExpenseController@create');
Route::get('expenses/create/{vendor_id?}/{client_id?}/{category_id?}', 'ExpenseController@create');
Route::get('api/expenses', 'ExpenseController@getDatatable');
Route::get('api/expenses/{id}', 'ExpenseController@getDatatableVendor');
Route::post('expenses/bulk', 'ExpenseController@bulk');

5
resources/views/expense_categories/edit.blade.php
View File

@ -38,6 +38,11 @@
<center class="buttons">
{!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
{!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
@if ($category && Auth::user()->can('create', ENTITY_EXPENSE))
{!! Button::primary(trans('texts.new_expense'))->large()
->asLinkTo(url("/expenses/create/0/0/{$category->public_id}"))
->appendIcon(Icon::create('plus-sign')) !!}
@endif
</center>
{!! Former::close() !!}

5
resources/views/projects/edit.blade.php
View File

@ -50,6 +50,11 @@
<center class="buttons">
{!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
{!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
@if ($project && Auth::user()->can('create', ENTITY_TASK))
{!! Button::primary(trans('texts.new_task'))->large()
->asLinkTo(url("/tasks/create/{$project->client->public_id}/{$project->public_id}"))
->appendIcon(Icon::create('plus-sign')) !!}
@endif
</center>
{!! Former::close() !!}