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

added setting funciton for reports

Browse Source
This commit is contained in:
Denis Duliçi
2020-06-12 13:38:58 +03:00
parent 64d065785e
commit 6d6bf1f393
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Reports/ExpenseSummary.php
View File

@@ -32,7 +32,7 @@ class ExpenseSummary extends Report
{
$transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']);
switch ($this->model->settings->basis) {
switch ($this->getSetting('basis')) {
case 'cash':
// Payments
$payments = $transactions->get();

2
app/Reports/IncomeExpenseSummary.php
View File

@@ -19,7 +19,7 @@ class IncomeExpenseSummary extends Report
$income_transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']);
$expense_transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']);
switch ($this->model->settings->basis) {
switch ($this->getSetting('basis')) {
case 'cash':
// Revenues
$revenues = $income_transactions->get();

2
app/Reports/IncomeSummary.php
View File

@@ -32,7 +32,7 @@ class IncomeSummary extends Report
{
$transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']);
switch ($this->model->settings->basis) {
switch ($this->getSetting('basis')) {
case 'cash':
// Revenues
$revenues = $transactions->get();

2
app/Reports/ProfitLoss.php
View File

@@ -38,7 +38,7 @@ class ProfitLoss extends Report
$income_transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']);
$expense_transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']);
switch ($this->model->settings->basis) {
switch ($this->getSetting('basis')) {
case 'cash':
// Revenues
$revenues = $income_transactions->get();

2
app/Reports/TaxSummary.php
View File

@@ -39,7 +39,7 @@ class TaxSummary extends Report
public function setData()
{
switch ($this->model->settings->basis) {
switch ($this->getSetting('basis')) {
case 'cash':
// Invoice Payments
$invoices = $this->applyFilters(Transaction::with('recurring', 'invoice', 'invoice.totals')->income()->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get();