Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 05:27:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for chart queries

Browse Source
This commit is contained in:
David Bomba 2023-05-16 17:50:05 +10:00
parent 9668f6ceb7
commit a66c9cc046
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Services/Chart/ChartService.php
View File

@ -35,12 +35,8 @@ class ChartService
$currencies = Client::withTrashed() $currencies = Client::withTrashed()
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->where('is_deleted', 0) ->where('is_deleted', 0)
->distinct(); ->distinct()
->pluck('settings->currency_id as id');
if(!$this->is_admin)
$currencies->where('user_id', $this->user->id);
$currencies->pluck('settings->currency_id as id');
/* Push the company currency on also */ /* Push the company currency on also */
$currencies->push((int) $this->company->settings->currency_id); $currencies->push((int) $this->company->settings->currency_id);
@ -49,14 +45,8 @@ class ChartService
$expense_currencies = Expense::withTrashed() $expense_currencies = Expense::withTrashed()
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->where('is_deleted', 0) ->where('is_deleted', 0)
->distinct(); ->distinct()
->pluck('currency_id as id');
if (!$this->is_admin) {
$expense_currencies->where('user_id', $this->user->id);
}
$expense_currencies->pluck('currency_id as id');
/* Merge and filter by unique */ /* Merge and filter by unique */
$currencies = $currencies->merge($expense_currencies)->unique(); $currencies = $currencies->merge($expense_currencies)->unique();

6
tests/Unit/Chart/ChartCurrencyTest.php
View File

@ -50,7 +50,7 @@ class ChartCurrencyTest extends TestCase
$this->assertDatabaseHas('invoices', ['number' => 'db_record']); $this->assertDatabaseHas('invoices', ['number' => 'db_record']);
$cs = new ChartService($this->company); $cs = new ChartService($this->company, $this->user, true);
// nlog($cs->getRevenueQuery(now()->subDays(20)->format('Y-m-d'), now()->addDays(100)->format('Y-m-d'))); // nlog($cs->getRevenueQuery(now()->subDays(20)->format('Y-m-d'), now()->addDays(100)->format('Y-m-d')));
$data = [ $data = [
@ -86,7 +86,7 @@ class ChartCurrencyTest extends TestCase
'settings' => $settings, 'settings' => $settings,
]); ]);
$cs = new ChartService($this->company); $cs = new ChartService($this->company, $this->user, true);
$this->assertTrue(is_array($cs->getCurrencyCodes())); $this->assertTrue(is_array($cs->getCurrencyCodes()));
@ -131,7 +131,7 @@ class ChartCurrencyTest extends TestCase
], ],
]; ];
$cs = new ChartService($this->company); $cs = new ChartService($this->company, $this->user, true);
// nlog($cs->totals(now()->subYears(10), now())); // nlog($cs->totals(now()->subYears(10), now()));