kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some problems with creating piggy bank repetitions.

Browse Source
This commit is contained in:
James Cole
2014-08-21 15:14:46 +02:00
parent 22bd995b42
commit b5a706152d
6 changed files with 106 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/Firefly/Storage/Piggybank/EloquentPiggybankRepository.php
View File

@@ -137,6 +137,10 @@ class EloquentPiggybankRepository implements PiggybankRepositoryInterface
$piggyBank = new \Piggybank($data);
if($piggyBank->repeats && !isset($data['targetdate'])) {
$piggyBank->errors()->add('targetdate','Target date is mandatory!');
return $piggyBank;
}
if (!is_null($account)) {
$piggyBank->account()->associate($account);
}

2
app/lib/Firefly/Trigger/Limits/EloquentLimitTrigger.php
View File

@@ -30,8 +30,6 @@ class EloquentLimitTrigger
/** @var \Limit $limit */
foreach ($limits as $limit) {
/** @var \Budget $budget */
$budget = $limit->budget()->first();
// the limit repeats, and there should be at least one repetition already.
/** @var \LimitRepetition $primer */
$primer = $limit->limitrepetitions()->orderBy('startdate', 'DESC')->first();

120
app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php
View File

@@ -13,15 +13,16 @@ use Illuminate\Events\Dispatcher;
class EloquentPiggybankTrigger
{
/**
* @param \Piggybank $piggyBank
* @param \Piggybank $piggyBank
* @param \TransactionJournal $journal
* @param \Transaction $transaction
* @param \Transaction $transaction
*
* @return bool
*/
public function createRelatedTransfer(
\Piggybank $piggyBank, \TransactionJournal $journal, \Transaction $transaction
) {
)
{
$repetition = $piggyBank->repetitionForDate($journal->date);
if (!is_null($repetition)) {
// get the amount transferred TO this
@@ -88,6 +89,8 @@ class EloquentPiggybankTrigger
*/
public function storePiggy(\Piggybank $piggyBank)
{
$piggyBank->createRepetition($piggyBank->startdate, $piggyBank->targetdate);
return true;
$rep = new \PiggybankRepetition;
$rep->piggybank()->associate($piggyBank);
$rep->targetdate = $piggyBank->targetdate;
@@ -100,59 +103,85 @@ class EloquentPiggybankTrigger
}
/**
* Validates and creates all repetitions for repeating piggy banks.
* This routine is also called whenever Firefly runs, so new repetitions
* are created automatically.
*
* @param \Piggybank $piggyBank
*
* @return bool
*/
public function storeRepeated(\Piggybank $piggyBank)
{
// loop from start to today or something
$rep = new \PiggybankRepetition;
$rep->piggybank()->associate($piggyBank);
$rep->startdate = $piggyBank->startdate;
$rep->targetdate = $piggyBank->targetdate;
$rep->currentamount = 0;
$rep->save();
unset($rep);
$today = new Carbon;
$piggyBank->createRepetition($piggyBank->startdate, $piggyBank->targetdate);
return true;
}
if ($piggyBank->targetdate <= $today) {
// add 1 month to startdate, or maybe X period, like 3 weeks.
$startTarget = clone $piggyBank->targetdate;
while ($startTarget <= $today) {
$startCurrent = clone $startTarget;
// add some kind of period to start current making $endCurrent.
$endCurrent = clone $startCurrent;
switch ($piggyBank->rep_length) {
default:
return true;
break;
case 'day':
$endCurrent->addDays($piggyBank->rep_every);
break;
case 'week':
$endCurrent->addWeeks($piggyBank->rep_every);
break;
case 'month':
$endCurrent->addMonths($piggyBank->rep_every);
break;
case 'year':
$endCurrent->addYears($piggyBank->rep_every);
break;
}
/**
*
*/
public function checkRepeatingPiggies()
{
$rep = new \PiggybankRepetition;
$rep->piggybank()->associate($piggyBank);
$rep->startdate = $startCurrent;
$rep->targetdate = $endCurrent;
$rep->currentamount = 0;
$startTarget = $endCurrent;
$rep->save();
}
if (\Auth::check()) {
$piggies = \Auth::user()->piggybanks()->whereNotNull('repeats')->get();
} else {
$piggies = [];
}
return true;
\Log::debug('Now in checkRepeatingPiggies with ' . count($piggies) . ' piggies');
/** @var \Piggybank $piggyBank */
foreach ($piggies as $piggyBank) {
\Log::debug('Now working on ' . $piggyBank->name);
// get the latest repetition, see if we need to "append" more:
/** @var \PiggybankRepetition $primer */
$primer = $piggyBank->piggybankrepetitions()->orderBy('targetdate', 'DESC')->first();
\Log::debug('Last target date is: ' . $primer->targetdate);
// for repeating piggy banks, the target date is mandatory:
$today = new Carbon;
$end = clone $primer->targetdate;
// the next repetition must be created starting at the day after the target date:
$start = clone $primer->targetdate;
$start->addDay();
while ($start <= $today) {
\Log::debug('Looping! Start is: ' . $start);
// to get to the end of the current repetition, we switch on the piggy bank's
// repetition period:
$end = clone $start;
switch ($piggyBank->rep_length) {
case 'day':
$end->addDays($piggyBank->rep_every);
break;
case 'week':
$end->addWeeks($piggyBank->rep_every);
break;
case 'month':
$end->addMonths($piggyBank->rep_every);
break;
case 'year':
$end->addYears($piggyBank->rep_every);
break;
}
$end->subDay();
// create repetition:
$piggyBank->createRepetition($start, $end);
$start = clone $end;
$start->addDay();
}
}
}
/**
@@ -181,6 +210,7 @@ class EloquentPiggybankTrigger
'piggybanks.updateRelatedTransfer',
'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@updateRelatedTransfer'
);
$events->listen('piggybanks.check', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@checkRepeatingPiggies');
}
public function update(\Piggybank $piggyBank)