Merge branch 'akaunting:master' into master

app/Abstracts/View/Components/Transactions/Show.php

@@ -299,6 +299,9 @@ abstract class Show extends Component
     /** @var bool */
     public $hideRecurringMessage;
 
+    /** @var bool */
+    public $hideCreated;
+
     /**
      * Create a new component instance.
      *
@@ -327,7 +330,7 @@ abstract class Show extends Component
         string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '',
 
         bool $hideSchedule = false, bool $hideChildren = false, bool $hideAttachment = false, $attachment = [],
-        array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false
+        array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false, bool $hideCreated = false
     ) {
         $this->type = $type;
         $this->transaction = $transaction;
@@ -461,6 +464,7 @@ abstract class Show extends Component
 
         $this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType);
         $this->hideRecurringMessage = $hideRecurringMessage;
+        $this->hideCreated = $hideCreated;
     }
 
     protected function getTransactionTemplate($type, $transactionTemplate)

resources/views/components/empty-page.blade.php

@@ -46,9 +46,13 @@
                 <li class="border-b p-2  hover:bg-gray-100">
                     <a href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs">
                         <div class="truncate">
-                            <h2 class="">{{ $suggestion->name }}</h2>
+                            <h2>
+                                {{ $suggestion->name }}
+                            </h2>
 
-                            <div class="h-4 overflow-hidden text-black-400 truncate">Enter details and create your first expense easily</div>
+                            <div class="h-4 overflow-hidden text-black-400 truncate">
+                                {{ $suggestion->description ?? '' }}
+                            </div>
                         </div>
 
                         <span class="material-icons text-gray-500">chevron_right</span>

resources/views/components/layouts/modules/show/information.blade.php

@@ -6,6 +6,6 @@
 
 <div x-show="price_type == false" class="text-center text-sm mt-3 mb--2">
     <span style="font-size: 12px;">
-        <span class="text-danger">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=app&utm_medium=show&utm_campaign={{ $module->name }}" target="_blank">{!! trans('modules.information_monthly') !!}</a>
+        <span class="text-danger">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=app_show&utm_medium=software&utm_campaign={{ str_replace('-', '', $module->slug) }}" target="_blank">{!! trans('modules.information_monthly') !!}</a>
     </span>
 </div>

resources/views/components/transactions/show/content.blade.php

@@ -29,10 +29,12 @@
         @stack('recurring_message_end')
 
         @stack('row_create_start')
+        @if (! $hideCreated)
         <x-transactions.show.create
             type="{{ $type }}"
             :transaction="$transaction"
         />
+        @endif
         @stack('row_create_end')
 
         @stack('schedule_start')

resources/views/components/transactions/template/default.blade.php

@@ -181,7 +181,6 @@
 
     <table class="border-bottom-1" style="padding-bottom:15px;">
         @if (! $hideContact)
-
             @if (! $hideContactInfo)
                 <tr>
                     <td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -196,6 +195,7 @@
                     <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                         {{ trans('general.name') }}
                     </td>
+
                     <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
                         {{ $transaction->contact->name }}
                     </td>
@@ -209,6 +209,7 @@
                     <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                         {{ trans('general.address') }}
                     </td>
+
                     <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
                         {!! nl2br($transaction->contact->address) !!}
                     </td>
@@ -222,6 +223,7 @@
                     <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                         {{ trans('general.tax_number') }}
                     </td>
+
                     <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
                         @if ($transaction->contact->tax_number)
                             {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }}
@@ -237,6 +239,7 @@
                     <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                         {{ trans('general.phone') }}
                     </td>
+
                     <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
                         @if ($transaction->contact->phone)
                             {{ $transaction->contact->phone }}
@@ -252,6 +255,7 @@
                     <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                         {{ trans('general.email') }}
                     </td>
+
                     <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
                         {{ $transaction->contact->email }}
                     </td>
@@ -259,6 +263,7 @@
             @endif
             @stack('email_input_end')
         @endif
+
         <tr>
             <td></td>
         </tr>
@@ -269,7 +274,9 @@
             <table>
                 <tr>
                     <td style="padding:15px 0 0 0;">
-                    <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">{{ trans($textRelatedTransansaction) }}</h2>
+                        <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">
+                            {{ trans($textRelatedTransansaction) }}
+                        </h2>
                     </td>
                 </tr>
             </table>
@@ -279,32 +286,39 @@
                     <tr class="border-bottom-1">
                         <th class="item text-alignment-left text-left" style="padding:5px 0;">
                             @if (! $hideRelatedDocumentNumber)
-                            <span style="font-size: 13px;">{{ trans_choice($textRelatedDocumentNumber, 1) }}</span> <br />
+                                <span style="font-size: 13px;">
+                                    {{ trans_choice($textRelatedDocumentNumber, 1) }}
+                                </span>
+                                <br />
                             @endif
 
                             @if (! $hideRelatedContact)
-                            <span style="font-weight:500;"> {{ trans_choice($textRelatedContact, 1) }} </span>
+                                <span style="font-weight:500;">
+                                    {{ trans_choice($textRelatedContact, 1) }}
+                                </span>
                             @endif
                         </th>
 
-
                         @if (! $hideRelatedDocumentDate)
                             <th class="price" style="padding:5px 0; text-align:center;">
                                 {{ trans($textRelatedDocumentDate) }}
                             </th>
                         @endif
 
-
                         <th class="price text-alignment-right text-right" style="padding: 5px 0;">
                             @if (! $hideRelatedDocumentAmount)
-                            <span style="font-size: 13px;">{{ trans($textRelatedDocumentAmount) }}</span><br />
+                                <span style="font-size: 13px;">
+                                    {{ trans($textRelatedDocumentAmount) }}
+                                </span>
+                                <br />
                             @endif
 
                             @if (! $hideRelatedAmount)
-                            <span style="font-weight:500;">{{ trans($textRelatedAmount) }}</span>
+                                <span style="font-weight:500;">
+                                    {{ trans($textRelatedAmount) }}
+                                </span>
                             @endif
                         </th>
-
                     </tr>
                 </thead>
 
@@ -314,11 +328,14 @@
                             @if (! $hideRelatedDocumentNumber)
                                 <a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
                                     {{ $transaction->document->document_number }}
-                            </a> <br />
+                                </a>
+                                <br />
                             @endif
 
                             @if (! $hideRelatedContact)
-                            <span style="color: #6E6E6E"> {{ $transaction->document->contact_name }} </span>
+                                <span style="color: #6E6E6E">
+                                    {{ $transaction->document->contact_name }}
+                                </span>
                             @endif
                         </td>
 
@@ -334,7 +351,9 @@
                             @endif
 
                             @if (! $hideRelatedAmount)
-                            <span style="color: #6E6E6E"> @money($transaction->amount, $transaction->currency_code, true) </span>
+                                <span style="color: #6E6E6E">
+                                    @money($transaction->amount, $transaction->currency_code, true)
+                                </span>
                             @endif
                         </td>
                     </tr>
@@ -352,6 +371,7 @@
                             <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
                                 {{ trans($textAmount) }}:
                             </td>
+
                             <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
                                 @money($transaction->amount, $transaction->currency_code, true)
                             </td>