Merge branch 'akaunting:master' into master

config/logging.php

@@ -30,8 +30,10 @@ return [
     |
     */
 
-    'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+    'deprecations' => [
-
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => false,
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -79,22 +81,34 @@ return [
         'papertrail' => [
             'driver' => 'monolog',
             'level' => env('LOG_LEVEL', 'debug'),
-            'handler' => SyslogUdpHandler::class,
+            'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'),
             ],
         ],
 
         'stderr' => [
             'driver' => 'monolog',
-            'handler' => StreamHandler::class,
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => env('LOG_STDERR_HANDLER', SyslogUdpHandler::class),
             'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
         ],
 
+        'stdout' => [
+            'driver' => 'monolog',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => env('LOG_STDOUT_HANDLER', SyslogUdpHandler::class),
+            'formatter' => env('LOG_STDOUT_FORMATTER'),
+            'with' => [
+                'stream' => 'php://stdout',
+            ],
+        ],
+
         'syslog' => [
             'driver' => 'syslog',
             'level' => env('LOG_LEVEL', 'debug'),

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'          => [

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 }}" />

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
 

resources/views/components/documents/show/message.blade.php

@@ -10,7 +10,7 @@
             $textColor
         ])
     >
-        {!! $message !!}
+        {!! html_entity_decode($message) !!}
     </p>
 </div>
 

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')