Skip to content

Commit

Permalink
item relationships added to document models in reports.
Browse files Browse the repository at this point in the history
  • Loading branch information
CihanSenturk committed Sep 25, 2023
1 parent bbc8590 commit d80843f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/Reports/ExpenseSummary.php
Expand Up @@ -46,7 +46,7 @@ public function setData()
break;
default:
// Bills
$bills = $this->applyFilters(Document::bill()->with('recurring', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$bills = $this->applyFilters(Document::bill()->with('recurring', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($bills, 'issued_at');
$this->setTotals($bills, 'issued_at', false, 'expense');

Expand Down
4 changes: 2 additions & 2 deletions app/Reports/IncomeExpenseSummary.php
Expand Up @@ -64,7 +64,7 @@ public function setData()
break;
default:
// Invoices
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($invoices, 'issued_at');
$this->setTotals($invoices, 'issued_at', false, 'income');

Expand All @@ -74,7 +74,7 @@ public function setData()
$this->setTotals($incomes, 'paid_at', false, 'income');

// Bills
$bills = $this->applyFilters(Document::bill()->with('recurring', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$bills = $this->applyFilters(Document::bill()->with('recurring', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($bills, 'issued_at');
$this->setTotals($bills, 'issued_at', false, 'expense');

Expand Down
2 changes: 1 addition & 1 deletion app/Reports/IncomeSummary.php
Expand Up @@ -46,7 +46,7 @@ public function setData()
break;
default:
// Invoices
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($invoices, 'issued_at');
$this->setTotals($invoices, 'issued_at', false, 'income');

Expand Down
4 changes: 2 additions & 2 deletions app/Reports/ProfitLoss.php
Expand Up @@ -54,7 +54,7 @@ public function setData()
break;
default:
// Invoices
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'totals', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'totals', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($invoices, 'issued_at');
$this->setTotals($invoices, 'issued_at', false, 'income', false);

Expand All @@ -64,7 +64,7 @@ public function setData()
$this->setTotals($incomes, 'paid_at', false, 'income', false);

// Bills
$bills = $this->applyFilters(Document::bill()->with('recurring', 'totals', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$bills = $this->applyFilters(Document::bill()->with('recurring', 'totals', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($bills, 'issued_at');
$this->setTotals($bills, 'issued_at', false, 'expense', false);

Expand Down
4 changes: 2 additions & 2 deletions app/Reports/TaxSummary.php
Expand Up @@ -57,12 +57,12 @@ public function setData()
break;
default:
// Invoices
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'totals', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$invoices = $this->applyFilters(Document::invoice()->with('recurring', 'totals', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($invoices, 'issued_at');
$this->setTotals($invoices, 'issued_at');

// Bills
$bills = $this->applyFilters(Document::bill()->with('recurring', 'totals', 'transactions')->accrued(), ['date_field' => 'issued_at'])->get();
$bills = $this->applyFilters(Document::bill()->with('recurring', 'totals', 'transactions', 'items')->accrued(), ['date_field' => 'issued_at'])->get();
Recurring::reflect($bills, 'issued_at');
$this->setTotals($bills, 'issued_at');

Expand Down

0 comments on commit d80843f

Please sign in to comment.