From 64683647bdbfc592ce68d6889a7ddd67602bd17f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 19 Mar 2020 18:44:45 +0100 Subject: [PATCH] Piggy supports view of attachments #2828 --- app/Http/Controllers/PiggyBankController.php | 16 ++++++------ resources/views/v1/list/piggy-banks.twig | 4 +++ resources/views/v1/piggy-banks/show.twig | 26 ++++++++++++++------ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 11b042eb19..5b0d2e455a 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -247,9 +247,10 @@ class PiggyBankController extends Controller $accountTransformer->setParameters($parameters); /** @var PiggyBank $piggy */ foreach ($collection as $piggy) { - $array = $transformer->transform($piggy); - $account = $accountTransformer->transform($piggy->account); - $accountId = (int) $account['id']; + $array = $transformer->transform($piggy); + $account = $accountTransformer->transform($piggy->account); + $accountId = (int) $account['id']; + $array['attachments'] = $this->piggyRepos->getAttachments($piggy); if (!isset($accounts[$accountId])) { // create new: $accounts[$accountId] = $account; @@ -426,11 +427,12 @@ class PiggyBankController extends Controller /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($parameters); - $piggy = $transformer->transform($piggyBank); - $events = $this->piggyRepos->getEvents($piggyBank); - $subTitle = $piggyBank->name; + $piggy = $transformer->transform($piggyBank); + $events = $this->piggyRepos->getEvents($piggyBank); + $subTitle = $piggyBank->name; + $attachments = $this->piggyRepos->getAttachments($piggyBank); - return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy')); + return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments')); } /** diff --git a/resources/views/v1/list/piggy-banks.twig b/resources/views/v1/list/piggy-banks.twig index 28985c5e80..7540d17509 100644 --- a/resources/views/v1/list/piggy-banks.twig +++ b/resources/views/v1/list/piggy-banks.twig @@ -37,6 +37,10 @@ {{ piggy.name }} + {% if piggy.attachments.count > 0 %} + + {% endif %} + {{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }} diff --git a/resources/views/v1/piggy-banks/show.twig b/resources/views/v1/piggy-banks/show.twig index 192e11bab8..9988da9c50 100644 --- a/resources/views/v1/piggy-banks/show.twig +++ b/resources/views/v1/piggy-banks/show.twig @@ -20,8 +20,6 @@

{{ 'details'|_ }}

- -
@@ -98,10 +96,10 @@
+
- {% if piggy.notes %} -
-
+ {% if piggy.notes %} +
@@ -112,8 +110,22 @@
-
- {% endif %} + {% endif %} + {% if attachments.count > 0 %} +
+
+
+

+ {{ 'attachments'|_ }} +

+
+
+ {% include 'list.attachments' %} +
+
+
+ {% endif %} +
{% endblock %} {% block scripts %}