From 7886355a50fb9959642142ec7d408556023f6c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Fri, 22 Jul 2022 01:27:25 +0300
Subject: [PATCH] styling transaction and transfer templates

---
 .../transactions/template/default.blade.php   |  40 +++----
 .../transfers/template/default.blade.php      | 110 ++++++++++--------
 .../transfers/template/second.blade.php       |  28 ++---
 .../transfers/template/third.blade.php        |  28 ++---
 4 files changed, 111 insertions(+), 95 deletions(-)

diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php
index bd94efb60..f5137ada9 100644
--- a/resources/views/components/transactions/template/default.blade.php
+++ b/resources/views/components/transactions/template/default.blade.php
@@ -72,10 +72,10 @@
         @if (! $hideNumber)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans_choice($textNumber, 1) }}:
+                    {{ trans_choice($textNumber, 1) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     {{ $transaction->number }}
                 </td>
             </tr>
@@ -86,10 +86,10 @@
         @if (! $hidePaidAt)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans($textPaidAt) }}:
+                    {{ trans($textPaidAt) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     @date($transaction->paid_at)
                 </td>
             </tr>
@@ -100,10 +100,10 @@
         @if (! $hideAccount)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans_choice($textAccount, 1) }}:
+                    {{ trans_choice($textAccount, 1) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     {{ $transaction->account->name }}
                 </td>
             </tr>
@@ -114,10 +114,10 @@
         @if (! $hideCategory)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans_choice($textCategory, 1) }}:
+                    {{ trans_choice($textCategory, 1) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     {{ $transaction->category->name }}
                 </td>
             </tr>
@@ -128,10 +128,10 @@
         @if (! $hidePaymentMethods)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans_choice($textPaymentMethods, 1) }}:
+                    {{ trans_choice($textPaymentMethods, 1) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     {{ !empty($payment_methods[$transaction->payment_method]) ? $payment_methods[$transaction->payment_method] : trans('general.na') }}
                 </td>
             </tr>
@@ -142,10 +142,10 @@
         @if (! $hideReference)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans($textReference) }}:
+                    {{ trans($textReference) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     {{ $transaction->reference }}
                 </td>
             </tr>
@@ -156,10 +156,10 @@
         @if (! $hideDescription)
             <tr>
                 <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                    {{ trans($textDescription) }}:
+                    {{ trans($textDescription) }}
                 </td>
 
-                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                     <p style="font-size:12px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; margin: 0;">
                         {!! nl2br($transaction->description) !!}
                     </p>
@@ -196,7 +196,7 @@
                         {{ trans('general.name') }}
                     </td>
 
-                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                         {{ $transaction->contact->name }}
                     </td>
                 </tr>
@@ -210,7 +210,7 @@
                         {{ trans('general.address') }}
                     </td>
 
-                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                         {!! nl2br($transaction->contact->address) !!}
                     </td>
                 </tr>
@@ -224,7 +224,7 @@
                         {{ trans('general.tax_number') }}
                     </td>
 
-                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                    <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 }}
                         @endif
@@ -240,7 +240,7 @@
                         {{ trans('general.phone') }}
                     </td>
 
-                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                    <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 }}
                         @endif
@@ -256,7 +256,7 @@
                         {{ trans('general.email') }}
                     </td>
 
-                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding:  8px 0 0 0; font-size: 12px;">
+                    <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                         {{ $transaction->contact->email }}
                     </td>
                 </tr>
@@ -369,7 +369,7 @@
                     <table>
                         <tr>
                             <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
-                                {{ trans($textAmount) }}:
+                                {{ trans($textAmount) }}
                             </td>
 
                             <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
diff --git a/resources/views/components/transfers/template/default.blade.php b/resources/views/components/transfers/template/default.blade.php
index 95e806a2e..fce23ca2c 100644
--- a/resources/views/components/transfers/template/default.blade.php
+++ b/resources/views/components/transfers/template/default.blade.php
@@ -1,5 +1,5 @@
 <div class="print-template">
-    <table class="border-bottom-1" style="width: 100%;">
+    <table class="border-bottom-1">
         <tbody>
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
@@ -9,11 +9,11 @@
 
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.account_name') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.account_name') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->expense_account->name }}
                             </td>
                         </tr>
@@ -21,57 +21,63 @@
 
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.number') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->expense_account->number }}
                             </td>
                         </tr>
                     </table>
 
+                    @if (! empty($transfer->expense_account->bank_name))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.bank_name') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.bank_name') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->expense_account->bank_name }}
                             </td>
                         </tr>
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->expense_account->bank_phone))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.phone') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('general.phone') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->expense_account->bank_phone }}
                             </td>
                         </tr>
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->expense_account->bank_address))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.address') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('general.address') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->expense_account->bank_address }}
                             </td>
                         </tr>
                     </table>
+                    @endif
                 </td>
             </tr>
         </tbody>
     </table>
 
-    <table class="border-bottom-1" style="width: 100%; margin-top:15px;">
+    <table class="border-bottom-1" style="margin-top:15px;">
         <tbody>
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
@@ -81,11 +87,11 @@
 
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.account_name') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.account_name') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->income_account->name }}
                             </td>
                         </tr>
@@ -93,57 +99,63 @@
 
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.number') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->income_account->number }}
                             </td>
                         </tr>
                     </table>
 
+                    @if (! empty($transfer->income_account->bank_name))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.bank_name') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('accounts.bank_name') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->income_account->bank_name }}
                             </td>
                         </tr>
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->income_account->bank_phone))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.phone') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('general.phone') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->income_account->bank_phone }}
                             </td>
                         </tr>
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->income_account->bank_address))
                     <table>
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.address') }}:
+                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                                {{ trans('general.address') }}
                             </td>
 
