Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 02:34:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ExportReportResults (#3506)

Browse Source 
Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
This commit is contained in:
Kristian Feldsam 2020-03-24 09:51:11 +01:00 committed by GitHub
parent bfd13719c9
commit 5f5a1a6740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Jobs/ExportReportResults.php
View File

@ -65,7 +65,17 @@ class ExportReportResults extends Job
foreach ($totals as $currencyId => $each) {
foreach ($each as $dimension => $val) {
$tmp = [];
$tmp[] = Utils::getFromCache($currencyId, 'currencies')->name . (($dimension) ? ' - ' . $dimension : '');
$currency = Utils::getFromCache($currencyId, 'currencies');
if (!$currency) {
$name = $currencyId;
$account = $this->user->account->first();
$currencyId = $account->currency_id;
} else {
$name = $currency->name;
}
$tmp[] = $dimension ? $name . ' - ' . $dimension : $name;
foreach ($val as $field => $value) {
if ($field == 'duration') {
$tmp[] = Utils::formatTime($value);