Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

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)

app/BulkActions/Sales/Invoices.php

@@ -5,7 +5,7 @@ namespace App\BulkActions\Sales;
 use App\Abstracts\BulkAction;
 use App\Events\Document\DocumentCancelled;
 use App\Events\Document\DocumentCreated;
-use App\Events\Document\DocumentSent;
+use App\Events\Document\DocumentMarkedSent;
 use App\Events\Document\PaymentReceived;
 use App\Exports\Sales\Invoices as Export;
 use App\Jobs\Document\DeleteDocument;
@@ -58,7 +58,7 @@ class Invoices extends BulkAction
                 continue;
             }
 
-            event(new DocumentSent($invoice));
+            event(new DocumentMarkedSent($invoice));
         }
     }
 

app/Events/Document/DocumentMarkedSent.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Events\Document;
+
+use App\Abstracts\Event;
+
+class DocumentMarkedSent extends Event
+{
+    public $document;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $document
+     */
+    public function __construct($document)
+    {
+        $this->document = $document;
+    }
+}

app/Http/Controllers/Sales/Invoices.php

@@ -220,7 +220,7 @@ class Invoices extends Controller
      */
     public function markSent(Document $invoice)
     {
-        event(new \App\Events\Document\DocumentSent($invoice));
+        event(new \App\Events\Document\DocumentMarkedSent($invoice));
 
         $message = trans('documents.messages.marked_sent', ['type' => trans_choice('general.invoices', 1)]);
 

app/Listeners/Document/MarkDocumentSent.php

@@ -2,7 +2,8 @@
 
 namespace App\Listeners\Document;
 
-use App\Events\Document\DocumentSent as Event;
+use App\Events\Document\DocumentMarkedSent;
+use App\Events\Document\DocumentSent;
 use App\Jobs\Document\CreateDocumentHistory;
 use App\Traits\Jobs;
 
@@ -10,13 +11,7 @@ class MarkDocumentSent
 {
     use Jobs;
 
-    /**
+    public function handle(DocumentMarkedSent|DocumentSent $event): void
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
     {
         if ($event->document->status != 'partial') {
             $event->document->status = 'sent';
@@ -24,6 +19,11 @@ class MarkDocumentSent
             $event->document->save();
         }
 
+        $this->dispatch(new CreateDocumentHistory($event->document, 0, $this->getDescription($event)));
+    }
+
+    public function getDescription(DocumentMarkedSent|DocumentSent $event): string
+    {
         $type_text = '';
 
         if ($alias = config('type.document.' . $event->document->type . '.alias', '')) {
@@ -34,12 +34,8 @@ class MarkDocumentSent
 
         $type = trans_choice($type_text, 1);
 
-        $this->dispatch(
+        $message = ($event instanceof DocumentMarkedSent) ? 'marked_sent' : 'email_sent';
-            new CreateDocumentHistory(
+
-                $event->document,
+        return trans('documents.messages.' . $message, ['type' => $type]);
-                0,
-                trans('documents.messages.marked_sent', ['type' => $type])
-            )
-        );
     }
 }

app/Models/Document/Document.php

@@ -179,24 +179,29 @@ class Document extends Model
         return $query->whereDate('due_at', '=', $date);
     }
 
+    public function scopeStatus(Builder $query, string $status): Builder
+    {
+        return $query->where($this->qualifyColumn('status'), '=', $status);
+    }
+
     public function scopeAccrued(Builder $query): Builder
     {
-        return $query->whereNotIn('status', ['draft', 'cancelled']);
+        return $query->whereNotIn($this->qualifyColumn('status'), ['draft', 'cancelled']);
     }
 
     public function scopePaid(Builder $query): Builder
     {
-        return $query->where('status', '=', 'paid');
+        return $query->where($this->qualifyColumn('status'), '=', 'paid');
     }
 
     public function scopeNotPaid(Builder $query): Builder
     {
-        return $query->where('status', '<>', 'paid');
+        return $query->where($this->qualifyColumn('status'), '<>', 'paid');
     }
 
     public function scopeFuture(Builder $query): Builder
     {
-        return $query->whereIn('status', $this->getDocumentStatusesForFuture());
+        return $query->whereIn($this->qualifyColumn('status'), $this->getDocumentStatusesForFuture());
     }
 
     public function scopeType(Builder $query, string $type): Builder
@@ -244,14 +249,14 @@ class Document extends Model
 
     public function getSentAtAttribute(string $value = null)
     {
-        $sent = $this->histories()->where('status', 'sent')->first();
+        $sent = $this->histories()->where('document_histories.status', 'sent')->first();
 
         return $sent->created_at ?? null;
     }
 
     public function getReceivedAtAttribute(string $value = null)
     {
-        $received = $this->histories()->where('status', 'received')->first();
+        $received = $this->histories()->where('document_histories.status', 'received')->first();
 
         return $received->created_at ?? null;
     }

app/Providers/Event.php

@@ -57,6 +57,9 @@ class Event extends Provider
             'App\Listeners\Document\CreateDocumentTransaction',
             'App\Listeners\Document\SendDocumentPaymentNotification',
         ],
+        'App\Events\Document\DocumentMarkedSent' => [
+            'App\Listeners\Document\MarkDocumentSent',
+        ],
         'App\Events\Document\DocumentSent' => [
             'App\Listeners\Document\MarkDocumentSent',
         ],

public/akaunting-js/generalAction.js

@@ -277,4 +277,17 @@ function runTooltip(tooltipToggleEl) {
         tooltipToggleEl.addEventListener(event, hide);
     });
 }
-// Tooltip elements using [data-tooltip-target], [data-tooltip-placement]
+// Tooltip elements using [data-tooltip-target], [data-tooltip-placement]
+
+//Auto Height for Textarea
+const tx = document.querySelectorAll('[textarea-auto-height]');
+for (let i = 0; i < tx.length; i++) {
+  tx[i].setAttribute('style', 'height:' + (tx[i].scrollHeight) + 'px;overflow-y:hidden;');
+  tx[i].addEventListener('input', OnInput, false);
+}
+
+function OnInput() {
+  this.style.height = 'auto';
+  this.style.height = (this.scrollHeight) + 'px';
+}
+//Auto Height for Textarea

public/css/app.css

@@ -1584,7 +1584,7 @@ input[type="date"]::-webkit-inner-spin-button,
     }
 
 .overflow-overlay {
-        overflow: overlay;
+        overflow-x: overlay;
     }
 
 .py-top {

public/css/print.css

@@ -59,12 +59,12 @@ th, td
     margin-bottom: 8px;
 }
 
-.mt-1
+.print-template .mt-1
 {
     margin-top: 8px;
 }
 
-.ml-1
+.print-template .ml-1
 {
     margin-left: 8px;
 }
@@ -74,67 +74,67 @@ th, td
     padding-left: 18px;
 }
 
-.mt-0
+.print-template .mt-0
 {
     margin-top: 0 !important;
 }
 
-.mt-1
+.print-template .mt-1
 {
     margin-top: 8px;
 }
 
-.mt-2
+.print-template .mt-2
 {
     margin-top: 16px;
 }
 
-.mt-3
+.print-template .mt-3
 {
     margin-top: 24px;
 }
 
-.mt-4
+.print-template .mt-4
 {
     margin-top: 32px;
 }
 
-.mt-5
+.print-template .mt-5
 {
     margin-top: 40px;
 }
 
-.mt-6
+.print-template .mt-6
 {
     margin-top: 48px;
 }
 
-.mt-7
+.print-template .mt-7
 {
     margin-top: 56px;
 }
 
-.mt-8
+.print-template .mt-8
 {
     margin-top: 64px;
 }
 
-.mt-9
+.print-template .mt-9
 {
     margin-top: 72px;
 }
 
-.pb-0
+.print-template .pb-0
 {
     padding-bottom: 0;
 }
 
-.pb-1
+.print-template .pb-1
 {
     padding-bottom: 8px;
 }
 
-.py-1
+.print-template .py-1
 {
     padding-bottom: 3px;
     padding-top: 3px;
@@ -158,47 +158,47 @@ th, td
     padding: 0 10px 0 10px;
 }
 
-.pt-2
+.print-template .pt-2
 {
     padding-top: 16px;
 }
 
-.pb-2
+.print-template .pb-2
 {
     padding-bottom: 16px;
 }
 
-.pl-3
+.print-template .pl-3
 {
     padding-left: 24px;
 }
 
-.pl-4
+.print-template .pl-4
 {
     padding-left: 32px;
 }
 
-.pl-5
+.print-template .pl-5
 {
     padding-left: 40px;
 }
 
-.pl-6
+.print-template .pl-6
 {
     padding-left: 48px;
 }
 
-.pl-7
+.print-template .pl-7
 {
     padding-left: 56px;
 }
 
-.pl-8
+.print-template .pl-8
 {
     padding-left: 64px;
 }
 
-.pl-9
+.print-template .pl-9
 {
     padding-left: 72px;
 }
@@ -383,7 +383,7 @@ html[dir='rtl'] .text-alignment-right {
 .lines
 {
     border-collapse: collapse;
-    table-layout: fixed;
+    table-layout: auto;
     border-bottom: 1px solid #adadad;
 }
 
@@ -564,7 +564,7 @@ html[dir='rtl'] .text-alignment-right {
 .modern-lines
 {
     border-collapse: collapse;
-    table-layout: fixed;
+    table-layout: auto;
 }
 
 .modern-lines .item

resources/assets/js/components/AkauntingModal.vue

@@ -125,7 +125,7 @@ export default {
         if (this.show) {
             let documentClasses = document.body.classList;
 
-            documentClasses.add("overflow-hidden");
+            documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
         }
 
         if (this.modalDialogClass) {
@@ -158,7 +158,7 @@ export default {
         onCancel() {
             let documentClasses = document.body.classList;
 
-            documentClasses.remove("overflow-hidden");
+            documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
 
             this.$emit("cancel");
         }
@@ -169,9 +169,9 @@ export default {
             let documentClasses = document.body.classList;
 
             if (val) {
-                documentClasses.add("overflow-hidden");
+                documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
             } else {
-                documentClasses.remove("overflow-hidden");
+                documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
             }
         }
     }

resources/assets/js/components/AkauntingModalAddNew.vue

@@ -154,7 +154,7 @@ export default {
     created: function () {
         let documentClasses = document.body.classList;
 
-        documentClasses.add("overflow-hidden");
+        documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
 
         if (this.modalDialogClass) {
             let modal_size = this.modalDialogClass.replace('modal-', 'max-w-screen-');
@@ -311,7 +311,7 @@ export default {
         onCancel() {
             let documentClasses = document.body.classList;
 
-            documentClasses.remove("overflow-hidden");
+            documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
 
             this.$emit("cancel");
         }
@@ -322,9 +322,9 @@ export default {
             let documentClasses = document.body.classList;
 
             if (val) {
-                documentClasses.add("overflow-hidden");
+                documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
             } else {
-                documentClasses.remove("overflow-hidden");
+                documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
             }
         }
     }

resources/assets/sass/app.css

@@ -189,7 +189,7 @@
     }
 
     .overflow-overlay {
-        overflow: overlay;
+        overflow-x: overlay;
     }
 
     .py-top {

resources/lang/en-GB/documents.php

@@ -2,84 +2,80 @@
 
 return [
 
-    'edit_columns'  => 'Edit Columns',
+    'edit_columns'              => 'Edit Columns',
-    'empty_items'   => 'You have not added any items.',
+    'empty_items'               => 'You have not added any items.',
+    'grand_total'               => 'Grand Total',
+    'accept_payment_online'     => 'Accept Payments Online',
+    'transaction'               => 'A payment for :amount was made using :account.',
+    'billing'                   => 'Billing',
+    'advanced'                  => 'Advanced',
 
-    'invoice_detail'   => [
+    'invoice_detail' => [
-        'marked'  => '<b> You </b> marked this invoice as',
+        'marked'                => '<b>You</b> marked this invoice as',
-        'services' => 'Services',
+        'services'              => 'Services',
-        'another_item'  => 'Another Item',
+        'another_item'          => 'Another Item',
-        'another_description'  => 'and another description',
+        'another_description'   => 'and another description',
-        'more_item'  => '+:count more item',
+        'more_item'             => '+:count more item',
     ],
 
-    'grand_total'  => 'Grand Total',
-
-    'accept_payment_online' => 'Accept Payments Online',
-
-    'transaction' => 'A payment for :amount was made using :account.',
-
-    'billing'               => 'Billing',
-    'advanced'              => 'Advanced',
-
     'statuses' => [
-        'draft'         => 'Draft',
+        'draft'                 => 'Draft',
-        'sent'          => 'Sent',
+        'sent'                  => 'Sent',
-        'expired'       => 'Expired',
+        'expired'               => 'Expired',
-        'viewed'        => 'Viewed',
+        'viewed'                => 'Viewed',
-        'approved'      => 'Approved',
+        'approved'              => 'Approved',
-        'received'      => 'Received',
+        'received'              => 'Received',
-        'refused'       => 'Refused',
+        'refused'               => 'Refused',
-        'restored'      => 'Restored',
+        'restored'              => 'Restored',
-        'reversed'      => 'Reversed',
+        'reversed'              => 'Reversed',
-        'partial'       => 'Partial',
+        'partial'               => 'Partial',
-        'paid'          => 'Paid',
+        'paid'                  => 'Paid',
-        'pending'       => 'Pending',
+        'pending'               => 'Pending',
-        'invoiced'      => 'Invoiced',
+        'invoiced'              => 'Invoiced',
-        'overdue'       => 'Overdue',
+        'overdue'               => 'Overdue',
-        'unpaid'        => 'Unpaid',
+        'unpaid'                => 'Unpaid',
-        'cancelled'     => 'Cancelled',
+        'cancelled'             => 'Cancelled',
-        'voided'        => 'Voided',
+        'voided'                => 'Voided',
-        'completed'     => 'Completed',
+        'completed'             => 'Completed',
-        'shipped'       => 'Shipped',
+        'shipped'               => 'Shipped',
-        'refunded'      => 'Refunded',
+        'refunded'              => 'Refunded',
-        'failed'        => 'Failed',
+        'failed'                => 'Failed',
-        'denied'        => 'Denied',
+        'denied'                => 'Denied',
-        'processed'     => 'Processed',
+        'processed'             => 'Processed',
-        'open'          => 'Open',
+        'open'                  => 'Open',
-        'closed'        => 'Closed',
+        'closed'                => 'Closed',
-        'billed'        => 'Billed',
+        'billed'                => 'Billed',
-        'delivered'     => 'Delivered',
+        'delivered'             => 'Delivered',
-        'returned'      => 'Returned',
+        'returned'              => 'Returned',
-        'drawn'         => 'Drawn',
+        'drawn'                 => 'Drawn',
-        'not_billed'    => 'Not Billed',
+        'not_billed'            => 'Not Billed',
-        'issued'        => 'Issued',
+        'issued'                => 'Issued',
-        'not_invoiced'  => 'Not Invoiced',
+        'not_invoiced'          => 'Not Invoiced',
-        'confirmed'     => 'Confirmed',
+        'confirmed'             => 'Confirmed',
-        'not_confirmed' => 'Not Confirmed',
+        'not_confirmed'         => 'Not Confirmed',
-        'active'        => 'Active',
+        'active'                => 'Active',
-        'ended'         => 'Ended',
+        'ended'                 => 'Ended',
     ],
 
     'form_description' => [
-        'companies'     => 'Change the address, logo, and other information for your company.',
+        'companies'             => 'Change the address, logo, and other information for your company.',
-        'billing'       => 'Billing details appears in your document.',
+        'billing'               => 'Billing details appears in your document.',
-        'advanced'      => 'Select the category, add or edit the footer, and add attachments to your :type.',
+        'advanced'              => 'Select the category, add or edit the footer, and add attachments to your :type.',
-        'attachment'    => 'Download the files attached to this :type',
+        'attachment'            => 'Download the files attached to this :type',
     ],
 
     'messages' => [
-        'email_sent'        => ':type email has been sent!',
+        'email_sent'            => ':type email has been sent!',
-        'marked_as'         => ':type marked as :status!',
+        'marked_as'             => ':type marked as :status!',
-        'marked_sent'       => ':type marked as sent!',
+        'marked_sent'           => ':type marked as sent!',
-        'marked_paid'       => ':type marked as paid!',
+        'marked_paid'           => ':type marked as paid!',
-        'marked_viewed'     => ':type marked as viewed!',
+        'marked_viewed'         => ':type marked as viewed!',
-        'marked_cancelled'  => ':type marked as cancelled!',
+        'marked_cancelled'      => ':type marked as cancelled!',
-        'marked_received'   => ':type marked as received!',
+        'marked_received'       => ':type marked as received!',
     ],
 
     'recurring' => [
-        'auto_generated' => 'Auto-generated',
+        'auto_generated'        => 'Auto-generated',
 
         'tooltip' => [
             'document_date'     => 'The :type date will be automatically assigned based on the :type schedule and frequency.',

resources/views/banking/recurring_transactions/show.blade.php

@@ -8,7 +8,7 @@
     </x-slot>
 
     <x-slot name="buttons">
-        <x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" />
+        <x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" hide-divider4 hide-button-delete />
     </x-slot>
 
     <x-slot name="moreButtons">
@@ -21,8 +21,8 @@
             hide-button-share
             hide-button-email
             hide-divider-2
-            hide-button-delete
             hide-divider-4
+            hide-button-delete
         />
     </x-slot>
 

resources/views/banking/transactions/index.blade.php

@@ -162,15 +162,18 @@
                                                 <x-slot name="first">
                                                     {{ $item->contact->name }}
                                                 </x-slot>
-                                                <x-slot name="second" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class">
+                                                <x-slot name="second" class="w-20 font-normal group">
                                                     @if ($item->document)
-                                                        <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
+                                                        <div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
-                                                            {{ $item->document->document_number }}
+                                                            <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
-                                                        </a>
+                                                                {{ $item->document->document_number }}
+                                                            </a>
 
-                                                        <div class="w-28 absolute h-10 -ml-12 -mt-6"></div>
+                                                            <div class="w-28 absolute h-10 -ml-12 -mt-6">
+                                                            </div>
 
-                                                        <x-documents.index.information :document="$item->document" />
+                                                            <x-documents.index.information :document="$item->document" />
+                                                        </div>
                                                     @else
                                                         <x-empty-data />
                                                     @endif

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

@@ -215,12 +215,12 @@
                                                     {{ $item->contact_name }}
                                                 </x-slot>
 
-                                                <x-slot name="second" class="relative w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
+                                                <x-slot name="second" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
                                                     <span class="border-black border-b border-dashed">
                                                         {{ $item->document_number }}
                                                     </span>
 
-                                                    <div class="w-full absolute h-10 -left-10 -mt-6"></div>
+                                                    <div class="w-28 absolute h-10 -left-10 -mt-6"></div>
 
                                                     <x-documents.index.information :document="$item" />
                                                 </x-slot>

resources/views/components/documents/form/note.blade.php

@@ -8,5 +8,6 @@
         form-label-class="lg:text-lg"
         form-group-class="border-b pb-2 mb-3.5"
         rows="1"
+        textarea-auto-height
     />
 </div>

resources/views/components/documents/index/information.blade.php

@@ -1,4 +1,4 @@
-<div id="tooltip-information-{{ $document->id }}" role="tooltip" class="w-96 inline-block absolute z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap tooltip-content transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible">
+<div id="tooltip-information-{{ $document->id }}" role="tooltip" class="w-96 inline-block absolute left-0 z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap tooltip-content transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible">
     <div class="absolute w-2 h-2 inset-y-1/2 -right-1 before:content-[' '] before:absolute before:w-2 before:h-2 before:bg-lilac-900 before:border-gray-200 before:transform before:rotate-45 before:border before:border-t-0 before:border-l-0 data-popper-arrow"></div>
 
     <ul>

resources/views/components/documents/show/more-buttons.blade.php

@@ -130,8 +130,6 @@
             <x-dropdown.link href="{{ route($endRoute, $document->id) }}">
                 {{ trans('recurring.end') }}
             </x-dropdown.link>
-
-            <x-dropdown.divider />
         @endif
 
         @stack('end_button_end')

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

@@ -1,4 +1,4 @@
-<div class="p-7 shadow-2xl rounded-2xl print-template">
+<div class="p-7 shadow-2xl rounded-2xl">
     @if ($documentTemplate)
         @switch($documentTemplate)
             @case('classic')

resources/views/components/documents/template/classic.blade.php

@@ -1,387 +1,389 @@
-<div class="row">
+<div class="print-template">
-    <div class="col-100">
+    <div class="row">
-        <div class="text text-dark">
+        <div class="col-100">
-            <h3>
+            <div class="text text-dark">
-                {{ $textDocumentTitle }}
+                <h3>
-            </h3>
+                    {{ $textDocumentTitle }}
-        </div>
+                </h3>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-58">
-        <div class="text">
-            @stack('company_logo_start')
-            @if (! $hideCompanyLogo)
-                @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
-                    <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
-                @else
-                    <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
-                @endif
-            @endif
-            @stack('company_logo_end')
-        </div>
-    </div>
-
-    <div class="col-42">
-        <div class="text right-column">
-            @stack('company_details_start')
-            @if ($textDocumentSubheading)
-                <p class="text-normal font-semibold">
-                    {{ $textDocumentSubheading }}
-                </p>
-            @endif
-
-            @if (! $hideCompanyDetails)
-                @if (! $hideCompanyName)
-                    <p>{{ setting('company.name') }}</p>
-                @endif
-
-                @if (! $hideCompanyAddress)
-                    <p>
-                        {!! nl2br(setting('company.address')) !!}
-                        {!! $document->company->location !!}
-                    </p>
-                @endif
-
-                @if (! $hideCompanyTaxNumber)
-                    @if (setting('company.tax_number'))
-                        <p>
-                            <span class="text-medium text-default">
-                                {{ trans('general.tax_number') }}:
-                            </span>
-                            {{ setting('company.tax_number') }}
-                        </p>
-                    @endif
-                @endif
-
-                @if (! $hideCompanyPhone)
-                    @if (setting('company.phone'))
-                        <p>
-                            {{ setting('company.phone') }}
-                        </p>
-                    @endif
-                @endif
-
-                @if (! $hideCompanyEmail)
-                    <p class="small-text">
-                        {{ setting('company.email') }}
-                    </p>
-                @endif
-            @endif
-            @stack('company_details_end')
-        </div>
-    </div>
-</div>
-
-<div class="row mt-2">
-    <div class="col-33">
-        <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
-        <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
-    </div>
-
-    <div class="col-33">
-        <div class="invoice-classic-frame ml-1 mt-1" style="border: 1px solid {{ $backgroundColor }}">
-            <div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
-                @stack('invoice_number_input_start')
-                @if (! $hideDocumentNumber)
-                    <div class="text small-text text-semibold mt-classic">
-                        <span>
-                            {{ trans($textDocumentNumber) }}:
-                        </span>
-
-                        <br>
-
-                        {{ $document->document_number }}
-                    </div>
-                @endif
-                @stack('invoice_number_input_end')
             </div>
         </div>
     </div>
 
-    <div class="col-33">
+    <div class="row">
-        <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
+        <div class="col-58">
-        <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
+            <div class="text">
-    </div>
+                @stack('company_logo_start')
-</div>
+                @if (! $hideCompanyLogo)
+                    @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
+                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
+                    @else
+                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
+                    @endif
+                @endif
+                @stack('company_logo_end')
+            </div>
+        </div>
 
-<div class="row top-spacing">
+        <div class="col-42">
-    <div class="col-60">
+            <div class="text right-column">
-        <div class="text p-index-left">
+                @stack('company_details_start')
-            @if (! $hideContactInfo)
+                @if ($textDocumentSubheading)
-                <p class="text-semibold mb-0">
+                    <p class="text-normal font-semibold">
-                    {{ trans($textContactInfo) }}
+                        {{ $textDocumentSubheading }}
-                </p>
-            @endif
-
-            @stack('name_input_start')
-                @if (! $hideContactName)
-                    <p>
-                        {{ $document->contact_name }}
                     </p>
                 @endif
-            @stack('name_input_end')
 
-            @stack('address_input_start')
+                @if (! $hideCompanyDetails)
-                @if (! $hideContactAddress)
+                    @if (! $hideCompanyName)
-                    <p>
+                        <p>{{ setting('company.name') }}</p>
-                        {!! nl2br($document->contact_address) !!}
+                    @endif
-                        <br>
-                        {!! $document->contact_location !!}
-                    </p>
-                @endif
-            @stack('address_input_end')
 
-            @stack('tax_number_input_start')
+                    @if (! $hideCompanyAddress)
-                @if (! $hideContactTaxNumber)
-                    @if ($document->contact_tax_number)
                         <p>
-                            <span class="text-medium text-default">    
+                            {!! nl2br(setting('company.address')) !!}
-                                {{ trans('general.tax_number') }}:
+                            {!! $document->company->location !!}
-                            </span>
+                        </p>
-                            {{ $document->contact_tax_number }}
+                    @endif
+
+                    @if (! $hideCompanyTaxNumber)
+                        @if (setting('company.tax_number'))
+                            <p>
+                                <span class="text-medium text-default">
+                                    {{ trans('general.tax_number') }}:
+                                </span>
+                                {{ setting('company.tax_number') }}
+                            </p>
+                        @endif
+                    @endif
+
+                    @if (! $hideCompanyPhone)
+                        @if (setting('company.phone'))
+                            <p>
+                                {{ setting('company.phone') }}
+                            </p>
+                        @endif
+                    @endif
+
+                    @if (! $hideCompanyEmail)
+                        <p class="small-text">
+                            {{ setting('company.email') }}
                         </p>
                     @endif
                 @endif
-            @stack('tax_number_input_end')
+                @stack('company_details_end')
-
+            </div>
-            @stack('phone_input_start')
-                @if (! $hideContactPhone)
-                    @if ($document->contact_phone)
-                        <p>
-                            {{ $document->contact_phone }}
-                        </p>
-                    @endif
-                @endif
-            @stack('phone_input_end')
-
-            @stack('email_start')
-                @if (! $hideContactEmail)
-                    <p class="small-text">
-                        {{ $document->contact_email }}
-                    </p>
-                @endif
-            @stack('email_input_end')
         </div>
     </div>
 
-    <div class="col-40">
+    <div class="row mt-2">
-        <div class="text p-index-right">
+        <div class="col-33">
-            @stack('order_number_input_start')
+            <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
-                @if (! $hideOrderNumber)
+            <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
-                    @if ($document->order_number)
+        </div>
+
+        <div class="col-33">
+            <div class="invoice-classic-frame ml-1 mt-1" style="border: 1px solid {{ $backgroundColor }}">
+                <div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
+                    @stack('invoice_number_input_start')
+                    @if (! $hideDocumentNumber)
+                        <div class="text small-text text-semibold mt-classic">
+                            <span>
+                                {{ trans($textDocumentNumber) }}:
+                            </span>
+
+                            <br>
+
+                            {{ $document->document_number }}
+                        </div>
+                    @endif
+                    @stack('invoice_number_input_end')
+                </div>
+            </div>
+        </div>
+
+        <div class="col-33">
+            <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
+            <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
+        </div>
+    </div>
+
+    <div class="row top-spacing">
+        <div class="col-60">
+            <div class="text p-index-left">
+                @if (! $hideContactInfo)
+                    <p class="text-semibold mb-0">
+                        {{ trans($textContactInfo) }}
+                    </p>
+                @endif
+
+                @stack('name_input_start')
+                    @if (! $hideContactName)
+                        <p>
+                            {{ $document->contact_name }}
+                        </p>
+                    @endif
+                @stack('name_input_end')
+
+                @stack('address_input_start')
+                    @if (! $hideContactAddress)
+                        <p>
+                            {!! nl2br($document->contact_address) !!}
+                            <br>
+                            {!! $document->contact_location !!}
+                        </p>
+                    @endif
+                @stack('address_input_end')
+
+                @stack('tax_number_input_start')
+                    @if (! $hideContactTaxNumber)
+                        @if ($document->contact_tax_number)
+                            <p>
+                                <span class="text-medium text-default">    
+                                    {{ trans('general.tax_number') }}:
+                                </span>
+                                {{ $document->contact_tax_number }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('tax_number_input_end')
+
+                @stack('phone_input_start')
+                    @if (! $hideContactPhone)
+                        @if ($document->contact_phone)
+                            <p>
+                                {{ $document->contact_phone }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    @if (! $hideContactEmail)
+                        <p class="small-text">
+                            {{ $document->contact_email }}
+                        </p>
+                    @endif
+                @stack('email_input_end')
+            </div>
+        </div>
+
+        <div class="col-40">
+            <div class="text p-index-right">
+                @stack('order_number_input_start')
+                    @if (! $hideOrderNumber)
+                        @if ($document->order_number)
+                            <p class="mb-0">
+                                <span class="text-semibold spacing">
+                                    {{ trans($textOrderNumber) }}:
+                                </span>
+
+                                <span class="float-right spacing">
+                                    {{ $document->order_number }}
+                                </span>
+                            </p>
+                        @endif
+                    @endif
+                @stack('order_number_input_end')
+
+                @stack('issued_at_input_start')
+                    @if (! $hideIssuedAt)
                         <p class="mb-0">
                             <span class="text-semibold spacing">
-                                {{ trans($textOrderNumber) }}:
+                                {{ trans($textIssuedAt) }}:
                             </span>
 
                             <span class="float-right spacing">
-                                {{ $document->order_number }}
+                                @date($document->issued_at)
                             </span>
                         </p>
                     @endif
-                @endif
+                @stack('issued_at_input_end')
-            @stack('order_number_input_end')
 
-            @stack('issued_at_input_start')
+                @stack('due_at_input_start')
-                @if (! $hideIssuedAt)
+                    @if (! $hideDueAt)
-                    <p class="mb-0">
+                        <p class="mb-0">
-                        <span class="text-semibold spacing">
+                            <span class="text-semibold spacing">
-                            {{ trans($textIssuedAt) }}:
+                                {{ trans($textDueAt) }}:
-                        </span>
+                            </span>
 
-                        <span class="float-right spacing">
+                            <span class="float-right spacing">
-                            @date($document->issued_at)
+                                @date($document->due_at)
-                        </span>
+                            </span>
-                    </p>
+                        </p>
-                @endif
+                    @endif
-            @stack('issued_at_input_end')
+                @stack('due_at_input_end')
 
-            @stack('due_at_input_start')
+                @foreach ($document->totals_sorted as $total)
-                @if (! $hideDueAt)
+                    @if ($total->code == 'total')
-                    <p class="mb-0">
+                        <p class="mb-0">
-                        <span class="text-semibold spacing">
+                            <span class="text-semibold spacing">
-                            {{ trans($textDueAt) }}:
+                                {{ trans($total->name) }}:
-                        </span>
+                            </span>
 
-                        <span class="float-right spacing">
+                            <span class="float-right spacing">
-                            @date($document->due_at)
+                                @money($total->amount - $document->paid, $document->currency_code, true)
-                        </span>
+                            </span>
-                    </p>
+                        </p>
-                @endif
+                    @endif
-            @stack('due_at_input_end')
+                @endforeach
-
-            @foreach ($document->totals_sorted as $total)
-                @if ($total->code == 'total')
-                    <p class="mb-0">
-                        <span class="text-semibold spacing">
-                            {{ trans($total->name) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            @money($total->amount - $document->paid, $document->currency_code, true)
-                        </span>
-                    </p>
-                @endif
-            @endforeach
-        </div>
-    </div>
-</div>
-
-@if (! $hideItems)
-    <div class="row">
-        <div class="col-100">
-            <div class="text extra-spacing">
-                <table class="c-lines">
-                    <thead>
-                        <tr>
-                            @stack('name_th_start')
-                                @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                    <th class="item text text-semibold text-alignment-left text-left">
-                                        {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                    </th>
-                                @endif
-                            @stack('name_th_end')
-
-                            @stack('quantity_th_start')
-                                @if (! $hideQuantity)
-                                    <th class="quantity text text-semibold text-alignment-right text-right">
-                                        {{ trans($textQuantity) }}
-                                    </th>
-                                @endif
-                            @stack('quantity_th_end')
-
-                            @stack('price_th_start')
-                                @if (! $hidePrice)
-                                    <th class="price text text-semibold text-alignment-right text-right">
-                                        {{ trans($textPrice) }}
-                                    </th>
-                                @endif
-                            @stack('price_th_end')
-
-                            @if (! $hideDiscount)
-                                @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
-                                    @stack('discount_td_start')
-                                        <th class="discount text text-semibold text-alignment-right text-right">
-                                            {{ trans('invoices.discount') }}
-                                        </th>
-                                    @stack('discount_td_end')
-                                @endif
-                            @endif
-
-                            @stack('total_th_start')
-                                @if (! $hideAmount)
-                                    <th class="total text text-semibold text-alignment-right text-right">
-                                        {{ trans($textAmount) }}
-                                    </th>
-                                @endif
-                            @stack('total_th_end')
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @if ($document->items->count())
-                            @foreach($document->items as $item)
-                                <x-documents.template.line-item
-                                    type="{{ $type }}"
-                                    :item="$item"
-                                    :document="$document"
-                                    hide-items="{{ $hideItems }}"
-                                    hide-name="{{ $hideName }}"
-                                    hide-description="{{ $hideDescription }}"
-                                    hide-quantity="{{ $hideQuantity }}"
-                                    hide-price="{{ $hidePrice }}"
-                                    hide-discount="{{ $hideDiscount }}"
-                                    hide-amount="{{ $hideAmount }}"
-                                />
-                            @endforeach
-                        @else
-                            <tr>
-                                <td colspan="5" class="text-center text empty-items">
-                                    {{ trans('documents.empty_items') }}
-                                </td>
-                            </tr>
-                        @endif
-                    </tbody>
-                </table>
             </div>
         </div>
     </div>
-@endif
 
-<div class="row mt-4 clearfix">
+    @if (! $hideItems)
-    <div class="col-60">
+        <div class="row">
-        <div class="text p-index-right">
-            @stack('notes_input_start')
-                @if ($hideNote)
-                    @if ($document->notes)
-                        <strong>
-                            {{ trans_choice('general.notes', 2) }}
-                        </strong>
-
-                        {!! nl2br($document->notes) !!}
-                    @endif
-                @endif
-            @stack('notes_input_end')
-        </div>
-    </div>
-
-    <div class="col-40 float-right text-right">
-        @foreach ($document->totals_sorted as $total)
-            @if ($total->code != 'total')
-                @stack($total->code . '_total_tr_start')
-                <div class="text border-bottom-dashed py-1">
-                    <strong class="float-left text-semibold">
-                        {{ trans($total->title) }}:
-                    </strong>
-
-                    <span>
-                        @money($total->amount, $document->currency_code, true)
-                    </span>
-                </div>
-                @stack($total->code . '_total_tr_end')
-            @else
-                @if ($document->paid)
-                    @stack('paid_total_tr_start')
-                    <div class="text border-bottom-dashed py-1">
-                        <span class="float-left text-semibold">
-                            {{ trans('invoices.paid') }}:
-                        </span>
-
-                        <span>
-                            - @money($document->paid, $document->currency_code, true)
-                        </span>
-                    </div>
-                    @stack('paid_total_tr_end')
-                @endif
-
-                @stack('grand_total_tr_start')
-                <div class="text border-bottom-dashed py-1">
-                    <span class="float-left text-semibold">
-                        {{ trans($total->name) }}:
-                    </span>
-
-                    <span>
-                        @money($document->amount_due, $document->currency_code, true)
-                    </span>
-                </div>
-                @stack('grand_total_tr_end')
-            @endif
-        @endforeach
-    </div>
-</div>
-
-@if (! $hideFooter)
-    @if ($document->footer)
-        <div class="row mt-1">
             <div class="col-100">
-                <div class="text company">
+                <div class="text extra-spacing">
-                    <strong>
+                    <table class="c-lines">
-                        {!! nl2br($document->footer) !!}
+                        <thead>
-                    </strong>
+                            <tr>
+                                @stack('name_th_start')
+                                    @if (! $hideItems || (! $hideName && ! $hideDescription))
+                                        <th class="item text text-semibold text-alignment-left text-left">
+                                            {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
+                                        </th>
+                                    @endif
+                                @stack('name_th_end')
+
+                                @stack('quantity_th_start')
+                                    @if (! $hideQuantity)
+                                        <th class="quantity text text-semibold text-alignment-right text-right">
+                                            {{ trans($textQuantity) }}
+                                        </th>
+                                    @endif
+                                @stack('quantity_th_end')
+
+                                @stack('price_th_start')
+                                    @if (! $hidePrice)
+                                        <th class="price text text-semibold text-alignment-right text-right">
+                                            {{ trans($textPrice) }}
+                                        </th>
+                                    @endif
+                                @stack('price_th_end')
+
+                                @if (! $hideDiscount)
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('discount_td_start')
+                                            <th class="discount text text-semibold text-alignment-right text-right">
+                                                {{ trans('invoices.discount') }}
+                                            </th>
+                                        @stack('discount_td_end')
+                                    @endif
+                                @endif
+
+                                @stack('total_th_start')
+                                    @if (! $hideAmount)
+                                        <th class="total text text-semibold text-alignment-right text-right">
+                                            {{ trans($textAmount) }}
+                                        </th>
+                                    @endif
+                                @stack('total_th_end')
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            @if ($document->items->count())
+                                @foreach($document->items as $item)
+                                    <x-documents.template.line-item
+                                        type="{{ $type }}"
+                                        :item="$item"
+                                        :document="$document"
+                                        hide-items="{{ $hideItems }}"
+                                        hide-name="{{ $hideName }}"
+                                        hide-description="{{ $hideDescription }}"
+                                        hide-quantity="{{ $hideQuantity }}"
+                                        hide-price="{{ $hidePrice }}"
+                                        hide-discount="{{ $hideDiscount }}"
+                                        hide-amount="{{ $hideAmount }}"
+                                    />
+                                @endforeach
+                            @else
+                                <tr>
+                                    <td colspan="5" class="text-center text empty-items">
+                                        {{ trans('documents.empty_items') }}
+                                    </td>
+                                </tr>
+                            @endif
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
     @endif
-@endif
+
+    <div class="row mt-4 clearfix">
+        <div class="col-60">
+            <div class="text p-index-right">
+                @stack('notes_input_start')
+                    @if ($hideNote)
+                        @if ($document->notes)
+                            <strong>
+                                {{ trans_choice('general.notes', 2) }}
+                            </strong>
+
+                            {!! nl2br($document->notes) !!}
+                        @endif
+                    @endif
+                @stack('notes_input_end')
+            </div>
+        </div>
+
+        <div class="col-40 float-right text-right">
+            @foreach ($document->totals_sorted as $total)
+                @if ($total->code != 'total')
+                    @stack($total->code . '_total_tr_start')
+                    <div class="text border-bottom-dashed py-1">
+                        <strong class="float-left text-semibold">
+                            {{ trans($total->title) }}:
+                        </strong>
+
+                        <span>
+                            @money($total->amount, $document->currency_code, true)
+                        </span>
+                    </div>
+                    @stack($total->code . '_total_tr_end')
+                @else
+                    @if ($document->paid)
+                        @stack('paid_total_tr_start')
+                        <div class="text border-bottom-dashed py-1">
+                            <span class="float-left text-semibold">
+                                {{ trans('invoices.paid') }}:
+                            </span>
+
+                            <span>
+                                - @money($document->paid, $document->currency_code, true)
+                            </span>
+                        </div>
+                        @stack('paid_total_tr_end')
+                    @endif
+
+                    @stack('grand_total_tr_start')
+                    <div class="text border-bottom-dashed py-1">
+                        <span class="float-left text-semibold">
+                            {{ trans($total->name) }}:
+                        </span>
+
+                        <span>
+                            @money($document->amount_due, $document->currency_code, true)
+                        </span>
+                    </div>
+                    @stack('grand_total_tr_end')
+                @endif
+            @endforeach
+        </div>
+    </div>
+
+    @if (! $hideFooter)
+        @if ($document->footer)
+            <div class="row mt-1">
+                <div class="col-100">
+                    <div class="text company">
+                        <strong>
+                            {!! nl2br($document->footer) !!}
+                        </strong>
+                    </div>
+                </div>
+            </div>
+        @endif
+    @endif
+</div>

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

@@ -1,346 +1,348 @@
-<div class="row">
+<div class="print-template">
-    <div class="col-100">
-        <div class="text text-dark">
-            <h3>
-                {{ $textDocumentTitle }}
-            </h3>
-        </div>
-    </div>
-</div>
-
-<div class="row border-bottom-1">
-    <div class="col-58">
-        <div class="text">
-            @stack('company_logo_start')
-            @if (! $hideCompanyLogo)
-                @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                    <img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
-                @else
-                    <img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-                @endif
-            @endif
-            @stack('company_logo_end')
-        </div>
-    </div>
-
-    <div class="col-42">
-        <div class="text right-column">
-            @stack('company_details_start')
-            @if ($textDocumentSubheading)
-                <p class="text-normal font-semibold">
-                    {{ $textDocumentSubheading }}
-                </p>
-            @endif
-
-            @if (! $hideCompanyDetails)
-                @if (! $hideCompanyName)
-                    <p>{{ setting('company.name') }}</p>
-                @endif
-
-                @if (! $hideCompanyAddress)
-                    <p>
-                        {!! nl2br(setting('company.address')) !!}
-                        {!! $document->company->location !!}
-                    </p>
-                @endif
-
-                @if (! $hideCompanyTaxNumber)
-                    
-                    @if (setting('company.tax_number'))
-                        <p>
-                            {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                        </p>
-                    @endif
-                    
-                @endif
-
-                @if (! $hideCompanyPhone)
-                    @if (setting('company.phone'))
-                        <p>
-                            {{ setting('company.phone') }}
-                        </p>
-                    @endif
-                @endif
-
-                @if (! $hideCompanyEmail)
-                    <p class="small-text">{{ setting('company.email') }}</p>
-                @endif
-            @endif
-            @stack('company_details_end')
-        </div>
-    </div>
-</div>
-
-<div class="row top-spacing">
-    <div class="col-60">
-        <div class="text p-index-left">
-            @if (! $hideContactInfo)
-                <p class="text-semibold mb-0">{{ trans($textContactInfo) }}</p>
-            @endif
-
-            @stack('name_input_start')
-                @if (! $hideContactName)
-                    <p>{{ $document->contact_name }}</p>
-                @endif
-            @stack('name_input_end')
-
-            @stack('address_input_start')
-                @if (! $hideContactAddress)
-                    <p>
-                        {!! nl2br($document->contact_address) !!}
-                        <br>
-                        {!! $document->contact_location !!}
-                    </p>
-                @endif
-            @stack('address_input_end')
-
-            @stack('tax_number_input_start')
-                @if (! $hideContactTaxNumber)
-                    @if ($document->contact_tax_number)
-                        <p>
-                            <span class="text-medium text-default">
-                                {{ trans('general.tax_number') }}:
-                            </span>
-                            {{ $document->contact_tax_number }}
-                        </p>
-                    @endif
-                @endif
-            @stack('tax_number_input_end')
-
-            @stack('phone_input_start')
-                @if (! $hideContactPhone)
-                    @if ($document->contact_phone)
-                        <p>
-                            {{ $document->contact_phone }}
-                        </p>
-                    @endif
-                @endif
-            @stack('phone_input_end')
-
-            @stack('email_start')
-                @if (! $hideContactEmail)
-                    <p class="small-text">
-                        {{ $document->contact_email }}
-                    </p>
-                @endif
-            @stack('email_input_end')
-        </div>
-    </div>
-
-    <div class="col-40">
-        <div class="text p-index-right">
-            @stack('document_number_input_start')
-                @if (! $hideDocumentNumber)
-                    <p class="mb-0">
-                        <span class="font-semibold spacing w-numbers">
-                            {{ trans($textDocumentNumber) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            {{ $document->document_number }}
-                        </span>
-                    </p>
-                @endif
-            @stack('document_number_input_end')
-
-            @stack('order_number_input_start')
-                @if (! $hideOrderNumber)
-                    @if ($document->order_number)
-                        <p class="mb-0">
-                            <span class="font-semibold spacing w-numbers">
-                                {{ trans($textOrderNumber) }}:
-                            </span>
-
-                            <span class="float-right spacing">
-                                {{ $document->order_number }}
-                            </span>
-                        </p>
-                    @endif
-                @endif
-            @stack('order_number_input_end')
-
-            @stack('issued_at_input_start')
-                @if (! $hideIssuedAt)
-                    <p class="mb-0">
-                        <span class="font-semibold spacing w-numbers">
-                            {{ trans($textIssuedAt) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            @date($document->issued_at)
-                        </span>
-                    </p>
-                @endif
-            @stack('issued_at_input_end')
-
-            @stack('due_at_input_start')
-                @if (! $hideDueAt)
-                    <p class="mb-0">
-                        <span class="font-semibold spacing w-numbers">
-                            {{ trans($textDueAt) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            @date($document->due_at)
-                        </span>
-                    </p>
-                @endif
-            @stack('due_at_input_end')
-        </div>
-    </div>
-</div>
-
-@if (! $hideItems)
     <div class="row">
         <div class="col-100">
-            <div class="text extra-spacing">
+            <div class="text text-dark">
-                <table class="lines">
+                <h3>
-                    <thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
+                    {{ $textDocumentTitle }}
-                        <tr>
+                </h3>
-                            @stack('name_th_start')
-                                @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                    <th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
-                                        {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                    </th>
-                                @endif
-                            @stack('name_th_end')
-
-                            @stack('quantity_th_start')
-                                @if (! $hideQuantity)
-                                    <th class="quantity text text-semibold text-alignment-right text-right text-white">
-                                        {{ trans($textQuantity) }}
-                                    </th>
-                                @endif
-                            @stack('quantity_th_end')
-
-                            @stack('price_th_start')
-                                @if (! $hidePrice)
-                                    <th class="price text text-semibold text-alignment-right text-right text-white">
-                                        {{ trans($textPrice) }}
-                                    </th>
-                                @endif
-                            @stack('price_th_end')
-
-                            @if (! $hideDiscount)
-                                @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
-                                    @stack('discount_td_start')
-                                        <th class="discount text text-semibold text-alignment-right text-right text-white">
-                                            {{ trans('invoices.discount') }}
-                                        </th>
-                                    @stack('discount_td_end')
-                                @endif
-                            @endif
-
-                            @stack('total_th_start')
-                                @if (! $hideAmount)
-                                    <th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
-                                        {{ trans($textAmount) }}
-                                    </th>
-                                @endif
-                            @stack('total_th_end')
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @if ($document->items->count())
-                            @foreach($document->items as $item)
-                                <x-documents.template.line-item
-                                    type="{{ $type }}"
-                                    :item="$item"
-                                    :document="$document"
-                                    hide-items="{{ $hideItems }}"
-                                    hide-name="{{ $hideName }}"
-                                    hide-description="{{ $hideDescription }}"
-                                    hide-quantity="{{ $hideQuantity }}"
-                                    hide-price="{{ $hidePrice }}"
-                                    hide-discount="{{ $hideDiscount }}"
-                                    hide-amount="{{ $hideAmount }}"
-                                />
-                            @endforeach
-                        @else
-                            <tr>
-                                <td colspan="5" class="text text-center empty-items">
-                                    {{ trans('documents.empty_items') }}
-                                </td>
-                            </tr>
-                        @endif
-                    </tbody>
-                </table>
             </div>
         </div>
     </div>
-@endif
 
-<div class="row mt-9 clearfix">
+    <div class="row border-bottom-1">
-    <div class="col-60">
+        <div class="col-58">
-        <div class="text p-index-left">
+            <div class="text">
-            @stack('notes_input_start')
+                @stack('company_logo_start')
-                @if ($document->notes)
+                @if (! $hideCompanyLogo)
-                    <p class="text-semibold">
+                    @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                        {{ trans_choice('general.notes', 2) }}
+                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
-                    </p>
+                    @else
-
+                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-                    {!! nl2br($document->notes) !!}
+                    @endif
                 @endif
-            @stack('notes_input_end')
+                @stack('company_logo_end')
+            </div>
+        </div>
+
+        <div class="col-42">
+            <div class="text right-column">
+                @stack('company_details_start')
+                @if ($textDocumentSubheading)
+                    <p class="text-normal font-semibold">
+                        {{ $textDocumentSubheading }}
+                    </p>
+                @endif
+
+                @if (! $hideCompanyDetails)
+                    @if (! $hideCompanyName)
+                        <p>{{ setting('company.name') }}</p>
+                    @endif
+
+                    @if (! $hideCompanyAddress)
+                        <p>
+                            {!! nl2br(setting('company.address')) !!}
+                            {!! $document->company->location !!}
+                        </p>
+                    @endif
+
+                    @if (! $hideCompanyTaxNumber)
+                        
+                        @if (setting('company.tax_number'))
+                            <p>
+                                {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                            </p>
+                        @endif
+                        
+                    @endif
+
+                    @if (! $hideCompanyPhone)
+                        @if (setting('company.phone'))
+                            <p>
+                                {{ setting('company.phone') }}
+                            </p>
+                        @endif
+                    @endif
+
+                    @if (! $hideCompanyEmail)
+                        <p class="small-text">{{ setting('company.email') }}</p>
+                    @endif
+                @endif
+                @stack('company_details_end')
+            </div>
         </div>
     </div>
 
-    <div class="col-40 float-right text-right">
+    <div class="row top-spacing">
-        @foreach ($document->totals_sorted as $total)
+        <div class="col-60">
-            @if ($total->code != 'total')
+            <div class="text p-index-left">
-                @stack($total->code . '_total_tr_start')
+                @if (! $hideContactInfo)
-                <div class="text border-bottom-1 py-1">
+                    <p class="text-semibold mb-0">{{ trans($textContactInfo) }}</p>
-                    <span class="float-left text-semibold">
-                        {{ trans($total->title) }}:
-                    </span>
-
-                    <span>
-                        @money($total->amount, $document->currency_code, true)
-                    </span>
-                </div>
-                @stack($total->code . '_total_tr_end')
-            @else
-                @if ($document->paid)
-                    @stack('paid_total_tr_start')
-                    <div class="text border-bottom-1 py-1">
-                        <span class="float-left text-semibold">
-                            {{ trans('invoices.paid') }}:
-                        </span>
-
-                        <span>
-                            - @money($document->paid, $document->currency_code, true)
-                        </span>
-                    </div>
-                    @stack('paid_total_tr_end')
                 @endif
 
-                @stack('grand_total_tr_start')
+                @stack('name_input_start')
-                <div class="text border-bottom-1 py-1">
+                    @if (! $hideContactName)
-                    <span class="float-left text-semibold">
+                        <p>{{ $document->contact_name }}</p>
-                        {{ trans($total->name) }}:
+                    @endif
-                    </span>
+                @stack('name_input_end')
 
-                    <span>
+                @stack('address_input_start')
-                        @money($document->amount_due, $document->currency_code, true)
+                    @if (! $hideContactAddress)
-                    </span>
+                        <p>
-                </div>
+                            {!! nl2br($document->contact_address) !!}
-                @stack('grand_total_tr_end')
+                            <br>
-            @endif
+                            {!! $document->contact_location !!}
-        @endforeach
+                        </p>
+                    @endif
+                @stack('address_input_end')
+
+                @stack('tax_number_input_start')
+                    @if (! $hideContactTaxNumber)
+                        @if ($document->contact_tax_number)
+                            <p>
+                                <span class="text-medium text-default">
+                                    {{ trans('general.tax_number') }}:
+                                </span>
+                                {{ $document->contact_tax_number }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('tax_number_input_end')
+
+                @stack('phone_input_start')
+                    @if (! $hideContactPhone)
+                        @if ($document->contact_phone)
+                            <p>
+                                {{ $document->contact_phone }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    @if (! $hideContactEmail)
+                        <p class="small-text">
+                            {{ $document->contact_email }}
+                        </p>
+                    @endif
+                @stack('email_input_end')
+            </div>
+        </div>
+
+        <div class="col-40">
+            <div class="text p-index-right">
+                @stack('document_number_input_start')
+                    @if (! $hideDocumentNumber)
+                        <p class="mb-0">
+                            <span class="font-semibold spacing w-numbers">
+                                {{ trans($textDocumentNumber) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                {{ $document->document_number }}
+                            </span>
+                        </p>
+                    @endif
+                @stack('document_number_input_end')
+
+                @stack('order_number_input_start')
+                    @if (! $hideOrderNumber)
+                        @if ($document->order_number)
+                            <p class="mb-0">
+                                <span class="font-semibold spacing w-numbers">
+                                    {{ trans($textOrderNumber) }}:
+                                </span>
+
+                                <span class="float-right spacing">
+                                    {{ $document->order_number }}
+                                </span>
+                            </p>
+                        @endif
+                    @endif
+                @stack('order_number_input_end')
+
+                @stack('issued_at_input_start')
+                    @if (! $hideIssuedAt)
+                        <p class="mb-0">
+                            <span class="font-semibold spacing w-numbers">
+                                {{ trans($textIssuedAt) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                @date($document->issued_at)
+                            </span>
+                        </p>
+                    @endif
+                @stack('issued_at_input_end')
+
+                @stack('due_at_input_start')
+                    @if (! $hideDueAt)
+                        <p class="mb-0">
+                            <span class="font-semibold spacing w-numbers">
+                                {{ trans($textDueAt) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                @date($document->due_at)
+                            </span>
+                        </p>
+                    @endif
+                @stack('due_at_input_end')
+            </div>
+        </div>
     </div>
-</div>
 
-@if (! $hideFooter)
+    @if (! $hideItems)
-    @if ($document->footer)
+        <div class="row">
-        <div class="row mt-4">
+            <div class="col-100">
-            <div class="col-100 text-left">
+                <div class="text extra-spacing">
-                <div class="text">
+                    <table class="lines">
-                    <strong>
+                        <thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
-                        {!! nl2br($document->footer) !!}
+                            <tr>
-                    </strong>
+                                @stack('name_th_start')
+                                    @if (! $hideItems || (! $hideName && ! $hideDescription))
+                                        <th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
+                                            {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
+                                        </th>
+                                    @endif
+                                @stack('name_th_end')
+
+                                @stack('quantity_th_start')
+                                    @if (! $hideQuantity)
+                                        <th class="quantity text text-semibold text-alignment-right text-right text-white">
+                                            {{ trans($textQuantity) }}
+                                        </th>
+                                    @endif
+                                @stack('quantity_th_end')
+
+                                @stack('price_th_start')
+                                    @if (! $hidePrice)
+                                        <th class="price text text-semibold text-alignment-right text-right text-white">
+                                            {{ trans($textPrice) }}
+                                        </th>
+                                    @endif
+                                @stack('price_th_end')
+
+                                @if (! $hideDiscount)
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('discount_td_start')
+                                            <th class="discount text text-semibold text-alignment-right text-right text-white">
+                                                {{ trans('invoices.discount') }}
+                                            </th>
+                                        @stack('discount_td_end')
+                                    @endif
+                                @endif
+
+                                @stack('total_th_start')
+                                    @if (! $hideAmount)
+                                        <th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
+                                            {{ trans($textAmount) }}
+                                        </th>
+                                    @endif
+                                @stack('total_th_end')
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            @if ($document->items->count())
+                                @foreach($document->items as $item)
+                                    <x-documents.template.line-item
+                                        type="{{ $type }}"
+                                        :item="$item"
+                                        :document="$document"
+                                        hide-items="{{ $hideItems }}"
+                                        hide-name="{{ $hideName }}"
+                                        hide-description="{{ $hideDescription }}"
+                                        hide-quantity="{{ $hideQuantity }}"
+                                        hide-price="{{ $hidePrice }}"
+                                        hide-discount="{{ $hideDiscount }}"
+                                        hide-amount="{{ $hideAmount }}"
+                                    />
+                                @endforeach
+                            @else
+                                <tr>
+                                    <td colspan="5" class="text text-center empty-items">
+                                        {{ trans('documents.empty_items') }}
+                                    </td>
+                                </tr>
+                            @endif
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
     @endif
-@endif
+
+    <div class="row mt-9 clearfix">
+        <div class="col-60">
+            <div class="text p-index-left">
+                @stack('notes_input_start')
+                    @if ($document->notes)
+                        <p class="text-semibold">
+                            {{ trans_choice('general.notes', 2) }}
+                        </p>
+
+                        {!! nl2br($document->notes) !!}
+                    @endif
+                @stack('notes_input_end')
+            </div>
+        </div>
+
+        <div class="col-40 float-right text-right">
+            @foreach ($document->totals_sorted as $total)
+                @if ($total->code != 'total')
+                    @stack($total->code . '_total_tr_start')
+                    <div class="text border-bottom-1 py-1">
+                        <span class="float-left text-semibold">
+                            {{ trans($total->title) }}:
+                        </span>
+
+                        <span>
+                            @money($total->amount, $document->currency_code, true)
+                        </span>
+                    </div>
+                    @stack($total->code . '_total_tr_end')
+                @else
+                    @if ($document->paid)
+                        @stack('paid_total_tr_start')
+                        <div class="text border-bottom-1 py-1">
+                            <span class="float-left text-semibold">
+                                {{ trans('invoices.paid') }}:
+                            </span>
+
+                            <span>
+                                - @money($document->paid, $document->currency_code, true)
+                            </span>
+                        </div>
+                        @stack('paid_total_tr_end')
+                    @endif
+
+                    @stack('grand_total_tr_start')
+                    <div class="text border-bottom-1 py-1">
+                        <span class="float-left text-semibold">
+                            {{ trans($total->name) }}:
+                        </span>
+
+                        <span>
+                            @money($document->amount_due, $document->currency_code, true)
+                        </span>
+                    </div>
+                    @stack('grand_total_tr_end')
+                @endif
+            @endforeach
+        </div>
+    </div>
+
+    @if (! $hideFooter)
+        @if ($document->footer)
+            <div class="row mt-4">
+                <div class="col-100 text-left">
+                    <div class="text">
+                        <strong>
+                            {!! nl2br($document->footer) !!}
+                        </strong>
+                    </div>
+                </div>
+            </div>
+        @endif
+    @endif
+</div>

resources/views/components/documents/template/modern.blade.php

@@ -1,357 +1,359 @@
-<div class="row">
+<div class="print-template">
-    <div class="col-100">
-        <div class="text text-dark">
-            <h3>
-                {{ $textDocumentTitle }}
-            </h3>
-        </div>
-    </div>
-</div>
-
-<div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
-    <div class="col-58">
-        <div class="text p-modern">
-            @stack('company_logo_start')
-            @if (! $hideCompanyLogo)
-                @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                    <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
-                @else
-                    <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
-                @endif
-            @endif
-            @stack('company_logo_end')
-        </div>
-    </div>
-
-    <div class="col-42">
-        <div class="text p-modern right-column">
-            @stack('company_details_start')
-            @if ($textDocumentSubheading)
-                <p class="text-normal font-semibold">
-                    {{ $textDocumentSubheading }}
-                </p>
-            @endif
-
-            @if (! $hideCompanyName)
-                <p class="text-white">
-                    {{ setting('company.name') }}
-                </p>
-            @endif
-
-            @if (! $hideCompanyDetails)
-                @if (! $hideCompanyAddress)
-                    <p class="text-white">
-                        {!! nl2br(setting('company.address')) !!}
-                        {!! $document->company->location !!}
-                    </p>
-                @endif
-
-                @if (! $hideCompanyTaxNumber)
-                    <p class="text-white">
-                        @if (setting('company.tax_number'))
-                            <span class="text-medium text-default">
-                                {{ trans('general.tax_number') }}:
-                            </span>
-
-                            {{ setting('company.tax_number') }}
-                        @endif
-                    </p>
-                @endif
-
-                @if (!$hideCompanyPhone)
-                    <p class="text-white">
-                        @if (setting('company.phone'))
-                            {{ setting('company.phone') }}
-                        @endif
-                    </p>
-                @endif
-
-                @if (!$hideCompanyEmail)
-                    <p class="small-text text-white">
-                        {{ setting('company.email') }}
-                    </p>
-                @endif
-            @endif
-            @stack('company_details_end')
-        </div>
-    </div>
-</div>
-
-<div class="row top-spacing">
-    <div class="col-50">
-        <div class="text p-modern">
-            @if (! $hideContactInfo)
-                <p class="text-semibold mb-0">
-                    {{ trans($textContactInfo) }}
-                </p>
-            @endif
-
-            @stack('name_input_start')
-                @if (! $hideContactName)
-                    <p>
-                        {{ $document->contact_name }}
-                    </p>
-                @endif
-            @stack('name_input_end')
-
-            @stack('address_input_start')
-                @if (! $hideContactAddress)
-                    <p>
-                        {!! nl2br($document->contact_address) !!}
-                        <br/>
-                        {!! $document->contact_location !!}
-                    </p>
-                @endif
-            @stack('address_input_end')
-
-            @stack('tax_number_input_start')
-                @if (! $hideContactTaxNumber)
-                    @if ($document->contact_tax_number)
-                        <p>
-                            <span class="text-medium text-default">
-                                {{ trans('general.tax_number') }}:
-                            </span>
-
-                            {{ $document->contact_tax_number }}
-                        </p>
-                    @endif
-                @endif
-            @stack('tax_number_input_end')
-
-            @stack('phone_input_start')
-                @if (! $hideContactPhone)
-                    @if ($document->contact_phone)
-                        <p>
-                            {{ $document->contact_phone }}
-                        </p>
-                    @endif
-                @endif
-            @stack('phone_input_end')
-
-            @stack('email_start')
-                @if (! $hideContactEmail)
-                    <p>
-                        {{ $document->contact_email }}
-                    </p>
-                @endif
-            @stack('email_input_end')
-        </div>
-    </div>
-
-    <div class="col-50">
-        <div class="text p-modern">
-            @stack('order_number_input_start')
-                @if (! $hideOrderNumber)
-                    @if ($document->order_number)
-                        <p class="mb-0">
-                            <span class="text-semibold spacing">
-                                {{ trans($textOrderNumber) }}:
-                            </span>
-
-                            <span class="float-right spacing">
-                                {{ $document->order_number }}
-                            </span>
-                        </p>
-                    @endif
-                @endif
-            @stack('order_number_input_end')
-
-            @stack('invoice_number_input_start')
-                @if (! $hideDocumentNumber)
-                    <p class="mb-0">
-                        <span class="text-semibold spacing">
-                            {{ trans($textDocumentNumber) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            {{ $document->document_number }}
-                        </span>
-                    </p>
-                @endif
-            @stack('invoice_number_input_end')
-
-            @stack('issued_at_input_start')
-                @if (! $hideIssuedAt)
-                    <p class="mb-0">
-                        <span class="text-semibold spacing">
-                            {{ trans($textIssuedAt) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            @date($document->issued_at)
-                        </span>
-                    </p>
-                @endif
-            @stack('issued_at_input_end')
-
-            @stack('due_at_input_start')
-                @if (! $hideDueAt)
-                    <p class="mb-0">
-                        <span class="text-semibold spacing">
-                            {{ trans($textDueAt) }}:
-                        </span>
-
-                        <span class="float-right spacing">
-                            @date($document->due_at)
-                        </span>
-                    </p>
-                @endif
-            @stack('due_at_input_end')
-        </div>
-    </div>
-</div>
-
-@if (! $hideItems)
     <div class="row">
         <div class="col-100">
-            <div class="text extra-spacing">
+            <div class="text text-dark">
-                <table class="lines modern-lines">
+                <h3>
-                    <thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
+                    {{ $textDocumentTitle }}
-                        <tr>
+                </h3>
-                            @stack('name_th_start')
-                                @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                    <th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
-                                        {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                    </th>
-                                @endif
-                            @stack('name_th_end')
-
-                            @stack('quantity_th_start')
-                                @if (! $hideQuantity)
-                                    <th class="quantity text text-semibold text-white text-alignment-right text-right">
-                                        {{ trans($textQuantity) }}
-                                    </th>
-                                @endif
-                            @stack('quantity_th_end')
-
-                            @stack('price_th_start')
-                                @if (! $hidePrice)
-                                    <th class="price text text-semibold text-white text-alignment-right text-right">
-                                        {{ trans($textPrice) }}
-                                    </th>
-                                @endif
-                            @stack('price_th_end')
-
-                            @if (! $hideDiscount)
-                                @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
-                                    @stack('discount_td_start')
-                                        <th class="discount text text-semibold text-white text-alignment-right text-right">
-                                            {{ trans('invoices.discount') }}
-                                        </th>
-                                    @stack('discount_td_end')
-                                @endif
-                            @endif
-
-                            @stack('total_th_start')
-                                @if (! $hideAmount)
-                                    <th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
-                                        {{ trans($textAmount) }}
-                                    </th>
-                                @endif
-                            @stack('total_th_end')
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @if ($document->items->count())
-                            @foreach($document->items as $item)
-                                <x-documents.template.line-item
-                                    type="{{ $type }}"
-                                    :item="$item"
-                                    :document="$document"
-                                    hide-items="{{ $hideItems }}"
-                                    hide-name="{{ $hideName }}"
-                                    hide-description="{{ $hideDescription }}"
-                                    hide-quantity="{{ $hideQuantity }}"
-                                    hide-price="{{ $hidePrice }}"
-                                    hide-discount="{{ $hideDiscount }}"
-                                    hide-amount="{{ $hideAmount }}"
-                                />
-                            @endforeach
-                        @else
-                            <tr>
-                                <td colspan="5" class="text text-center empty-items">
-                                    {{ trans('documents.empty_items') }}
-                                </td>
-                            </tr>
-                        @endif
-                    </tbody>
-                </table>
             </div>
         </div>
     </div>
-@endif
 
-<div class="row mt-7 clearfix">
+    <div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
-    <div class="col-60">
+        <div class="col-58">
-        <div class="text p-index-right p-modern">
+            <div class="text p-modern">
-            @stack('notes_input_start')
+                @stack('company_logo_start')
-                @if ($document->notes)
+                @if (! $hideCompanyLogo)
-                    <p class="text-semibold">
+                    @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                        {{ trans_choice('general.notes', 2) }}
+                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
-                    </p>
+                    @else
-
+                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
-                    {!! nl2br($document->notes) !!}
+                    @endif
                 @endif
-            @stack('notes_input_end')
+                @stack('company_logo_end')
+            </div>
+        </div>
+
+        <div class="col-42">
+            <div class="text p-modern right-column">
+                @stack('company_details_start')
+                @if ($textDocumentSubheading)
+                    <p class="text-normal font-semibold">
+                        {{ $textDocumentSubheading }}
+                    </p>
+                @endif
+
+                @if (! $hideCompanyName)
+                    <p class="text-white">
+                        {{ setting('company.name') }}
+                    </p>
+                @endif
+
+                @if (! $hideCompanyDetails)
+                    @if (! $hideCompanyAddress)
+                        <p class="text-white">
+                            {!! nl2br(setting('company.address')) !!}
+                            {!! $document->company->location !!}
+                        </p>
+                    @endif
+
+                    @if (! $hideCompanyTaxNumber)
+                        <p class="text-white">
+                            @if (setting('company.tax_number'))
+                                <span class="text-medium text-default">
+                                    {{ trans('general.tax_number') }}:
+                                </span>
+
+                                {{ setting('company.tax_number') }}
+                            @endif
+                        </p>
+                    @endif
+
+                    @if (!$hideCompanyPhone)
+                        <p class="text-white">
+                            @if (setting('company.phone'))
+                                {{ setting('company.phone') }}
+                            @endif
+                        </p>
+                    @endif
+
+                    @if (!$hideCompanyEmail)
+                        <p class="small-text text-white">
+                            {{ setting('company.email') }}
+                        </p>
+                    @endif
+                @endif
+                @stack('company_details_end')
+            </div>
         </div>
     </div>
 
-    <div class="col-40 float-right text-right">
+    <div class="row top-spacing">
-        @foreach ($document->totals_sorted as $total)
+        <div class="col-50">
-            @if ($total->code != 'total')
+            <div class="text p-modern">
-                @stack($total->code . '_total_tr_start')
+                @if (! $hideContactInfo)
-                <div class="text">
+                    <p class="text-semibold mb-0">
-                    <span class="float-left text-semibold">
+                        {{ trans($textContactInfo) }}
-                        {{ trans($total->title) }}:
+                    </p>
-                    </span>
-
-                    <span>
-                        @money($total->amount, $document->currency_code, true)
-                    </span>
-                </div>
-                @stack($total->code . '_total_tr_end')
-            @else
-                @if ($document->paid)
-                    @stack('paid_total_tr_start')
-                    <div class="text">
-                        <span class="float-left text-semibold">
-                            {{ trans('invoices.paid') }}:
-                        </span>
-
-                        <span>
-                            - @money($document->paid, $document->currency_code, true)
-                        </span>
-                    </div>
-                    @stack('paid_total_tr_end')
                 @endif
 
-                @stack('grand_total_tr_start')
+                @stack('name_input_start')
-                    <div class="text">
+                    @if (! $hideContactName)
-                        <span class="float-left text-semibold">
+                        <p>
-                            {{ trans($total->name) }}:
+                            {{ $document->contact_name }}
-                        </span>
+                        </p>
+                    @endif
+                @stack('name_input_end')
 
-                        <span>
+                @stack('address_input_start')
-                            @money($document->amount_due, $document->currency_code, true)
+                    @if (! $hideContactAddress)
-                        </span>
+                        <p>
-                    </div>
+                            {!! nl2br($document->contact_address) !!}
-                @stack('grand_total_tr_end')
+                            <br/>
-            @endif
+                            {!! $document->contact_location !!}
-        @endforeach
+                        </p>
+                    @endif
+                @stack('address_input_end')
+
+                @stack('tax_number_input_start')
+                    @if (! $hideContactTaxNumber)
+                        @if ($document->contact_tax_number)
+                            <p>
+                                <span class="text-medium text-default">
+                                    {{ trans('general.tax_number') }}:
+                                </span>
+
+                                {{ $document->contact_tax_number }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('tax_number_input_end')
+
+                @stack('phone_input_start')
+                    @if (! $hideContactPhone)
+                        @if ($document->contact_phone)
+                            <p>
+                                {{ $document->contact_phone }}
+                            </p>
+                        @endif
+                    @endif
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    @if (! $hideContactEmail)
+                        <p>
+                            {{ $document->contact_email }}
+                        </p>
+                    @endif
+                @stack('email_input_end')
+            </div>
+        </div>
+
+        <div class="col-50">
+            <div class="text p-modern">
+                @stack('order_number_input_start')
+                    @if (! $hideOrderNumber)
+                        @if ($document->order_number)
+                            <p class="mb-0">
+                                <span class="text-semibold spacing">
+                                    {{ trans($textOrderNumber) }}:
+                                </span>
+
+                                <span class="float-right spacing">
+                                    {{ $document->order_number }}
+                                </span>
+                            </p>
+                        @endif
+                    @endif
+                @stack('order_number_input_end')
+
+                @stack('invoice_number_input_start')
+                    @if (! $hideDocumentNumber)
+                        <p class="mb-0">
+                            <span class="text-semibold spacing">
+                                {{ trans($textDocumentNumber) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                {{ $document->document_number }}
+                            </span>
+                        </p>
+                    @endif
+                @stack('invoice_number_input_end')
+
+                @stack('issued_at_input_start')
+                    @if (! $hideIssuedAt)
+                        <p class="mb-0">
+                            <span class="text-semibold spacing">
+                                {{ trans($textIssuedAt) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                @date($document->issued_at)
+                            </span>
+                        </p>
+                    @endif
+                @stack('issued_at_input_end')
+
+                @stack('due_at_input_start')
+                    @if (! $hideDueAt)
+                        <p class="mb-0">
+                            <span class="text-semibold spacing">
+                                {{ trans($textDueAt) }}:
+                            </span>
+
+                            <span class="float-right spacing">
+                                @date($document->due_at)
+                            </span>
+                        </p>
+                    @endif
+                @stack('due_at_input_end')
+            </div>
+        </div>
     </div>
-</div>
 
-@if (! $hideFooter)
+    @if (! $hideItems)
-    @if ($document->footer)
+        <div class="row">
-        <div class="row mt-7">
+            <div class="col-100">
-            <div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
+                <div class="text extra-spacing">
-                <div class="text pl-2">
+                    <table class="lines modern-lines">
-                    <strong class="text-white">
+                        <thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
-                        {!! nl2br($document->footer) !!}
+                            <tr>
-                    </strong>
+                                @stack('name_th_start')
+                                    @if (! $hideItems || (! $hideName && ! $hideDescription))
+                                        <th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
+                                            {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
+                                        </th>
+                                    @endif
+                                @stack('name_th_end')
+
+                                @stack('quantity_th_start')
+                                    @if (! $hideQuantity)
+                                        <th class="quantity text text-semibold text-white text-alignment-right text-right">
+                                            {{ trans($textQuantity) }}
+                                        </th>
+                                    @endif
+                                @stack('quantity_th_end')
+
+                                @stack('price_th_start')
+                                    @if (! $hidePrice)
+                                        <th class="price text text-semibold text-white text-alignment-right text-right">
+                                            {{ trans($textPrice) }}
+                                        </th>
+                                    @endif
+                                @stack('price_th_end')
+
+                                @if (! $hideDiscount)
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('discount_td_start')
+                                            <th class="discount text text-semibold text-white text-alignment-right text-right">
+                                                {{ trans('invoices.discount') }}
+                                            </th>
+                                        @stack('discount_td_end')
+                                    @endif
+                                @endif
+
+                                @stack('total_th_start')
+                                    @if (! $hideAmount)
+                                        <th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
+                                            {{ trans($textAmount) }}
+                                        </th>
+                                    @endif
+                                @stack('total_th_end')
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            @if ($document->items->count())
+                                @foreach($document->items as $item)
+                                    <x-documents.template.line-item
+                                        type="{{ $type }}"
+                                        :item="$item"
+                                        :document="$document"
+                                        hide-items="{{ $hideItems }}"
+                                        hide-name="{{ $hideName }}"
+                                        hide-description="{{ $hideDescription }}"
+                                        hide-quantity="{{ $hideQuantity }}"
+                                        hide-price="{{ $hidePrice }}"
+                                        hide-discount="{{ $hideDiscount }}"
+                                        hide-amount="{{ $hideAmount }}"
+                                    />
+                                @endforeach
+                            @else
+                                <tr>
+                                    <td colspan="5" class="text text-center empty-items">
+                                        {{ trans('documents.empty_items') }}
+                                    </td>
+                                </tr>
+                            @endif
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
     @endif
-@endif
+
+    <div class="row mt-7 clearfix">
+        <div class="col-60">
+            <div class="text p-index-right p-modern">
+                @stack('notes_input_start')
+                    @if ($document->notes)
+                        <p class="text-semibold">
+                            {{ trans_choice('general.notes', 2) }}
+                        </p>
+
+                        {!! nl2br($document->notes) !!}
+                    @endif
+                @stack('notes_input_end')
+            </div>
+        </div>
+
+        <div class="col-40 float-right text-right">
+            @foreach ($document->totals_sorted as $total)
+                @if ($total->code != 'total')
+                    @stack($total->code . '_total_tr_start')
+                    <div class="text">
+                        <span class="float-left text-semibold">
+                            {{ trans($total->title) }}:
+                        </span>
+
+                        <span>
+                            @money($total->amount, $document->currency_code, true)
+                        </span>
+                    </div>
+                    @stack($total->code . '_total_tr_end')
+                @else
+                    @if ($document->paid)
+                        @stack('paid_total_tr_start')
+                        <div class="text">
+                            <span class="float-left text-semibold">
+                                {{ trans('invoices.paid') }}:
+                            </span>
+
+                            <span>
+                                - @money($document->paid, $document->currency_code, true)
+                            </span>
+                        </div>
+                        @stack('paid_total_tr_end')
+                    @endif
+
+                    @stack('grand_total_tr_start')
+                        <div class="text">
+                            <span class="float-left text-semibold">
+                                {{ trans($total->name) }}:
+                            </span>
+
+                            <span>
+                                @money($document->amount_due, $document->currency_code, true)
+                            </span>
+                        </div>
+                    @stack('grand_total_tr_end')
+                @endif
+            @endforeach
+        </div>
+    </div>
+
+    @if (! $hideFooter)
+        @if ($document->footer)
+            <div class="row mt-7">
+                <div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
+                    <div class="text pl-2">
+                        <strong class="text-white">
+                            {!! nl2br($document->footer) !!}
+                        </strong>
+                    </div>
+                </div>
+            </div>
+        @endif
+    @endif
+</div>

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/admin.blade.php

@@ -13,9 +13,9 @@
     </x-layouts.admin.head>
 
     @mobile
-    <body class="g-sidenav-hidden bg-body overflow-overlay">
+    <body class="g-sidenav-hidden bg-body">
     @elsemobile
-    <body class="g-sidenav-show bg-body overflow-overlay">
+    <body class="g-sidenav-show bg-body">
     @endmobile
 
         @stack('body_start')

resources/views/components/layouts/auth.blade.php

@@ -7,9 +7,9 @@
     </x-layouts.auth.head>
 
     @mobile
-    <body class="g-sidenav-hidden bg-body overflow-overlay">
+    <body class="g-sidenav-hidden bg-body">
     @elsemobile
-    <body class="g-sidenav-show bg-body overflow-overlay">
+    <body class="g-sidenav-show bg-body">
     @endmobile
 
         @stack('body_start')

resources/views/components/layouts/error.blade.php

@@ -7,9 +7,9 @@
     </x-layouts.admin.head>
 
     @mobile
-    <body class="g-sidenav-hidden bg-body overflow-overlay">
+    <body class="g-sidenav-hidden bg-body">
     @elsemobile
-    <body class="g-sidenav-show bg-body overflow-overlay">
+    <body class="g-sidenav-show bg-body">
     @endmobile
 
         @stack('body_start')

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

@@ -7,9 +7,9 @@
     </x-layouts.modules.head>
 
     @mobile
-    <body class="g-sidenav-hidden bg-body overflow-overlay">
+    <body class="g-sidenav-hidden bg-body">
     @elsemobile
-    <body class="g-sidenav-show bg-body overflow-overlay">
+    <body class="g-sidenav-show bg-body">
     @endmobile
 
         @stack('body_start')

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>
+</div>

resources/views/components/layouts/portal.blade.php

@@ -7,9 +7,9 @@
     </x-layouts.portal.head>
 
     @mobile
-    <body class="g-sidenav-hidden bg-body overflow-overlay">
+    <body class="g-sidenav-hidden bg-body">
     @elsemobile
-    <body class="g-sidenav-show bg-body overflow-overlay">
+    <body class="g-sidenav-show bg-body">
     @endmobile
 
         @stack('body_start')

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

@@ -2,7 +2,7 @@
 
 @if (! $hideButtonAddNew)
     @can($permissionCreate)
-        <x-link href="{{ route($routeButtonAddNew, ['type' => $type]) }}"  kind="primary">
+        <x-link href="{{ route($routeButtonAddNew, ['type' => $type]) }}" kind="primary">
             {{ trans($textButtonAddNew) }}
         </x-link>
     @endcan

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/show/template.blade.php

@@ -1,4 +1,4 @@
-<div class="p-7 shadow-2xl rounded-2xl print-template">
+<div class="p-7 shadow-2xl rounded-2xl">
     @if ($transactionTemplate)
         @switch($transactionTemplate)
             @case('classic')

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

@@ -1,362 +1,384 @@
-@stack('company_start')
+<div class="print-template">
-@if (!$hideCompany)
+    @stack('company_start')
-<table class="border-bottom-1">
+    @if (! $hideCompany)
-    <tr>
+        <table class="border-bottom-1">
-        @if (!$hideCompanyLogo)
+            <tr>
-        <td style="width:20%; padding: 0 0 15px 0;" valign="top">
+                @if (! $hideCompanyLogo)
-            @stack('company_logo_start')
+                <td style="width:20%; padding: 0 0 15px 0;" valign="top">
-            @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
+                    @stack('company_logo_start')
-                <img src="{{ Storage::url($transaction->contact->logo->id) }}" height="70" width="70" alt="{{ $transaction->contact_name }}" />
+                    @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
-            @else
+                        <img src="{{ Storage::url($transaction->contact->logo->id) }}" height="70" width="70" alt="{{ $transaction->contact_name }}" />
-                <img src="{{ $logo }}" height="70" width="70" alt="{{ setting('company.name') }}" />
+                    @else
-            @endif
+                        <img src="{{ $logo }}" height="70" width="70" alt="{{ setting('company.name') }}" />
-            @stack('company_logo_end')
+                    @endif
-        </td>
+                    @stack('company_logo_end')
-        @endif
+                </td>
-
-        @if (!$hideCompanyDetails)
-        <td class="text" style="width: 80%; padding: 0 0 15px 0;">
-            @stack('company_details_start')
-            @if (!$hideCompanyName)
-                <h2 class="text-semibold text">
-                    {{ setting('company.name') }}
-                </h2>
-            @endif
-
-            @if (!$hideCompanyAddress)
-                <p>{!! (setting('company.address')) !!}</p>
-            @endif
-
-            @if (!$hideCompanyTaxNumber)
-                @if (setting('company.tax_number'))
-                    <p>
-                        {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                    </p>
                 @endif
-            @endif
 
-            @if (!$hideCompanyPhone)
+                @if (! $hideCompanyDetails)
-                @if (setting('company.phone'))
+                <td class="text" style="width: 80%; padding: 0 0 15px 0;">
-                    <p>
+                    @stack('company_details_start')
-                        {{ setting('company.phone') }}
+                    @if (! $hideCompanyName)
-                    </p>
+                        <h2 class="text-semibold text">
+                            {{ setting('company.name') }}
+                        </h2>
+                    @endif
+
+                    @if (! $hideCompanyAddress)
+                        <p>{!! (setting('company.address')) !!}</p>
+                    @endif
+
+                    @if (! $hideCompanyTaxNumber)
+                        @if (setting('company.tax_number'))
+                            <p>
+                                {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                            </p>
+                        @endif
+                    @endif
+
+                    @if (! $hideCompanyPhone)
+                        @if (setting('company.phone'))
+                            <p>
+                                {{ setting('company.phone') }}
+                            </p>
+                        @endif
+                    @endif
+
+                    @if (! $hideCompanyEmail)
+                            <p>{{ setting('company.email') }}</p>
+                        @endif
+                    @stack('company_details_end')
+                </td>
                 @endif
-            @endif
+            </tr>
+        </table>
+    @endif
+    @stack('company_end')
 
-            @if (!$hideCompanyEmail)
+    @if (! $hideContentTitle)
-                    <p>{{ setting('company.email') }}</p>
+        <table>
-                @endif
+            <tr>
-            @stack('company_details_end')
+                <td style="width: 60%; padding: 15px 0 15px 0;">
-        </td>
+                    <h2 style="font-size: 12px; font-weight:600;">
-        @endif
+                        {{ trans($textContentTitle) }}
-    </tr>
+                    </h2>
-</table>
+                </td>
-@endif
+            </tr>
-@stack('company_end')
+        </table>
+    @endif
 
-@if (!$hideContentTitle)
     <table>
+        @stack('number_input_start')
+        @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) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('number_input_end')
+
+        @stack('paid_at_input_start')
+        @if (! $hidePaidAt)
+            <tr>
+                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    {{ trans($textPaidAt) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('paid_at_input_end')
+
+        @stack('account_id_input_start')
+        @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) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('account_id_input_end')
+
+        @stack('category_id_input_start')
+        @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) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('category_id_input_end')
+
+        @stack('payment_method_input_start')
+        @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) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('payment_method_input_end')
+
+        @stack('reference_input_start')
+        @if (! $hideReference)
+            <tr>
+                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    {{ trans($textReference) }}:
+                </td>
+
+                <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>
+        @endif
+        @stack('reference_input_end')
+
+        @stack('description_input_start')
+        @if (! $hideDescription)
+            <tr>
+                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    {{ trans($textDescription) }}:
+                </td>
+
+                <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>
+                </td>
+            </tr>
+        @endif
+        @stack('description_input_end')
+    </table>
+
+    <table class="border-top-1" style="margin-top:15px;">
         <tr>
             <td style="width: 60%; padding: 15px 0 15px 0;">
                 <h2 style="font-size: 12px; font-weight:600;">
-                    {{ trans($textContentTitle) }}
+                    {{ trans($textPaidBy) }}
                 </h2>
             </td>
         </tr>
     </table>
-@endif
 
-<table>
+    <table class="border-bottom-1" style="padding-bottom:15px;">
-    @stack('number_input_start')
+        @if (! $hideContact)
-    @if (!$hideNumber)
+            @if (! $hideContactInfo)
+                <tr>
+                    <td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                        <strong>{{ trans($textContactInfo) }}</strong><br>
+                    </td>
+                </tr>
+            @endif
+
+            @stack('name_input_start')
+            @if (! $hideContactName)
+                <tr>
+                    <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>
+                </tr>
+            @endif
+            @stack('name_input_end')
+
+            @stack('address_input_start')
+            @if (! $hideContactAddress)
+                <tr>
+                    <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>
+                </tr>
+            @endif
+            @stack('address_input_end')
+
+            @stack('tax_number_input_start')
+            @if (! $hideContactTaxNumber)
+                <tr>
+                    <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 }}
+                        @endif
+                    </td>
+                </tr>
+            @endif
+            @stack('tax_number_input_end')
+
+            @stack('phone_input_start')
+            @if (! $hideContactPhone)
+                <tr>
+                    <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 }}
+                        @endif
+                    </td>
+                </tr>
+            @endif
+            @stack('phone_input_end')
+
+            @stack('email_start')
+            @if (! $hideContactEmail)
+                <tr>
+                    <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>
+                </tr>
+            @endif
+            @stack('email_input_end')
+        @endif
+
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+            <td></td>
-                {{ 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;">
-                {{ $transaction->number }}
-            </td>
-        </tr>
-    @endif
-    @stack('number_input_end')
-
-    @stack('paid_at_input_start')
-    @if (!$hidePaidAt)
-        <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                {{ trans($textPaidAt) }}:
-            </td>
-
-            <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>
-    @endif
-    @stack('paid_at_input_end')
-
-    @stack('account_id_input_start')
-    @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) }}:
-            </td>
-
-            <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>
-    @endif
-    @stack('account_id_input_end')
-
-    @stack('category_id_input_start')
-    @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) }}:
-            </td>
-
-            <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>
-    @endif
-    @stack('category_id_input_end')
-
-    @stack('payment_method_input_start')
-    @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) }}:
-            </td>
-
-            <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>
-    @endif
-    @stack('payment_method_input_end')
-
-    @stack('reference_input_start')
-    @if (!$hideReference)
-        <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                {{ trans($textReference) }}:
-            </td>
-
-            <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>
-    @endif
-    @stack('reference_input_end')
-
-    @stack('description_input_start')
-    @if (!$hideDescription)
-        <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
-                {{ trans($textDescription) }}:
-            </td>
-
-            <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>
-            </td>
-        </tr>
-    @endif
-    @stack('description_input_end')
-</table>
-
-<table class="border-top-1" style="margin-top:15px;">
-    <tr>
-        <td style="width: 60%; padding: 15px 0 15px 0;">
-            <h2 style="font-size: 12px; font-weight:600;">
-                {{ trans($textPaidBy) }}
-            </h2>
-        </td>
-    </tr>
-</table>
-
-<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;">
-                <strong>{{ trans($textContactInfo) }}</strong><br>
-            </td>
-        </tr>
-    @endif
-
-    @stack('name_input_start')
-    @if (!$hideContactName)
-        <tr>
-            <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>
-        </tr>
-    @endif
-    @stack('name_input_end')
-
-    @stack('address_input_start')
-    @if (!$hideContactAddress)
-        <tr>
-            <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>
-        </tr>
-    @endif
-    @stack('address_input_end')
-
-    @stack('tax_number_input_start')
-    @if (!$hideContactTaxNumber)
-        <tr>
-            <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 }}
-                @endif
-            </td>
-        </tr>
-    @endif
-    @stack('tax_number_input_end')
-
-    @stack('phone_input_start')
-    @if (!$hideContactPhone)
-        <tr>
-            <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 }}
-                @endif
-            </td>
-        </tr>
-    @endif
-    @stack('phone_input_end')
-
-    @stack('email_start')
-    @if (!$hideContactEmail)
-        <tr>
-            <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>
-        </tr>
-    @endif
-    @stack('email_input_end')
-    @endif
-    <tr>
-        <td></td>
-    </tr>
-</table>
-
-@if (!$hideRelated)
-    @if ($transaction->document)
-    <table>
-        <tr>
-            <td style="padding:15px 0 0 0;">
-                <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">{{ trans($textRelatedTransansaction) }}</h2>
-            </td>
         </tr>
     </table>
 
-    <table class="table" cellspacing="0" cellpadding="0" style="padding:15px 0 0 0;">
+    @if (! $hideRelated)
-        <thead style="color:#424242; font-size:12px;">
+        @if ($transaction->document)
-            <tr class="border-bottom-1">
+            <table>
-                <th class="item text-alignment-left text-left" style="padding:5px 0;">
+                <tr>
-                    @if (!$hideRelatedDocumentNumber)
+                    <td style="padding:15px 0 0 0;">
-                        <span style="font-size: 13px;">{{ trans_choice($textRelatedDocumentNumber, 1) }}</span> <br />
+                        <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">
-                    @endif
+                            {{ trans($textRelatedTransansaction) }}
+                        </h2>
+                    </td>
+                </tr>
+            </table>
 
-                    @if (!$hideRelatedContact)
+            <table class="table" cellspacing="0" cellpadding="0" style="padding:15px 0 0 0;">
-                        <span style="font-weight:500;"> {{ trans_choice($textRelatedContact, 1) }} </span>
+                <thead style="color:#424242; font-size:12px;">
-                    @endif
+                    <tr class="border-bottom-1">
-                </th>
+                        <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 />
+                            @endif
 
+                            @if (! $hideRelatedContact)
+                                <span style="font-weight:500;">
+                                    {{ trans_choice($textRelatedContact, 1) }}
+                                </span>
+                            @endif
+                        </th>
 
-                @if (!$hideRelatedDocumentDate)
+                        @if (! $hideRelatedDocumentDate)
-                <th class="price" style=" padding:5px 0; text-align:center;">
+                            <th class="price" style="padding:5px 0; text-align:center;">
-                    {{ trans($textRelatedDocumentDate) }}
+                                {{ trans($textRelatedDocumentDate) }}
-                </th>
+                            </th>
-                @endif
+                        @endif
 
+                        <th class="price text-alignment-right text-right" style="padding: 5px 0;">
+                            @if (! $hideRelatedDocumentAmount)
+                                <span style="font-size: 13px;">
+                                    {{ trans($textRelatedDocumentAmount) }}
+                                </span>
+                                <br />
+                            @endif
 
-                <th class="price text-alignment-right text-right" style="padding: 5px 0;">
+                            @if (! $hideRelatedAmount)
-                    @if (!$hideRelatedDocumentAmount)
+                                <span style="font-weight:500;">
-                        <span style="font-size: 13px;">{{ trans($textRelatedDocumentAmount) }}</span><br />
+                                    {{ trans($textRelatedAmount) }}
-                    @endif
+                                </span>
+                            @endif
+                        </th>
+                    </tr>
+                </thead>
 
-                    @if (!$hideRelatedAmount)
+                <tbody>
-                        <span style="font-weight:500;">{{ trans($textRelatedAmount) }}</span>
-                    @endif
-                </th>
-
-            </tr>
-        </thead>
-
-        <tbody>
-            <tr>
-                <td class="item text-alignment-left text-left" style="color:#424242; font-size:12px; padding-left:0;">
-                    @if (!$hideRelatedDocumentNumber)
-                        <a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
-                            {{ $transaction->document->document_number }}
-                        </a> <br />
-                    @endif
-
-                    @if (!$hideRelatedContact)
-                        <span style="color: #6E6E6E"> {{ $transaction->document->contact_name }} </span>
-                    @endif
-                </td>
-
-                @if (!$hideRelatedDocumentDate)
-                <td class="price" style="color:#424242; font-size:12px; text-align:center;">
-                    @date($transaction->document->due_at)
-                </td>
-                @endif
-
-                <td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
-                    @if (!$hideRelatedDocumentAmount)
-                        @money($transaction->document->amount, $transaction->document->currency_code, true) <br />
-                    @endif
-
-                    @if (!$hideRelatedAmount)
-                        <span style="color: #6E6E6E"> @money($transaction->amount, $transaction->currency_code, true) </span>
-                    @endif
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    @endif
-@endif
-
-@if (!$hideAmount)
-    <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;">
+                        <td class="item text-alignment-left text-left" style="color:#424242; font-size:12px; padding-left:0;">
-                            {{ trans($textAmount) }}:
+                            @if (! $hideRelatedDocumentNumber)
+                                <a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
+                                    {{ $transaction->document->document_number }}
+                                </a>
+                                <br />
+                            @endif
+
+                            @if (! $hideRelatedContact)
+                                <span style="color: #6E6E6E">
+                                    {{ $transaction->document->contact_name }}
+                                </span>
+                            @endif
                         </td>
-                        <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
+
-                            @money($transaction->amount, $transaction->currency_code, true)
+                        @if (! $hideRelatedDocumentDate)
+                            <td class="price" style="color:#424242; font-size:12px; text-align:center;">
+                                @date($transaction->document->due_at)
+                            </td>
+                        @endif
+
+                        <td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
+                            @if (! $hideRelatedDocumentAmount)
+                                @money($transaction->document->amount, $transaction->document->currency_code, true) <br />
+                            @endif
+
+                            @if (! $hideRelatedAmount)
+                                <span style="color: #6E6E6E">
+                                    @money($transaction->amount, $transaction->currency_code, true)
+                                </span>
+                            @endif
                         </td>
                     </tr>
-                </table>
+                </tbody>
-            </td>
+            </table>
-        </tr>
+        @endif
-    </table>
+    @endif
-@endif
+
+    @if (! $hideAmount)
+        <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($textAmount) }}:
+                            </td>
+
+                            <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
+                                @money($transaction->amount, $transaction->currency_code, true)
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    @endif
+</div>

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

@@ -6,7 +6,7 @@
     </div>
 
     <div class="w-full lg:w-7/12">
-        <div class="p-7 shadow-2xl rounded-2xl print-template">
+        <div class="p-7 shadow-2xl rounded-2xl">
             <x-transfers.show.template :model="$transfer" />
         </div>
     </div>

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

@@ -1,217 +1,219 @@
-<table class="border-bottom-1" style="width: 100%;">
+<div class="print-template">
-    <tbody>
+    <table class="border-bottom-1" style="width: 100%;">
+        <tbody>
+            <tr>
+                <td style="width: 60%; padding: 0 0 15px 0;">
+                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                        {{ trans('transfers.from_account') }}
+                    </h2>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->number }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_phone }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_address }}
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table class="border-bottom-1" style="width: 100%; margin-top:15px;">
+        <tbody>
+            <tr>
+                <td style="width: 60%; padding: 0 0 15px 0;">
+                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                        {{ trans('transfers.to_account') }}
+                    </h2>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->number }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_phone }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_address }}
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table style="width: 100%; margin-top:15px;">
         <tr>
-            <td style="width: 60%; padding: 0 0 15px 0;">
+            <td style="padding:0 0 15px 0;">
-                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
-                    {{ trans('transfers.from_account') }}
+                    {{ trans_choice('transfers.details', 2) }}
                 </h2>
+            </td>
+        </tr>
+    </table>
 
+    <table>
+        <tr>
+            <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 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;">
+                <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>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
+                    {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
+                @else
+                    <x-empty-data />
+                @endif
+            </td>
+        </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>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 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;">
+                {{ trans('general.description') }}
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                {{ $transfer->expense_transaction->description }}
+            </td>
+        </tr>
+    </table>
+
+    <table style="text-align: right;">
+        <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 style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
-                            {{ trans('accounts.account_name') }}:
+                            {{ trans('general.amount') }}:
                         </td>
 
-                        <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                        <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
-                            {{ $transfer->expense_transaction->account->name }}
+                            <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->number }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_phone }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_address }}
                         </td>
                     </tr>
                 </table>
             </td>
         </tr>
-    </tbody>
+    </table>
-</table>
+</div>
-
-<table class="border-bottom-1" style="width: 100%; margin-top:15px;">
-    <tbody>
-        <tr>
-            <td style="width: 60%; padding: 0 0 15px 0;">
-                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
-                    {{ trans('transfers.to_account') }}
-                </h2>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->number }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_phone }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_address }}
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-<table style="width: 100%; margin-top:15px;">
-    <tr>
-        <td style="padding:0 0 15px 0;">
-            <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
-                {{ trans_choice('transfers.details', 2) }}
-            </h2>
-        </td>
-    </tr>
-</table>
-
-<table>
-    <tr>
-        <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 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;">
-            <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>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
-            @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
-                {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
-            @else
-                <x-empty-data />
-            @endif
-        </td>
-    </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>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 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;">
-            {{ trans('general.description') }}
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
-            {{ $transfer->expense_transaction->description }}
-        </td>
-    </tr>
-</table>
-
-<table style="text-align: right;">
-    <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') }}:
-                    </td>
-
-                    <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
-                        <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-</table>

resources/views/components/transfers/template/second.blade.php

@@ -1,217 +1,219 @@
-<table style="width: 100%;">
+<div class="print-template">
-    <tr>
+    <table style="width: 100%;">
-        <td style="padding:0 0 15px 0;">
-            <h2 class="text-left" style="font-size: 14px; font-weight:600;">
-                {{ trans_choice('transfers.details', 2) }}
-            </h2>
-        </td>
-    </tr>
-</table>
-
-<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') }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
-            <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
-        </td>
-    </tr>
-
-    <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) }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
-            @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
-                {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
-            @else
-                <x-empty-data />
-            @endif
-        </td>
-    </tr>
-
-    <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') }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
-            {{ $transfer->expense_transaction->reference }}
-        </td>
-    </tr>
-
-    <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.description') }}
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
-            {{ $transfer->expense_transaction->description }}
-        </td>
-    </tr>
-</table>
-
-<table style="width: 100%; margin-top:35px;">
-    <tbody>
         <tr>
-            <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
+            <td style="padding:0 0 15px 0;">
-                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                <h2 class="text-left" style="font-size: 14px; font-weight:600;">
-                    {{ trans('transfers.from_account') }}
+                    {{ trans_choice('transfers.details', 2) }}
                 </h2>
+            </td>
+        </tr>
+    </table>
 
+    <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') }}:
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
+                <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
+            </td>
+        </tr>
+
+        <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) }}:
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
+                @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
+                    {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
+                @else
+                    <x-empty-data />
+                @endif
+            </td>
+        </tr>
+
+        <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') }}:
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
+                {{ $transfer->expense_transaction->reference }}
+            </td>
+        </tr>
+
+        <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.description') }}
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
+                {{ $transfer->expense_transaction->description }}
+            </td>
+        </tr>
+    </table>
+
+    <table style="width: 100%; margin-top:35px;">
+        <tbody>
+            <tr>
+                <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
+                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                        {{ trans('transfers.from_account') }}
+                    </h2>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->number}}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_phone }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->expense_transaction->account->bank_address }}
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table style="width: 100%; margin-top:15px;">
+        <tbody>
+            <tr>
+                <td style="width: 60%; padding: 0 0 15px 0;">
+                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                        {{ trans('transfers.to_account') }}
+                    </h2>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->number }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_name }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_phone }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <table>
+                        <tr>
+                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                {{ $transfer->income_transaction->account->bank_address }}
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table style="text-align: right;">
+        <tr>
+            <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
                     <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            {{ trans('accounts.number') }}:
+                            {{ trans('general.amount') }}:
                         </td>
 
-                        <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                        <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
-                            {{ $transfer->expense_transaction->account->name }}
+                            <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->number}}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_phone }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->expense_transaction->account->bank_address }}
                         </td>
                     </tr>
                 </table>
             </td>
         </tr>
-    </tbody>
+    </table>
-</table>
+</div>
-
-<table style="width: 100%; margin-top:15px;">
-    <tbody>
-        <tr>
-            <td style="width: 60%; padding: 0 0 15px 0;">
-                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
-                    {{ trans('transfers.to_account') }}
-                </h2>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->number }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_name }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_phone }}
-                        </td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr>
-                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                            {{ $transfer->income_transaction->account->bank_address }}
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-<table style="text-align: right;">
-    <tr>
-        <td valign="center" style="width:80%; display:block; float:right;">
-            <table>
-                <tr>
-                    <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                        {{ trans('general.amount') }}:
-                    </td>
-
-                    <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
-                        <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-</table>

resources/views/components/transfers/template/third.blade.php

@@ -1,227 +1,229 @@
-<table class="border-bottom-1" style="width: 100%;">
+<div class="print-template">
-    <tbody>
+    <table class="border-bottom-1" style="width: 100%;">
+        <tbody>
+            <tr>
+                <td style="width: 50%; padding: 0 15px 15px 0;" valign="top">
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td style="padding:0;">
+                                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                                        {{ trans('transfers.from_account') }}
+                                    </h2>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->expense_transaction->account->name }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->expense_transaction->account->number}}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->expense_transaction->account->bank_name }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->expense_transaction->account->bank_phone }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->expense_transaction->account->bank_address }}
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </td>
+
+                <td style="width: 50%; padding: 0 0 15px 15px;" valign="top">
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td style="padding:0;">
+                                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                                        {{ trans('transfers.to_account') }}
+                                    </h2>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->income_transaction->account->name }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->income_transaction->account->number }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->income_transaction->account->bank_name }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->income_transaction->account->bank_phone }}
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table>
+                                        <tr>
+                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
+                                                {{ $transfer->income_transaction->account->bank_address }}
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table style="width: 100%; margin-top:15px;">
         <tr>
-            <td style="width: 50%; padding: 0 15px 15px 0;" valign="top">
+            <td style="padding:0 0 15px 0;">
-                <table>
+                <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
-                    <tbody>
+                    {{ trans_choice('transfers.details', 2) }}
-                        <tr>
+                </h2>
-                            <td style="padding:0;">
+            </td>
-                                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+        </tr>
-                                    {{ trans('transfers.from_account') }}
+    </table>
-                                </h2>
 
-                                <table>
+    <table>
-                                    <tr>
+        <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-                                            {{ trans('accounts.number') }}:
+                {{ trans('general.date') }}:
-                                        </td>
-
-                                        <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
-                                            {{ $transfer->expense_transaction->account->name }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->expense_transaction->account->number}}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->expense_transaction->account->bank_name }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->expense_transaction->account->bank_phone }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->expense_transaction->account->bank_address }}
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
             </td>
 
-            <td style="width: 50%; padding: 0 0 15px 15px;" valign="top">
+            <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
+                <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
+            </td>
+        </tr>
+
+        <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) }}:
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
+                @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
+                    {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
+                @else
+                    <x-empty-data />
+                @endif
+            </td>
+        </tr>
+
+        <tr>
+            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+                {{ trans('general.reference') }}:
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
+                {{ $transfer->expense_transaction->reference }}
+            </td>
+        </tr>
+
+        <tr>
+            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+                {{ trans('general.description') }}
+            </td>
+
+            <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
+                {{ $transfer->expense_transaction->description }}
+            </td>
+        </tr>
+    </table>
+
+    <table style="text-align: right;">
+        <tr>
+            <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
-                    <tbody>
+                    <tr>
-                        <tr>
+                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            <td style="padding:0;">
+                            {{ trans('general.amount') }}:
-                                <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                        </td>
-                                    {{ trans('transfers.to_account') }}
-                                </h2>
 
-                                <table>
+                        <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
-                                    <tr>
+                            <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                        </td>
-                                            {{ trans('accounts.number') }}:
+                    </tr>
-                                        </td>
-
-                                        <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
-                                            {{ $transfer->income_transaction->account->name }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->income_transaction->account->number }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->income_transaction->account->bank_name }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->income_transaction->account->bank_phone }}
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table>
-                                    <tr>
-                                        <td style="width:30%; margin: 0px; padding: 0 0 8px 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;">
-                                            {{ $transfer->income_transaction->account->bank_address }}
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
                 </table>
             </td>
         </tr>
-    </tbody>
+    </table>
-</table>
+</div>
-
-<table style="width: 100%; margin-top:15px;">
-    <tr>
-        <td style="padding:0 0 15px 0;">
-            <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
-                {{ trans_choice('transfers.details', 2) }}
-            </h2>
-        </td>
-    </tr>
-</table>
-
-<table>
-    <tr>
-        <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-            {{ trans('general.date') }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
-            <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
-        </td>
-    </tr>
-
-    <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) }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
-            @if (! empty($payment_methods[$transfer->expense_transaction->payment_method]))
-                {!! $payment_methods[$transfer->expense_transaction->payment_method] !!}
-            @else
-                <x-empty-data />
-            @endif
-        </td>
-    </tr>
-
-    <tr>
-        <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-            {{ trans('general.reference') }}:
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
-            {{ $transfer->expense_transaction->reference }}
-        </td>
-    </tr>
-
-    <tr>
-        <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
-            {{ trans('general.description') }}
-        </td>
-
-        <td valign="top" style="width:70%; margin: 0px; padding: 0; font-size: 12px; border-bottom:1px solid; line-height: 24px;">
-            {{ $transfer->expense_transaction->description }}
-        </td>
-    </tr>
-</table>
-
-<table style="text-align: right;">
-    <tr>
-        <td valign="center" style="width:80%; display:block; float:right;">
-            <table>
-                <tr>
-                    <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                        {{ trans('general.amount') }}:
-                    </td>
-
-                    <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
-                        <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-</table>

resources/views/portal/invoices/index.blade.php

@@ -117,7 +117,7 @@
                                 <x-table.td class="w-3/12  sm:table-cell">
                                     @stack('document_number_td_inside_start')
 
-                                    <x-slot name="first" class="relative w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
+                                    <x-slot name="first" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
                                         <span class="border-black border-b border-dashed">
                                             {{ $item->document_number }}
                                         </span>

resources/views/purchases/recurring_bills/show.blade.php

@@ -17,7 +17,6 @@
             :document="$recurring_bill"
             hide-divider1
             hide-divider2
-            hide-divider3
             hide-divider4
             hide-email
             hide-share
@@ -25,6 +24,7 @@
             hide-print
             hide-pdf
             hide-cancel
+            hide-delete
         />
     </x-slot>
 

resources/views/sales/recurring_invoices/show.blade.php

@@ -17,13 +17,14 @@
             :document="$recurring_invoice"
             hide-divider1
             hide-divider2
-            hide-divider3
+            hide-divider4
             hide-email
             hide-share
             hide-customize
             hide-print
             hide-pdf
             hide-cancel
+            hide-delete
         />
     </x-slot>