gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show attachments for bills #2828

Browse Source
This commit is contained in:
James Cole
2020-03-19 18:23:34 +01:00
parent 2a46756838
commit 9b53576fc2
4 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Account/ShowController.php
View File

@@ -169,6 +169,7 @@ class ShowController extends Controller
$location = $this->repository->getLocation($account);
$isLiability = $this->repository->isLiability($account);
$attachments = $this->repository->getAttachments($account);
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
$end = new Carbon;
$today = new Carbon;
@@ -196,6 +197,7 @@ class ShowController extends Controller
'location',
'objectType',
'isLiability',
'attachments',
'currency',
'today',
'chartUri',

4
app/Http/Controllers/BillController.php
View File

@@ -197,6 +197,7 @@ class BillController extends Controller
$start = session('start');
$end = session('end');
$unfiltered = $this->billRepository->getBills();
$defaultCurrency = app('amount')->getDefaultCurrency();
$parameters = new ParameterBag();
$parameters->set('start', $start);
@@ -208,7 +209,7 @@ class BillController extends Controller
/** @var Collection $bills */
$bills = $unfiltered->map(
static function (Bill $bill) use ($transformer, $defaultCurrency) {
function (Bill $bill) use ($transformer, $defaultCurrency) {
$return = $transformer->transform($bill);
$currency = $bill->transactionCurrency ?? $defaultCurrency;
$return['currency_id'] = $currency->id;
@@ -216,6 +217,7 @@ class BillController extends Controller
$return['currency_symbol'] = $currency->symbol;
$return['currency_code'] = $currency->code;
$return['currency_decimal_places'] = $currency->decimal_places;
$return['attachments'] = $this->billRepository->getAttachments($bill);
return $return;
}