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

basis filter added to reports

Browse Source
This commit is contained in:
Sevan Nerse
2021-09-20 10:06:55 +03:00
parent 69aeb32fae
commit 8bdb6e2e98
8 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Reports/ExpenseSummary.php
View File

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

4
app/Reports/IncomeExpenseSummary.php
View File

@@ -18,7 +18,9 @@ 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->getSetting('basis')) {
$basis = $this->getSearchStringValue('basis', $this->getSetting('basis'));
switch ($basis) {
case 'cash':
// Revenues
$revenues = $income_transactions->get();

4
app/Reports/IncomeSummary.php
View File

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

4
app/Reports/ProfitLoss.php
View File

@@ -37,7 +37,9 @@ 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->getSetting('basis')) {
$basis = $this->getSearchStringValue('basis', $this->getSetting('basis'));
switch ($basis) {
case 'cash':
// Revenues
$revenues = $income_transactions->get();

4
app/Reports/TaxSummary.php
View File

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