From bcd6925d1311ab4ea06f2b152055d9660e411c0f Mon Sep 17 00:00:00 2001
From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:09:25 +0300
Subject: [PATCH] Minor fixes.

---
 resources/lang/en-GB/portal.php                                 | 1 +
 .../components/documents/index/recurring_templates.blade.php    | 2 +-
 resources/views/components/documents/show/content.blade.php     | 2 +-
 resources/views/components/documents/show/message.blade.php     | 2 +-
 resources/views/portal/payments/signed.blade.php                | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en-GB/portal.php b/resources/lang/en-GB/portal.php
index 6bba524ee..a0ea4a0b1 100644
--- a/resources/lang/en-GB/portal.php
+++ b/resources/lang/en-GB/portal.php
@@ -10,6 +10,7 @@ return [
     'get_started'           => 'Get started for free',
     'billing_address'       => 'Billing Address',
     'see_all_details'       => 'See all account details',
+    'all_payments'          => 'Login to view all payments',
     'received_date'         => 'Received Date',
 
     'last_payment'          => [
diff --git a/resources/views/components/documents/index/recurring_templates.blade.php b/resources/views/components/documents/index/recurring_templates.blade.php
index a4479e64c..5f4f6d6b7 100644
--- a/resources/views/components/documents/index/recurring_templates.blade.php
+++ b/resources/views/components/documents/index/recurring_templates.blade.php
@@ -41,7 +41,7 @@
 
     <x-table.tbody>
         @foreach($documents as $item)
-            <x-table.tr href="{{ route('recurring-transactions.show', $item->id) }}">
+            <x-table.tr href="{{ route($showRoute, $item->id) }}">
             @if (! $hideBulkAction)
                 <x-table.td class="ltr:pr-6 rtl:pl-6 hidden sm:table-cell" override="class">
                     <x-index.bulkaction.single id="{{ $item->id }}" name="{{ $item->contact->name }}" />
diff --git a/resources/views/components/documents/show/content.blade.php b/resources/views/components/documents/show/content.blade.php
index f1c6f453d..f455f7c96 100644
--- a/resources/views/components/documents/show/content.blade.php
+++ b/resources/views/components/documents/show/content.blade.php
@@ -18,7 +18,7 @@
                 @php
                     $recurring_message = trans('recurring.message_parent', [
                         'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
-                        'link' => '<a href="' . route(config('type.document.' . $document->parent->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->id . '</u></a>'
+                        'link' => '<a href="' . route(config('type.document.' . $document->parent->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->document_number . '</u></a>'
                     ]);
                 @endphp
 
diff --git a/resources/views/components/documents/show/message.blade.php b/resources/views/components/documents/show/message.blade.php
index fd3396944..28a387b3f 100644
--- a/resources/views/components/documents/show/message.blade.php
+++ b/resources/views/components/documents/show/message.blade.php
@@ -10,7 +10,7 @@
             $textColor
         ])
     >
-        {!! $message !!}
+        {!! html_entity_decode($message) !!}
     </p>
 </div>
 
diff --git a/resources/views/portal/payments/signed.blade.php b/resources/views/portal/payments/signed.blade.php
index 0f309b250..b4ee5f460 100644
--- a/resources/views/portal/payments/signed.blade.php
+++ b/resources/views/portal/payments/signed.blade.php
@@ -21,7 +21,7 @@
             @stack('button_dashboard_start')
             @if (! user())
                 <x-link href="{{ route('portal.dashboard') }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-lg text-sm font-medium leading-6">
-                    {{ trans('payments.all_payments') }}
+                    {{ trans('portal.all_payments') }}
                 </x-link>
             @endif
             @stack('button_dashboard_end')