From 2bf46fccb5e3c0441fcdc0764acdf22b8b9fcc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 18 May 2021 11:53:24 +0200 Subject: [PATCH 1/4] Show empty text when no public_notes is present --- .../ninja2020/components/livewire/credits-table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php index e2ae75bafb0f..f3b0eb07f150 100644 --- a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php @@ -59,7 +59,7 @@ {{ $credit->formatDate($credit->date, $credit->client->date_format()) }} - {{ empty($credit->public_notes) ? '/' : $credit->public_notes }} + {{ $credit->public_notes }} From 638a2a92301843d82ffec48c7373501cf23703bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 18 May 2021 12:01:23 +0200 Subject: [PATCH 2/4] Update credit's view page, removing redundant information --- .../portal/ninja2020/credits/show.blade.php | 177 +++++++----------- 1 file changed, 70 insertions(+), 107 deletions(-) diff --git a/resources/views/portal/ninja2020/credits/show.blade.php b/resources/views/portal/ninja2020/credits/show.blade.php index fd792226c636..569e1cde527f 100644 --- a/resources/views/portal/ninja2020/credits/show.blade.php +++ b/resources/views/portal/ninja2020/credits/show.blade.php @@ -7,121 +7,84 @@ @endpush @section('body') -
-
- - -
-
-
-

- {{ ctrans('texts.credit') }} -

-

- -

+
+
+ -
-
-
-
- {{ ctrans('texts.amount') }} -
-
- {{ App\Utils\Number::formatMoney($credit->amount, $credit->client) }} -
-
-
-
- {{ ctrans('texts.balance') }} -
-
- {{ App\Utils\Number::formatMoney($credit->balance, $credit->client) }} -
-
-
-
- {{ ctrans('texts.credit_date') }} -
-
- {{ $credit->formatDate($credit->date, $credit->client->date_format()) }} -
-
-
-
- {{ ctrans('texts.public_notes') }} -
-
- {{ $credit->public_notes }} -
-
-
+ {{ ctrans('texts.page') }}: + + {{ strtolower(ctrans('texts.of')) }} + + +
+
+
+ 100% + + + + + + + + + + + + + + +
-
-
-
- - {{ ctrans('texts.page') }}: - - {{ strtolower(ctrans('texts.of')) }} - - -
-
-
- 100% - - - - - - - - - - - - - - - -
-
-
- -
-
-
-
- {{ ctrans('texts.open_in_new_tab') }} -
+
+
+
+ {{ ctrans('texts.open_in_new_tab') }}
-
-
-
- -
+
+ +
+ + + +
+
@endsection From cd2a104fbc9b106e586e6bd87249fd2ecf730078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 18 May 2021 12:03:06 +0200 Subject: [PATCH 3/4] Fullscreen view for credits --- .../Controllers/ClientPortal/CreditController.php | 13 ++++++++++--- .../ninja2020/credits/show-fullscreen.blade.php | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 resources/views/portal/ninja2020/credits/show-fullscreen.blade.php diff --git a/app/Http/Controllers/ClientPortal/CreditController.php b/app/Http/Controllers/ClientPortal/CreditController.php index ea2eefcb2c74..4d09ef3ecc71 100644 --- a/app/Http/Controllers/ClientPortal/CreditController.php +++ b/app/Http/Controllers/ClientPortal/CreditController.php @@ -22,8 +22,15 @@ class CreditController extends Controller public function show(ShowCreditRequest $request, Credit $credit) { - return $this->render('credits.show', [ - 'credit' => $credit, - ]); + set_time_limit(0); + + $data = ['credit' => $credit]; + + + if ($request->query('mode') === 'fullscreen') { + return render('credits.show-fullscreen', $data); + } + + return $this->render('credits.show', $data); } } diff --git a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php new file mode 100644 index 000000000000..438899646beb --- /dev/null +++ b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php @@ -0,0 +1,2 @@ + From aa089158bbff63a33a6650f92d48722569f09986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 18 May 2021 12:04:44 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ff7baa5ea39..bc886d8586e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop) - Add Cache-control: no-cache to prevent overaggressive caching of assets - Client portal: Multiple accounts access improvements (#5703) +- Client portal: "Credits" updates (#5734) ## [v5.1.56-release](https://github.com/invoiceninja/invoiceninja/releases/tag/v5.1.56-release) ## Fixed: