shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #572

Browse Source
This commit is contained in:
denisdulici 2018-10-29 15:13:18 +03:00
parent ff01b4ff04
commit abad89a873
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Console/Commands/RecurringCheck.php
View File

@ -63,25 +63,22 @@ class RecurringCheck extends Command
$company->setSettings(); $company->setSettings();
foreach ($company->recurring as $recur) { foreach ($company->recurring as $recurring) {
if (!$current = $recur->current()) { foreach ($recurring->schedule() as $recur) {
continue; $recur_date = Date::parse($recur->getStart()->format('Y-m-d'));
}
$current_date = Date::parse($current->format('Y-m-d'));
// Check if should recur today // Check if should recur today
if ($this->today->ne($current_date)) { if ($this->today->ne($recur_date)) {
continue; continue;
} }
$model = $recur->recurable; $model = $recurring->recurable;
if (!$model) { if (!$model) {
continue; continue;
} }
switch ($recur->recurable_type) { switch ($recurring->recurable_type) {
case 'App\Models\Expense\Bill': case 'App\Models\Expense\Bill':
$this->recurBill($company, $model); $this->recurBill($company, $model);
break; break;
@ -103,6 +100,7 @@ class RecurringCheck extends Command
} }
} }
} }
}
// Unset company_id // Unset company_id
session()->forget('company_id'); session()->forget('company_id');