kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues 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;
}

29
resources/views/v1/bills/show.twig
View File

@@ -114,34 +114,7 @@
<h3 class="box-title">{{ 'attachments'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
{% for att in attachments %}
<tr>
<td>
<div class="btn-group btn-group-xs">
<a href="{{ route('attachments.edit', att.id) }}" class="btn btn-default"><i class="fa fa-pencil"></i></a>
<a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
<a href="{{ route('attachments.download', att.id) }}" class="btn btn-default"><i class="fa fa-download"></i></a>
</div>
</td>
<td>
<i class="fa {{ att.mime|mimeIcon }}"></i>
<a href="{{ route('attachments.view', att.id) }}" title="{{ att.filename }}">
{% if att.title %}
{{ att.title }}
{% else %}
{{ att.filename }}
{% endif %}
</a>
({{ att.size|filesize }})
{% if att.notes.first %}
<br/>
<em>{{ att.notes.first.text|markdown }}</em>
{% endif %}
</td>
</tr>
{% endfor %}
</table>
{% include 'list.attachments' %}
</div>
</div>
{% endif %}

2
resources/views/v1/list/bills.twig
View File

@@ -27,7 +27,7 @@
{% endif %}
<a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
{# count attachments #}
{% if entry.attachments_count > 0 %}
{% if entry.attachments.count > 0 %}
<i class="fa fa-paperclip"></i>
{% endif %}