diff --git a/app/Http/Controllers/ClientPortal/CreditController.php b/app/Http/Controllers/ClientPortal/CreditController.php index a72b8b70bd47..3e69220a1563 100644 --- a/app/Http/Controllers/ClientPortal/CreditController.php +++ b/app/Http/Controllers/ClientPortal/CreditController.php @@ -30,9 +30,12 @@ class CreditController extends Controller { set_time_limit(0); - $data = ['credit' => $credit]; + $invitation = $credit->invitations()->where('client_contact_id', auth()->user()->id)->first(); - $invitation = $credit->invitations()->where('client_contact_id', auth()->user()->id)->first(); + $data = [ + 'credit' => $credit, + 'key' => $invitation->key + ]; if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php index b58dd13b3425..381221e39863 100644 --- a/app/Http/Controllers/ClientPortal/QuoteController.php +++ b/app/Http/Controllers/ClientPortal/QuoteController.php @@ -58,12 +58,14 @@ class QuoteController extends Controller { /* If the quote is expired, convert the status here */ - $data = [ - 'quote' => $quote, - ]; $invitation = $quote->invitations()->where('client_contact_id', auth()->user()->id)->first(); + $data = [ + 'quote' => $quote, + 'key' => $invitation->key, + ]; + if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { $invitation->markViewed(); diff --git a/resources/views/portal/ninja2020/credits/show.blade.php b/resources/views/portal/ninja2020/credits/show.blade.php index 6a23a51594f1..28be1ee665da 100644 --- a/resources/views/portal/ninja2020/credits/show.blade.php +++ b/resources/views/portal/ninja2020/credits/show.blade.php @@ -1,5 +1,5 @@ @extends('portal.ninja2020.layout.app') -@section('meta_title', ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.credit'), 'entity_number' => $credit->number])) +@section('meta_title', ctrans('texts.view_credit')) @push('head') @@ -9,15 +9,52 @@ @endpush @section('body') +
+
+
+
+

+ {{ ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.credit'), 'entity_number' => $credit->number]) }} +

+ +
+
+

{{url("client/credit/{$key}")}}

+

Copy to clipboard

+
+
+ +
+
+
+
+ @include('portal.ninja2020.components.entity-documents', ['entity' => $credit]) @include('portal.ninja2020.components.pdf-viewer', ['entity' => $credit]) -
- -
+ @endsection @section('footer') - + + + @endsection diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php index ada4e8e9e7f2..15605a39ad07 100644 --- a/resources/views/portal/ninja2020/invoices/show.blade.php +++ b/resources/views/portal/ninja2020/invoices/show.blade.php @@ -7,7 +7,6 @@ @include('portal.ninja2020.components.no-cache') - @endpush @@ -43,7 +42,7 @@
-

{{url("client/invoice/{$key}")}}

+

{{url("client/invoice/{$key}")}}

Copy to clipboard

@@ -74,6 +73,13 @@ {{ ctrans('texts.invoice_number_placeholder', ['invoice' => $invoice->number])}} - {{ \App\Models\Invoice::stringStatus($invoice->status_id) }} + +
+
+

{{url("client/invoice/{$key}")}}

+

Copy to clipboard

+
+
@@ -88,6 +94,8 @@ @section('footer') + + + + + @endsection