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

minor bug fixed on reflect recurring transactions to reports

Browse Source
This commit is contained in:
Sevan Nerse
2021-02-15 13:25:16 +03:00
parent 087b41184b
commit 7dd96a308e
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Utilities/Recurring.php
View File

@@ -3,12 +3,17 @@
namespace App\Utilities;
use App\Models\Document\Document;
use App\Traits\DateTime;
use Date;
class Recurring
{
use DateTime;
public static function reflect(&$items, $issued_date_field)
{
$financial_year = (new static)->getFinancialYear();
foreach ($items as $key => $item) {
// @todo cache recurrings
if (!$item->recurring || !empty($item->parent_id)) {
@@ -18,18 +23,17 @@ class Recurring
foreach ($item->recurring->getRecurringSchedule(false) as $schedule) {
$issued = Date::parse($item->$issued_date_field);
$start = $schedule->getStart();
if ($issued->format('Y') != $start->format('Y')) {
continue;
}
$start_date = Date::parse($start->format('Y-m-d'));
if (($issued->format('Y-m') == $start->format('Y-m')) && ($issued->format('d') >= $start->format('d'))) {
continue;
}
$clone = clone $item;
if ($start_date->lessThan($financial_year->getStartDate()) || $start_date->greaterThan($financial_year->getEndDate())) {
continue;
}
$start_date = Date::parse($start->format('Y-m-d'));
$clone = clone $item;
if ($clone instanceof Document) {
// Days between invoiced/billed and due date