kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Can now successfully act on reminders.

Browse Source
This commit is contained in:
James Cole
2015-03-08 20:20:58 +01:00
parent d9028ed9b7
commit 5218443678
7 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/ReminderController.php
View File

@@ -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'));

7
app/Http/Controllers/TransactionController.php
View File

@@ -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) {