From 9a04a4a4fc9811bbaf79b6454f97ee50d0edc8a5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 21 Aug 2014 18:49:51 +0200 Subject: [PATCH] Some bug fixes and a new view for piggy banks. [skip ci] --- app/controllers/HomeController.php | 4 + .../Piggybanks/EloquentPiggybankTrigger.php | 2 +- app/views/piggybanks/index.blade.php | 180 +++++++++++++++--- 3 files changed, 156 insertions(+), 30 deletions(-) diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 3f783b6f65..4a96f2a404 100644 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -43,6 +43,10 @@ class HomeController extends BaseController */ public function index() { + + \Event::fire('limits.check'); + \Event::fire('piggybanks.check'); + // count, maybe we need some introducing text to show: $count = $this->_accounts->count(); $start = Session::get('start'); diff --git a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php b/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php index 95db4cb542..46cd8660f8 100644 --- a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php +++ b/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php @@ -125,7 +125,7 @@ class EloquentPiggybankTrigger { if (\Auth::check()) { - $piggies = \Auth::user()->piggybanks()->whereNotNull('repeats')->get(); + $piggies = \Auth::user()->piggybanks()->where('repeats',1)->get(); } else { $piggies = []; } diff --git a/app/views/piggybanks/index.blade.php b/app/views/piggybanks/index.blade.php index ff594f1ca3..86b2196563 100644 --- a/app/views/piggybanks/index.blade.php +++ b/app/views/piggybanks/index.blade.php @@ -12,7 +12,8 @@

Save money for large expenses

Saving money is hard. Firefly's piggy banks can help you to save money. Simply set the amount - of money you want to save, set an optional target date and whether or not Firefly should remind you to add money + of money you want to save, set an optional target date and whether or not + Firefly should remind you to add money to the piggy bank.

@@ -32,58 +33,177 @@

-
+

Current piggy banks

@if($countNonRepeating == 0)

No piggy banks found.

@else - @foreach($piggybanks as $piggyBank) - @if($piggyBank->repeats == 0) - + @if($piggyBank->repeats == 0) +

{{{$piggyBank->name}}}

+
+ + + + + + + + + + + +
{{mf($piggyBank->currentRelevantRep()->currentamount)}} +
+
+ {{$piggyBank->currentRelevantRep()->pct()}}% +
+
+ 		{{mf($piggyBank->targetamount)}}
+ +
+ @if($piggyBank->leftInAccount > 0) + Add money + @endif + @if($piggyBank->currentRelevantRep()->currentamount > 0) + Remove money + @endif +
+ 		+
+ + +
+ +
+ @endif + @endforeach + @endif +
+
+
+
+

Current repeated expenses

+ @if($countRepeating == 0) +

No repeated expenses found.

+ @else + @foreach($piggybanks as $repeated) + @if($repeated->repeats == 1) +

{{{$repeated->name}}}

+ + + + + + + + + + + + + +
{{mf($repeated->currentRelevantRep()->currentamount)}} +
+
+ {{$repeated->currentRelevantRep()->pct()}}% +
+
+ 		{{mf($repeated->targetamount)}}
+ +
+ @if($repeated->leftInAccount > 0) + Add money + @endif + @if($repeated->currentRelevantRep()->currentamount > 0) + Remove money + @endif +
+ 		+
+ + +
+ +
+ @endif + @endforeach +@endif + +
+
+ + + + + {{-- + - + + + + + + + + + @if(!is_null($piggyBank->targetdate)) + + + + + + @endif + @if(!is_null($piggyBank->reminder)) + + + + + + @endif + + + +
-

{{{$piggyBank->name}}} {{$piggyBank->currentRelevantRep()->pct()}}%

+ 		Target amount{{mf($piggyBank->targetamount)}}{{100-$piggyBank->currentRelevantRep()->pct()}}%
Saved so far{{mf($piggyBank->currentRelevantRep()->currentamount)}}{{$piggyBank->currentRelevantRep()->pct()}}%
Target date{{$piggyBank->currentRelevantRep()->targetdate->format('M jS, Y')}}Time diff
Next reminder{{$piggyBank->nextReminderDate()->format('M jS, Y')}}
+ +
+ + target amount -- Saving up to {{mf($piggyBank->targetamount)}}. - + -- currently saved -- Currently saved - {{mf($piggyBank->currentRelevantRep()->currentamount)}}. - + + -- start date (if any) -- @if(!is_null($piggyBank->startdate)) - Start date: {{$piggyBank->currentRelevantRep()->startdate->format('d M Y')}}. + Started saving on {{$piggyBank->currentRelevantRep()->startdate->format('M jS, Y')}}. @endif - + -- target date (if any) -- @if(!is_null($piggyBank->targetdate)) - Target date: {{$piggyBank->currentRelevantRep()->targetdate->format('d M Y')}}. + Target date is . @endif - @if(!is_null($piggyBank->reminder)) - Next reminder: {{$piggyBank->nextReminderDate()->format('d M Y')}} - @endif +

-
- - @if($piggyBank->leftInAccount > 0) - Add money - @endif - @if($piggyBank->currentRelevantRep()->currentamount > 0) - Remove money - @endif - - -
+ --> @endif @endforeach - @endif
@@ -157,6 +277,8 @@ +--}} +