-                            <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                            <td valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                                 {{ $transfer->income_account->bank_address }}
                             </td>
                         </tr>
                     </table>
+                    @endif
                 </td>
             </tr>
         </tbody>
     </table>
 
-    <table style="width: 100%; margin-top:15px;">
+    <table style="margin-top:15px;">
         <tr>
             <td style="padding:0 0 15px 0;">
                 <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
@@ -153,23 +165,23 @@
         </tr>
     </table>
 
-    <table>
+    <table class="border-bottom-1" style="padding-bottom:15px;">
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;">
-                {{ trans('general.date') }}:
+            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                {{ trans('general.date') }}
             </td>
 
-            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+            <td valign="top" valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                 <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
             </td>
         </tr>
 
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;">
-                {{ trans_choice('general.payment_methods', 1) }}:
+            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
-            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+            <td valign="top" valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                 @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
                     {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
                 @else
@@ -179,33 +191,37 @@
         </tr>
 
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;">
-                {{ trans('general.reference') }}:
+            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                {{ trans('general.reference') }}
             </td>
 
-            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+            <td valign="top" valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                 {{ $transfer->expense_transaction->reference }}
             </td>
         </tr>
 
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;">
+            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
                 {{ trans('general.description') }}
             </td>
 
-            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+            <td valign="top" valign="top" class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
                 {{ $transfer->expense_transaction->description }}
             </td>
         </tr>
+
+        <tr>
+            <td></td>
+        </tr>
     </table>
 
-    <table style="text-align: right;">
+    <table style="text-align: right; margin-top:55px;">
         <tr>
             <td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
                 <table>
                     <tr>
                         <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
-                            {{ trans('general.amount') }}:
+                            {{ trans('general.amount') }}
                         </td>
 
                         <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
diff --git a/resources/views/components/transfers/template/second.blade.php b/resources/views/components/transfers/template/second.blade.php
index d0a6b0e3f..b133f54b3 100644
--- a/resources/views/components/transfers/template/second.blade.php
+++ b/resources/views/components/transfers/template/second.blade.php
@@ -12,7 +12,7 @@
     <table>
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
-                {{ trans('general.date') }}:
+                {{ trans('general.date') }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
@@ -22,7 +22,7 @@
 
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
-                {{ trans_choice('general.payment_methods', 1) }}:
+                {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
@@ -36,7 +36,7 @@
 
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
-                {{ trans('general.reference') }}:
+                {{ trans('general.reference') }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
@@ -66,7 +66,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                                {{ trans('accounts.account_name') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -78,7 +78,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                                {{ trans('accounts.number') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -90,7 +90,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.bank_name') }}:
+                                {{ trans('accounts.bank_name') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -102,7 +102,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.phone') }}:
+                                {{ trans('general.phone') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -114,7 +114,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.address') }}:
+                                {{ trans('general.address') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -138,7 +138,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                                {{ trans('accounts.number') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -150,7 +150,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.number') }}:
+                                {{ trans('accounts.number') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -162,7 +162,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('accounts.bank_name') }}:
+                                {{ trans('accounts.bank_name') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -174,7 +174,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.phone') }}:
+                                {{ trans('general.phone') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -186,7 +186,7 @@
                     <table>
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                {{ trans('general.address') }}:
+                                {{ trans('general.address') }}
                             </td>
 
                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -205,7 +205,7 @@
                 <table>
                     <tr>
                         <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            {{ trans('general.amount') }}:
+                            {{ trans('general.amount') }}
                         </td>
 
                         <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
diff --git a/resources/views/components/transfers/template/third.blade.php b/resources/views/components/transfers/template/third.blade.php
index 539f4ff06..25188a78b 100644
--- a/resources/views/components/transfers/template/third.blade.php
+++ b/resources/views/components/transfers/template/third.blade.php
@@ -14,7 +14,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.number') }}:
+                                                {{ trans('accounts.account_name') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -26,7 +26,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.number') }}:
+                                                {{ trans('accounts.number') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -38,7 +38,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.bank_name') }}:
+                                                {{ trans('accounts.bank_name') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -50,7 +50,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('general.phone') }}:
+                                                {{ trans('general.phone') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -62,7 +62,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('general.address') }}:
+                                                {{ trans('general.address') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -88,7 +88,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.number') }}:
+                                                {{ trans('accounts.number') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -100,7 +100,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.number') }}:
+                                                {{ trans('accounts.number') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -112,7 +112,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.bank_name') }}:
+                                                {{ trans('accounts.bank_name') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -124,7 +124,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('general.phone') }}:
+                                                {{ trans('general.phone') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -136,7 +136,7 @@
                                     <table>
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('general.address') }}:
+                                                {{ trans('general.address') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@@ -166,7 +166,7 @@
     <table>
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-                {{ trans('general.date') }}:
+                {{ trans('general.date') }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
@@ -176,7 +176,7 @@
 
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-                {{ trans_choice('general.payment_methods', 1) }}:
+                {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
@@ -190,7 +190,7 @@
 
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-                {{ trans('general.reference') }}:
+                {{ trans('general.reference') }}
             </td>
 
             <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
@@ -215,7 +215,7 @@
                 <table>
                     <tr>
                         <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            {{ trans('general.amount') }}:
+                            {{ trans('general.amount') }}
                         </td>
 
                         <td valign="center" style="width: 20%; padding:0; font-size: 14px;">