mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Can now successfully act on reminders.
This commit is contained in:
parent
d9028ed9b7
commit
5218443678
@ -7,6 +7,7 @@ use FireflyIII\Http\Requests;
|
||||
use FireflyIII\Models\Reminder;
|
||||
use Redirect;
|
||||
use URL;
|
||||
use Session;
|
||||
|
||||
/**
|
||||
* Class ReminderController
|
||||
@ -17,6 +18,23 @@ class ReminderController extends Controller
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Reminder $reminder
|
||||
*/
|
||||
public function act(Reminder $reminder)
|
||||
{
|
||||
$data = [
|
||||
'description' => 'Money for piggy bank "' . $reminder->remindersable->name . '"',
|
||||
'amount' => round($reminder->metadata->perReminder, 2),
|
||||
'account_to_id' => $reminder->remindersable->account_id,
|
||||
'piggy_bank_id' => $reminder->remindersable_id,
|
||||
'reminder_id' => $reminder->id,
|
||||
];
|
||||
Session::flash('_old_input',$data);
|
||||
|
||||
return Redirect::route('transactions.create','transfer');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Reminder $reminder
|
||||
*/
|
||||
@ -92,7 +110,7 @@ class ReminderController extends Controller
|
||||
*/
|
||||
public function show(Reminder $reminder)
|
||||
{
|
||||
$title = 'Reminder';
|
||||
$title = 'Reminder';
|
||||
$mainTitleIcon = 'fa-clock-o';
|
||||
if ($reminder->notnow === true) {
|
||||
$subTitle = 'Dismissed reminder';
|
||||
@ -102,7 +120,6 @@ class ReminderController extends Controller
|
||||
$subTitle .= ' for piggy bank "' . $reminder->remindersable->name . '"';
|
||||
|
||||
|
||||
|
||||
return view('reminders.show', compact('reminder', 'title', 'subTitle', 'mainTitleIcon'));
|
||||
|
||||
|
||||
|
@ -238,7 +238,6 @@ class TransactionController extends Controller
|
||||
|
||||
public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
|
||||
{
|
||||
|
||||
$journalData = [
|
||||
'what' => $request->get('what'),
|
||||
'description' => $request->get('description'),
|
||||
@ -260,6 +259,12 @@ class TransactionController extends Controller
|
||||
event(new JournalSaved($journal));
|
||||
event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
|
||||
|
||||
if(intval($request->get('reminder_id')) > 0) {
|
||||
$reminder = Auth::user()->reminders()->find($request->get('reminder_id'));
|
||||
$reminder->active = 0;
|
||||
$reminder->save();
|
||||
}
|
||||
|
||||
Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
|
||||
|
||||
if (intval(Input::get('create_another')) === 1) {
|
||||
|
@ -35,6 +35,7 @@ class JournalFormRequest extends Request
|
||||
'what' => 'required|in:withdrawal,deposit,transfer|exists:transaction_types,type',
|
||||
'amount' => 'numeric|required|min:0.01',
|
||||
'date' => 'required|date',
|
||||
'reminder_id' => 'numeric|exists:reminders,id',
|
||||
'amount_currency_id' => 'required|exists:transaction_currencies,id',
|
||||
|
||||
];
|
||||
|
@ -306,6 +306,7 @@ Route::group(
|
||||
*/
|
||||
Route::get('/reminders', ['uses' => 'ReminderController@index', 'as' => 'reminders.index']);
|
||||
Route::get('/reminder/dismiss/{reminder}', ['uses' => 'ReminderController@dismiss', 'as' => 'reminders.dismiss']);
|
||||
Route::get('/reminder/act/{reminder}', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']);
|
||||
Route::get('/reminder/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']);
|
||||
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
<div class="btn-group">
|
||||
@if($reminder->active === true)
|
||||
<a class="btn btn-warning" href="{{route('reminders.dismiss',$reminder->id)}}">Dismiss</a>
|
||||
<a class="btn btn-success" href="#">Act</a>
|
||||
<a class="btn btn-success" href="{{route('reminders.act',$reminder->id)}}">Act</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
@ -28,7 +28,7 @@
|
||||
<div class="btn-group">
|
||||
@if($reminder->active === true)
|
||||
<a class="btn btn-warning" href="{{route('reminders.dismiss',$reminder->id)}}">Dismiss</a>
|
||||
<a class="btn btn-success" href="#">Act</a>
|
||||
<a class="btn btn-success" href="{{route('reminders.act',$reminder->id)}}">Act</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
@ -2,7 +2,7 @@
|
||||
@section('content')
|
||||
{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $what) !!}
|
||||
{!! Form::open(['class' => 'form-horizontal','id' => 'store','url' => route('transactions.store',$what)]) !!}
|
||||
{!! Form::hidden('reminder',Input::get('reminder_id')) !!}
|
||||
{!! Form::hidden('reminder_id',Input::get('reminder_id')) !!}
|
||||
{!! Form::hidden('what',$what) !!}
|
||||
|
||||
<div class="row">
|
||||
|
Loading…
Reference in New Issue
Block a user