From 445f151c15741695b6aaf33e2fbf8b7d3944f2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 13 Jun 2022 22:50:07 +0300 Subject: [PATCH 01/34] Recurring template show pages remove delete link.. --- resources/views/banking/recurring_transactions/show.blade.php | 4 ++-- .../views/components/documents/show/more-buttons.blade.php | 2 -- resources/views/purchases/recurring_bills/show.blade.php | 2 +- resources/views/sales/recurring_invoices/show.blade.php | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/views/banking/recurring_transactions/show.blade.php b/resources/views/banking/recurring_transactions/show.blade.php index 33f12e6fe..9053cc4ae 100644 --- a/resources/views/banking/recurring_transactions/show.blade.php +++ b/resources/views/banking/recurring_transactions/show.blade.php @@ -8,7 +8,7 @@ - + @@ -21,8 +21,8 @@ hide-button-share hide-button-email hide-divider-2 - hide-button-delete hide-divider-4 + hide-button-delete /> diff --git a/resources/views/components/documents/show/more-buttons.blade.php b/resources/views/components/documents/show/more-buttons.blade.php index 191a22c3f..ea44a44c5 100644 --- a/resources/views/components/documents/show/more-buttons.blade.php +++ b/resources/views/components/documents/show/more-buttons.blade.php @@ -130,8 +130,6 @@ {{ trans('recurring.end') }} - - @endif @stack('end_button_end') diff --git a/resources/views/purchases/recurring_bills/show.blade.php b/resources/views/purchases/recurring_bills/show.blade.php index f00f76d1c..69b661659 100644 --- a/resources/views/purchases/recurring_bills/show.blade.php +++ b/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 /> diff --git a/resources/views/sales/recurring_invoices/show.blade.php b/resources/views/sales/recurring_invoices/show.blade.php index 9b78dc0cf..74d64e2e1 100644 --- a/resources/views/sales/recurring_invoices/show.blade.php +++ b/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 /> From d17c3a89b399d2df5a78e9cecb418c4b260cdd6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 14 Jun 2022 00:36:26 +0300 Subject: [PATCH 02/34] added status scope --- app/Models/Document/Document.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index b50d1acf5..e8363e280 100644 --- a/app/Models/Document/Document.php +++ b/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,7 +249,7 @@ class Document extends Model public function getSentAtAttribute(string $value = null) { - $sent = $this->histories()->where('status', 'sent')->first(); + $sent = $this->histories()->where($this->qualifyColumn('status'), 'sent')->first(); return $sent->created_at ?? null; } From 4940720ec0c1e148388610005bc26ff9b0a2417c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 14 Jun 2022 01:18:34 +0300 Subject: [PATCH 03/34] added marked sent event --- app/BulkActions/Sales/Invoices.php | 4 +- app/Events/Document/DocumentMarkedSent.php | 20 ++++ app/Http/Controllers/Sales/Invoices.php | 2 +- app/Listeners/Document/MarkDocumentSent.php | 26 ++-- app/Providers/Event.php | 3 + resources/lang/en-GB/documents.php | 126 ++++++++++---------- 6 files changed, 98 insertions(+), 83 deletions(-) create mode 100644 app/Events/Document/DocumentMarkedSent.php diff --git a/app/BulkActions/Sales/Invoices.php b/app/BulkActions/Sales/Invoices.php index e70a04b53..168eac93c 100644 --- a/app/BulkActions/Sales/Invoices.php +++ b/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)); } } diff --git a/app/Events/Document/DocumentMarkedSent.php b/app/Events/Document/DocumentMarkedSent.php new file mode 100644 index 000000000..c79c1fe3f --- /dev/null +++ b/app/Events/Document/DocumentMarkedSent.php @@ -0,0 +1,20 @@ +document = $document; + } +} diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index e2521f12a..be3f68250 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/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)]); diff --git a/app/Listeners/Document/MarkDocumentSent.php b/app/Listeners/Document/MarkDocumentSent.php index 266d623fa..70e944756 100644 --- a/app/Listeners/Document/MarkDocumentSent.php +++ b/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; - /** - * Handle the event. - * - * @param $event - * @return void - */ - public function handle(Event $event) + public function handle(DocumentMarkedSent|DocumentSent $event): void { 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( - new CreateDocumentHistory( - $event->document, - 0, - trans('documents.messages.marked_sent', ['type' => $type]) - ) - ); + $message = ($event instanceof DocumentMarkedSent) ? 'marked_sent' : 'email_sent'; + + return trans('documents.messages.' . $message, ['type' => $type]); } } diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 198f1c903..832bae905 100644 --- a/app/Providers/Event.php +++ b/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', ], diff --git a/resources/lang/en-GB/documents.php b/resources/lang/en-GB/documents.php index faee0a7d7..bb4170856 100644 --- a/resources/lang/en-GB/documents.php +++ b/resources/lang/en-GB/documents.php @@ -2,84 +2,80 @@ return [ - 'edit_columns' => 'Edit Columns', - 'empty_items' => 'You have not added any items.', + 'edit_columns' => 'Edit Columns', + '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' => [ - 'marked' => ' You marked this invoice as', - 'services' => 'Services', - 'another_item' => 'Another Item', - 'another_description' => 'and another description', - 'more_item' => '+:count more item', + 'invoice_detail' => [ + 'marked' => 'You marked this invoice as', + 'services' => 'Services', + 'another_item' => 'Another Item', + 'another_description' => 'and another description', + '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', - 'sent' => 'Sent', - 'expired' => 'Expired', - 'viewed' => 'Viewed', - 'approved' => 'Approved', - 'received' => 'Received', - 'refused' => 'Refused', - 'restored' => 'Restored', - 'reversed' => 'Reversed', - 'partial' => 'Partial', - 'paid' => 'Paid', - 'pending' => 'Pending', - 'invoiced' => 'Invoiced', - 'overdue' => 'Overdue', - 'unpaid' => 'Unpaid', - 'cancelled' => 'Cancelled', - 'voided' => 'Voided', - 'completed' => 'Completed', - 'shipped' => 'Shipped', - 'refunded' => 'Refunded', - 'failed' => 'Failed', - 'denied' => 'Denied', - 'processed' => 'Processed', - 'open' => 'Open', - 'closed' => 'Closed', - 'billed' => 'Billed', - 'delivered' => 'Delivered', - 'returned' => 'Returned', - 'drawn' => 'Drawn', - 'not_billed' => 'Not Billed', - 'issued' => 'Issued', - 'not_invoiced' => 'Not Invoiced', - 'confirmed' => 'Confirmed', - 'not_confirmed' => 'Not Confirmed', - 'active' => 'Active', - 'ended' => 'Ended', + 'draft' => 'Draft', + 'sent' => 'Sent', + 'expired' => 'Expired', + 'viewed' => 'Viewed', + 'approved' => 'Approved', + 'received' => 'Received', + 'refused' => 'Refused', + 'restored' => 'Restored', + 'reversed' => 'Reversed', + 'partial' => 'Partial', + 'paid' => 'Paid', + 'pending' => 'Pending', + 'invoiced' => 'Invoiced', + 'overdue' => 'Overdue', + 'unpaid' => 'Unpaid', + 'cancelled' => 'Cancelled', + 'voided' => 'Voided', + 'completed' => 'Completed', + 'shipped' => 'Shipped', + 'refunded' => 'Refunded', + 'failed' => 'Failed', + 'denied' => 'Denied', + 'processed' => 'Processed', + 'open' => 'Open', + 'closed' => 'Closed', + 'billed' => 'Billed', + 'delivered' => 'Delivered', + 'returned' => 'Returned', + 'drawn' => 'Drawn', + 'not_billed' => 'Not Billed', + 'issued' => 'Issued', + 'not_invoiced' => 'Not Invoiced', + 'confirmed' => 'Confirmed', + 'not_confirmed' => 'Not Confirmed', + 'active' => 'Active', + 'ended' => 'Ended', ], 'form_description' => [ - 'companies' => 'Change the address, logo, and other information for your company.', - 'billing' => 'Billing details appears in your document.', - 'advanced' => 'Select the category, add or edit the footer, and add attachments to your :type.', - 'attachment' => 'Download the files attached to this :type', + 'companies' => 'Change the address, logo, and other information for your company.', + 'billing' => 'Billing details appears in your document.', + 'advanced' => 'Select the category, add or edit the footer, and add attachments to your :type.', + 'attachment' => 'Download the files attached to this :type', ], 'messages' => [ - 'email_sent' => ':type email has been sent!', - 'marked_as' => ':type marked as :status!', - 'marked_sent' => ':type marked as sent!', - 'marked_paid' => ':type marked as paid!', - 'marked_viewed' => ':type marked as viewed!', - 'marked_cancelled' => ':type marked as cancelled!', - 'marked_received' => ':type marked as received!', + 'email_sent' => ':type email has been sent!', + 'marked_as' => ':type marked as :status!', + 'marked_sent' => ':type marked as sent!', + 'marked_paid' => ':type marked as paid!', + 'marked_viewed' => ':type marked as viewed!', + 'marked_cancelled' => ':type marked as cancelled!', + '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.', From 472c1c3e811b4097ca5f5986a86b2382710c6e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 14 Jun 2022 01:26:52 +0300 Subject: [PATCH 04/34] fixed qualified column --- app/Models/Document/Document.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index e8363e280..df5587684 100644 --- a/app/Models/Document/Document.php +++ b/app/Models/Document/Document.php @@ -249,14 +249,14 @@ class Document extends Model public function getSentAtAttribute(string $value = null) { - $sent = $this->histories()->where($this->qualifyColumn('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; } From 203b47169ca83c0d36f1c5f43cb52d3f441167ec Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 14 Jun 2022 09:53:44 +0300 Subject: [PATCH 05/34] classname edited for print --- public/css/print.css | 52 +- .../documents/show/template.blade.php | 2 +- .../documents/template/classic.blade.php | 702 +++++++++--------- .../documents/template/default.blade.php | 656 ++++++++-------- .../documents/template/modern.blade.php | 678 ++++++++--------- .../transactions/show/template.blade.php | 2 +- .../transactions/template/default.blade.php | 666 ++++++++--------- .../transfers/show/content.blade.php | 2 +- .../transfers/template/default.blade.php | 412 +++++----- .../transfers/template/second.blade.php | 412 +++++----- .../transfers/template/third.blade.php | 438 +++++------ 11 files changed, 2018 insertions(+), 2004 deletions(-) diff --git a/public/css/print.css b/public/css/print.css index 67d125599..f98bb8dbd 100644 --- a/public/css/print.css +++ b/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 diff --git a/resources/views/components/documents/show/template.blade.php b/resources/views/components/documents/show/template.blade.php index f5129157e..d93973bc2 100644 --- a/resources/views/components/documents/show/template.blade.php +++ b/resources/views/components/documents/show/template.blade.php @@ -1,4 +1,4 @@ -
+
@if ($documentTemplate) @switch($documentTemplate) @case('classic') diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php index 5b8bab05b..365cc461d 100644 --- a/resources/views/components/documents/template/classic.blade.php +++ b/resources/views/components/documents/template/classic.blade.php @@ -1,387 +1,389 @@ -
-
-
-

- {{ $textDocumentTitle }} -

-
-
-
- -
-
-
- @stack('company_logo_start') - @if (! $hideCompanyLogo) - @if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) - - @else - - @endif - @endif - @stack('company_logo_end') -
-
- -
-
- @stack('company_details_start') - @if ($textDocumentSubheading) -

- {{ $textDocumentSubheading }} -

- @endif - - @if (! $hideCompanyDetails) - @if (! $hideCompanyName) -

{{ setting('company.name') }}

- @endif - - @if (! $hideCompanyAddress) -

- {!! nl2br(setting('company.address')) !!} - {!! $document->company->location !!} -

- @endif - - @if (! $hideCompanyTaxNumber) - @if (setting('company.tax_number')) -

- - {{ trans('general.tax_number') }}: - - {{ setting('company.tax_number') }} -

- @endif - @endif - - @if (! $hideCompanyPhone) - @if (setting('company.phone')) -

- {{ setting('company.phone') }} -

- @endif - @endif - - @if (! $hideCompanyEmail) -

- {{ setting('company.email') }} -

- @endif - @endif - @stack('company_details_end') -
-
-
- -
-
-
-
-
- -
-
-
- @stack('invoice_number_input_start') - @if (! $hideDocumentNumber) -
- - {{ trans($textDocumentNumber) }}: - - -
- - {{ $document->document_number }} -
- @endif - @stack('invoice_number_input_end') +
+
+
+
+

+ {{ $textDocumentTitle }} +

-
-
-
-
-
+
+
+
+ @stack('company_logo_start') + @if (! $hideCompanyLogo) + @if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) + + @else + + @endif + @endif + @stack('company_logo_end') +
+
-
-
-
- @if (! $hideContactInfo) -

- {{ trans($textContactInfo) }} -

- @endif - - @stack('name_input_start') - @if (! $hideContactName) -

- {{ $document->contact_name }} +

+
+ @stack('company_details_start') + @if ($textDocumentSubheading) +

+ {{ $textDocumentSubheading }}

@endif - @stack('name_input_end') - @stack('address_input_start') - @if (! $hideContactAddress) -

- {!! nl2br($document->contact_address) !!} -
- {!! $document->contact_location !!} -

- @endif - @stack('address_input_end') + @if (! $hideCompanyDetails) + @if (! $hideCompanyName) +

{{ setting('company.name') }}

+ @endif - @stack('tax_number_input_start') - @if (! $hideContactTaxNumber) - @if ($document->contact_tax_number) + @if (! $hideCompanyAddress)

- - {{ trans('general.tax_number') }}: - - {{ $document->contact_tax_number }} + {!! nl2br(setting('company.address')) !!} + {!! $document->company->location !!} +

+ @endif + + @if (! $hideCompanyTaxNumber) + @if (setting('company.tax_number')) +

+ + {{ trans('general.tax_number') }}: + + {{ setting('company.tax_number') }} +

+ @endif + @endif + + @if (! $hideCompanyPhone) + @if (setting('company.phone')) +

+ {{ setting('company.phone') }} +

+ @endif + @endif + + @if (! $hideCompanyEmail) +

+ {{ setting('company.email') }}

@endif @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (! $hideContactPhone) - @if ($document->contact_phone) -

- {{ $document->contact_phone }} -

- @endif - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (! $hideContactEmail) -

- {{ $document->contact_email }} -

- @endif - @stack('email_input_end') + @stack('company_details_end') +
-
-
- @stack('order_number_input_start') - @if (! $hideOrderNumber) - @if ($document->order_number) +
+
+
+
+
+ +
+
+
+ @stack('invoice_number_input_start') + @if (! $hideDocumentNumber) +
+ + {{ trans($textDocumentNumber) }}: + + +
+ + {{ $document->document_number }} +
+ @endif + @stack('invoice_number_input_end') +
+
+
+ +
+
+
+
+
+ +
+
+
+ @if (! $hideContactInfo) +

+ {{ trans($textContactInfo) }} +

+ @endif + + @stack('name_input_start') + @if (! $hideContactName) +

+ {{ $document->contact_name }} +

+ @endif + @stack('name_input_end') + + @stack('address_input_start') + @if (! $hideContactAddress) +

+ {!! nl2br($document->contact_address) !!} +
+ {!! $document->contact_location !!} +

+ @endif + @stack('address_input_end') + + @stack('tax_number_input_start') + @if (! $hideContactTaxNumber) + @if ($document->contact_tax_number) +

+ + {{ trans('general.tax_number') }}: + + {{ $document->contact_tax_number }} +

+ @endif + @endif + @stack('tax_number_input_end') + + @stack('phone_input_start') + @if (! $hideContactPhone) + @if ($document->contact_phone) +

+ {{ $document->contact_phone }} +

+ @endif + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (! $hideContactEmail) +

+ {{ $document->contact_email }} +

+ @endif + @stack('email_input_end') +
+
+ +
+
+ @stack('order_number_input_start') + @if (! $hideOrderNumber) + @if ($document->order_number) +

+ + {{ trans($textOrderNumber) }}: + + + + {{ $document->order_number }} + +

+ @endif + @endif + @stack('order_number_input_end') + + @stack('issued_at_input_start') + @if (! $hideIssuedAt)

- {{ trans($textOrderNumber) }}: + {{ trans($textIssuedAt) }}: - {{ $document->order_number }} + @date($document->issued_at)

@endif - @endif - @stack('order_number_input_end') + @stack('issued_at_input_end') - @stack('issued_at_input_start') - @if (! $hideIssuedAt) -

- - {{ trans($textIssuedAt) }}: - + @stack('due_at_input_start') + @if (! $hideDueAt) +

+ + {{ trans($textDueAt) }}: + - - @date($document->issued_at) - -

- @endif - @stack('issued_at_input_end') + + @date($document->due_at) + +

+ @endif + @stack('due_at_input_end') - @stack('due_at_input_start') - @if (! $hideDueAt) -

- - {{ trans($textDueAt) }}: - + @foreach ($document->totals_sorted as $total) + @if ($total->code == 'total') +

+ + {{ trans($total->name) }}: + - - @date($document->due_at) - -

- @endif - @stack('due_at_input_end') - - @foreach ($document->totals_sorted as $total) - @if ($total->code == 'total') -

- - {{ trans($total->name) }}: - - - - @money($total->amount - $document->paid, $document->currency_code, true) - -

- @endif - @endforeach -
-
-
- -@if (! $hideItems) -
-
-
- - - - @stack('name_th_start') - @if (! $hideItems || (! $hideName && ! $hideDescription)) - - @endif - @stack('name_th_end') - - @stack('quantity_th_start') - @if (! $hideQuantity) - - @endif - @stack('quantity_th_end') - - @stack('price_th_start') - @if (! $hidePrice) - - @endif - @stack('price_th_end') - - @if (! $hideDiscount) - @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) - @stack('discount_td_start') - - @stack('discount_td_end') - @endif - @endif - - @stack('total_th_start') - @if (! $hideAmount) - - @endif - @stack('total_th_end') - - - - - @if ($document->items->count()) - @foreach($document->items as $item) - - @endforeach - @else - - - - @endif - -
- {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} - - {{ trans($textQuantity) }} - - {{ trans($textPrice) }} - - {{ trans('invoices.discount') }} - - {{ trans($textAmount) }} -
- {{ trans('documents.empty_items') }} -
+ + @money($total->amount - $document->paid, $document->currency_code, true) + +

+ @endif + @endforeach
-@endif -
-
-
- @stack('notes_input_start') - @if ($hideNote) - @if ($document->notes) - - {{ trans_choice('general.notes', 2) }} - - - {!! nl2br($document->notes) !!} - @endif - @endif - @stack('notes_input_end') -
-
- -
- @foreach ($document->totals_sorted as $total) - @if ($total->code != 'total') - @stack($total->code . '_total_tr_start') -
- - {{ trans($total->title) }}: - - - - @money($total->amount, $document->currency_code, true) - -
- @stack($total->code . '_total_tr_end') - @else - @if ($document->paid) - @stack('paid_total_tr_start') -
- - {{ trans('invoices.paid') }}: - - - - - @money($document->paid, $document->currency_code, true) - -
- @stack('paid_total_tr_end') - @endif - - @stack('grand_total_tr_start') -
- - {{ trans($total->name) }}: - - - - @money($document->amount_due, $document->currency_code, true) - -
- @stack('grand_total_tr_end') - @endif - @endforeach -
-
- -@if (! $hideFooter) - @if ($document->footer) -
+ @if (! $hideItems) +
-
- - {!! nl2br($document->footer) !!} - +
+ + + + @stack('name_th_start') + @if (! $hideItems || (! $hideName && ! $hideDescription)) + + @endif + @stack('name_th_end') + + @stack('quantity_th_start') + @if (! $hideQuantity) + + @endif + @stack('quantity_th_end') + + @stack('price_th_start') + @if (! $hidePrice) + + @endif + @stack('price_th_end') + + @if (! $hideDiscount) + @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) + @stack('discount_td_start') + + @stack('discount_td_end') + @endif + @endif + + @stack('total_th_start') + @if (! $hideAmount) + + @endif + @stack('total_th_end') + + + + + @if ($document->items->count()) + @foreach($document->items as $item) + + @endforeach + @else + + + + @endif + +
+ {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + + {{ trans($textQuantity) }} + + {{ trans($textPrice) }} + + {{ trans('invoices.discount') }} + + {{ trans($textAmount) }} +
+ {{ trans('documents.empty_items') }} +
@endif -@endif + +
+
+
+ @stack('notes_input_start') + @if ($hideNote) + @if ($document->notes) + + {{ trans_choice('general.notes', 2) }} + + + {!! nl2br($document->notes) !!} + @endif + @endif + @stack('notes_input_end') +
+
+ +
+ @foreach ($document->totals_sorted as $total) + @if ($total->code != 'total') + @stack($total->code . '_total_tr_start') +
+ + {{ trans($total->title) }}: + + + + @money($total->amount, $document->currency_code, true) + +
+ @stack($total->code . '_total_tr_end') + @else + @if ($document->paid) + @stack('paid_total_tr_start') +
+ + {{ trans('invoices.paid') }}: + + + + - @money($document->paid, $document->currency_code, true) + +
+ @stack('paid_total_tr_end') + @endif + + @stack('grand_total_tr_start') +
+ + {{ trans($total->name) }}: + + + + @money($document->amount_due, $document->currency_code, true) + +
+ @stack('grand_total_tr_end') + @endif + @endforeach +
+
+ + @if (! $hideFooter) + @if ($document->footer) +
+
+
+ + {!! nl2br($document->footer) !!} + +
+
+
+ @endif + @endif +
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index 2e565719a..67a42d9c5 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -1,346 +1,348 @@ -
-
-
-

- {{ $textDocumentTitle }} -

-
-
-
- -
-
-
- @stack('company_logo_start') - @if (! $hideCompanyLogo) - @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) - - @else - - @endif - @endif - @stack('company_logo_end') -
-
- -
-
- @stack('company_details_start') - @if ($textDocumentSubheading) -

- {{ $textDocumentSubheading }} -

- @endif - - @if (! $hideCompanyDetails) - @if (! $hideCompanyName) -

{{ setting('company.name') }}

- @endif - - @if (! $hideCompanyAddress) -

- {!! nl2br(setting('company.address')) !!} - {!! $document->company->location !!} -

- @endif - - @if (! $hideCompanyTaxNumber) - - @if (setting('company.tax_number')) -

- {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} -

- @endif - - @endif - - @if (! $hideCompanyPhone) - @if (setting('company.phone')) -

- {{ setting('company.phone') }} -

- @endif - @endif - - @if (! $hideCompanyEmail) -

{{ setting('company.email') }}

- @endif - @endif - @stack('company_details_end') -
-
-
- -
-
-
- @if (! $hideContactInfo) -

{{ trans($textContactInfo) }}

- @endif - - @stack('name_input_start') - @if (! $hideContactName) -

{{ $document->contact_name }}

- @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (! $hideContactAddress) -

- {!! nl2br($document->contact_address) !!} -
- {!! $document->contact_location !!} -

- @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (! $hideContactTaxNumber) - @if ($document->contact_tax_number) -

- - {{ trans('general.tax_number') }}: - - {{ $document->contact_tax_number }} -

- @endif - @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (! $hideContactPhone) - @if ($document->contact_phone) -

- {{ $document->contact_phone }} -

- @endif - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (! $hideContactEmail) -

- {{ $document->contact_email }} -

- @endif - @stack('email_input_end') -
-
- -
-
- @stack('document_number_input_start') - @if (! $hideDocumentNumber) -

- - {{ trans($textDocumentNumber) }}: - - - - {{ $document->document_number }} - -

- @endif - @stack('document_number_input_end') - - @stack('order_number_input_start') - @if (! $hideOrderNumber) - @if ($document->order_number) -

- - {{ trans($textOrderNumber) }}: - - - - {{ $document->order_number }} - -

- @endif - @endif - @stack('order_number_input_end') - - @stack('issued_at_input_start') - @if (! $hideIssuedAt) -

- - {{ trans($textIssuedAt) }}: - - - - @date($document->issued_at) - -

- @endif - @stack('issued_at_input_end') - - @stack('due_at_input_start') - @if (! $hideDueAt) -

- - {{ trans($textDueAt) }}: - - - - @date($document->due_at) - -

- @endif - @stack('due_at_input_end') -
-
-
- -@if (! $hideItems) +
-
- - - - @stack('name_th_start') - @if (! $hideItems || (! $hideName && ! $hideDescription)) - - @endif - @stack('name_th_end') - - @stack('quantity_th_start') - @if (! $hideQuantity) - - @endif - @stack('quantity_th_end') - - @stack('price_th_start') - @if (! $hidePrice) - - @endif - @stack('price_th_end') - - @if (! $hideDiscount) - @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) - @stack('discount_td_start') - - @stack('discount_td_end') - @endif - @endif - - @stack('total_th_start') - @if (! $hideAmount) - - @endif - @stack('total_th_end') - - - - - @if ($document->items->count()) - @foreach($document->items as $item) - - @endforeach - @else - - - - @endif - -
- {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} - - {{ trans($textQuantity) }} - - {{ trans($textPrice) }} - - {{ trans('invoices.discount') }} - - {{ trans($textAmount) }} -
- {{ trans('documents.empty_items') }} -
+
+

+ {{ $textDocumentTitle }} +

-@endif -
-
-
- @stack('notes_input_start') - @if ($document->notes) -

- {{ trans_choice('general.notes', 2) }} -

- - {!! nl2br($document->notes) !!} +
+
+
+ @stack('company_logo_start') + @if (! $hideCompanyLogo) + @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) + + @else + + @endif @endif - @stack('notes_input_end') + @stack('company_logo_end') +
+
+ +
+
+ @stack('company_details_start') + @if ($textDocumentSubheading) +

+ {{ $textDocumentSubheading }} +

+ @endif + + @if (! $hideCompanyDetails) + @if (! $hideCompanyName) +

{{ setting('company.name') }}

+ @endif + + @if (! $hideCompanyAddress) +

+ {!! nl2br(setting('company.address')) !!} + {!! $document->company->location !!} +

+ @endif + + @if (! $hideCompanyTaxNumber) + + @if (setting('company.tax_number')) +

+ {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} +

+ @endif + + @endif + + @if (! $hideCompanyPhone) + @if (setting('company.phone')) +

+ {{ setting('company.phone') }} +

+ @endif + @endif + + @if (! $hideCompanyEmail) +

{{ setting('company.email') }}

+ @endif + @endif + @stack('company_details_end') +
-
- @foreach ($document->totals_sorted as $total) - @if ($total->code != 'total') - @stack($total->code . '_total_tr_start') -
- - {{ trans($total->title) }}: - - - - @money($total->amount, $document->currency_code, true) - -
- @stack($total->code . '_total_tr_end') - @else - @if ($document->paid) - @stack('paid_total_tr_start') -
- - {{ trans('invoices.paid') }}: - - - - - @money($document->paid, $document->currency_code, true) - -
- @stack('paid_total_tr_end') +
+
+
+ @if (! $hideContactInfo) +

{{ trans($textContactInfo) }}

@endif - @stack('grand_total_tr_start') -
- - {{ trans($total->name) }}: - + @stack('name_input_start') + @if (! $hideContactName) +

{{ $document->contact_name }}

+ @endif + @stack('name_input_end') - - @money($document->amount_due, $document->currency_code, true) - -
- @stack('grand_total_tr_end') - @endif - @endforeach + @stack('address_input_start') + @if (! $hideContactAddress) +

+ {!! nl2br($document->contact_address) !!} +
+ {!! $document->contact_location !!} +

+ @endif + @stack('address_input_end') + + @stack('tax_number_input_start') + @if (! $hideContactTaxNumber) + @if ($document->contact_tax_number) +

+ + {{ trans('general.tax_number') }}: + + {{ $document->contact_tax_number }} +

+ @endif + @endif + @stack('tax_number_input_end') + + @stack('phone_input_start') + @if (! $hideContactPhone) + @if ($document->contact_phone) +

+ {{ $document->contact_phone }} +

+ @endif + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (! $hideContactEmail) +

+ {{ $document->contact_email }} +

+ @endif + @stack('email_input_end') +
+
+ +
+
+ @stack('document_number_input_start') + @if (! $hideDocumentNumber) +

+ + {{ trans($textDocumentNumber) }}: + + + + {{ $document->document_number }} + +

+ @endif + @stack('document_number_input_end') + + @stack('order_number_input_start') + @if (! $hideOrderNumber) + @if ($document->order_number) +

+ + {{ trans($textOrderNumber) }}: + + + + {{ $document->order_number }} + +

+ @endif + @endif + @stack('order_number_input_end') + + @stack('issued_at_input_start') + @if (! $hideIssuedAt) +

+ + {{ trans($textIssuedAt) }}: + + + + @date($document->issued_at) + +

+ @endif + @stack('issued_at_input_end') + + @stack('due_at_input_start') + @if (! $hideDueAt) +

+ + {{ trans($textDueAt) }}: + + + + @date($document->due_at) + +

+ @endif + @stack('due_at_input_end') +
+
-
-@if (! $hideFooter) - @if ($document->footer) -
-
-
- - {!! nl2br($document->footer) !!} - + @if (! $hideItems) +
+
+
+ + + + @stack('name_th_start') + @if (! $hideItems || (! $hideName && ! $hideDescription)) + + @endif + @stack('name_th_end') + + @stack('quantity_th_start') + @if (! $hideQuantity) + + @endif + @stack('quantity_th_end') + + @stack('price_th_start') + @if (! $hidePrice) + + @endif + @stack('price_th_end') + + @if (! $hideDiscount) + @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) + @stack('discount_td_start') + + @stack('discount_td_end') + @endif + @endif + + @stack('total_th_start') + @if (! $hideAmount) + + @endif + @stack('total_th_end') + + + + + @if ($document->items->count()) + @foreach($document->items as $item) + + @endforeach + @else + + + + @endif + +
+ {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + + {{ trans($textQuantity) }} + + {{ trans($textPrice) }} + + {{ trans('invoices.discount') }} + + {{ trans($textAmount) }} +
+ {{ trans('documents.empty_items') }} +
@endif -@endif + +
+
+
+ @stack('notes_input_start') + @if ($document->notes) +

+ {{ trans_choice('general.notes', 2) }} +

+ + {!! nl2br($document->notes) !!} + @endif + @stack('notes_input_end') +
+
+ +
+ @foreach ($document->totals_sorted as $total) + @if ($total->code != 'total') + @stack($total->code . '_total_tr_start') +
+ + {{ trans($total->title) }}: + + + + @money($total->amount, $document->currency_code, true) + +
+ @stack($total->code . '_total_tr_end') + @else + @if ($document->paid) + @stack('paid_total_tr_start') +
+ + {{ trans('invoices.paid') }}: + + + + - @money($document->paid, $document->currency_code, true) + +
+ @stack('paid_total_tr_end') + @endif + + @stack('grand_total_tr_start') +
+ + {{ trans($total->name) }}: + + + + @money($document->amount_due, $document->currency_code, true) + +
+ @stack('grand_total_tr_end') + @endif + @endforeach +
+
+ + @if (! $hideFooter) + @if ($document->footer) +
+
+
+ + {!! nl2br($document->footer) !!} + +
+
+
+ @endif + @endif +
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php index 8fc0191cf..9a59c9420 100644 --- a/resources/views/components/documents/template/modern.blade.php +++ b/resources/views/components/documents/template/modern.blade.php @@ -1,357 +1,359 @@ -
-
-
-

- {{ $textDocumentTitle }} -

-
-
-
- -
-
-
- @stack('company_logo_start') - @if (! $hideCompanyLogo) - @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) - {{ $document->contact_name }} - @else - {{ setting('company.name') }} - @endif - @endif - @stack('company_logo_end') -
-
- -
-
- @stack('company_details_start') - @if ($textDocumentSubheading) -

- {{ $textDocumentSubheading }} -

- @endif - - @if (! $hideCompanyName) -

- {{ setting('company.name') }} -

- @endif - - @if (! $hideCompanyDetails) - @if (! $hideCompanyAddress) -

- {!! nl2br(setting('company.address')) !!} - {!! $document->company->location !!} -

- @endif - - @if (! $hideCompanyTaxNumber) -

- @if (setting('company.tax_number')) - - {{ trans('general.tax_number') }}: - - - {{ setting('company.tax_number') }} - @endif -

- @endif - - @if (!$hideCompanyPhone) -

- @if (setting('company.phone')) - {{ setting('company.phone') }} - @endif -

- @endif - - @if (!$hideCompanyEmail) -

- {{ setting('company.email') }} -

- @endif - @endif - @stack('company_details_end') -
-
-
- -
-
-
- @if (! $hideContactInfo) -

- {{ trans($textContactInfo) }} -

- @endif - - @stack('name_input_start') - @if (! $hideContactName) -

- {{ $document->contact_name }} -

- @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (! $hideContactAddress) -

- {!! nl2br($document->contact_address) !!} -
- {!! $document->contact_location !!} -

- @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (! $hideContactTaxNumber) - @if ($document->contact_tax_number) -

- - {{ trans('general.tax_number') }}: - - - {{ $document->contact_tax_number }} -

- @endif - @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (! $hideContactPhone) - @if ($document->contact_phone) -

- {{ $document->contact_phone }} -

- @endif - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (! $hideContactEmail) -

- {{ $document->contact_email }} -

- @endif - @stack('email_input_end') -
-
- -
-
- @stack('order_number_input_start') - @if (! $hideOrderNumber) - @if ($document->order_number) -

- - {{ trans($textOrderNumber) }}: - - - - {{ $document->order_number }} - -

- @endif - @endif - @stack('order_number_input_end') - - @stack('invoice_number_input_start') - @if (! $hideDocumentNumber) -

- - {{ trans($textDocumentNumber) }}: - - - - {{ $document->document_number }} - -

- @endif - @stack('invoice_number_input_end') - - @stack('issued_at_input_start') - @if (! $hideIssuedAt) -

- - {{ trans($textIssuedAt) }}: - - - - @date($document->issued_at) - -

- @endif - @stack('issued_at_input_end') - - @stack('due_at_input_start') - @if (! $hideDueAt) -

- - {{ trans($textDueAt) }}: - - - - @date($document->due_at) - -

- @endif - @stack('due_at_input_end') -
-
-
- -@if (! $hideItems) +
-
- - - - @stack('name_th_start') - @if (! $hideItems || (! $hideName && ! $hideDescription)) - - @endif - @stack('name_th_end') - - @stack('quantity_th_start') - @if (! $hideQuantity) - - @endif - @stack('quantity_th_end') - - @stack('price_th_start') - @if (! $hidePrice) - - @endif - @stack('price_th_end') - - @if (! $hideDiscount) - @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) - @stack('discount_td_start') - - @stack('discount_td_end') - @endif - @endif - - @stack('total_th_start') - @if (! $hideAmount) - - @endif - @stack('total_th_end') - - - - - @if ($document->items->count()) - @foreach($document->items as $item) - - @endforeach - @else - - - - @endif - -
- {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} - - {{ trans($textQuantity) }} - - {{ trans($textPrice) }} - - {{ trans('invoices.discount') }} - - {{ trans($textAmount) }} -
- {{ trans('documents.empty_items') }} -
+
+

+ {{ $textDocumentTitle }} +

-@endif -
-
-
- @stack('notes_input_start') - @if ($document->notes) -

- {{ trans_choice('general.notes', 2) }} -

- - {!! nl2br($document->notes) !!} +
+
+
+ @stack('company_logo_start') + @if (! $hideCompanyLogo) + @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) + {{ $document->contact_name }} + @else + {{ setting('company.name') }} + @endif @endif - @stack('notes_input_end') + @stack('company_logo_end') +
+
+ +
+
+ @stack('company_details_start') + @if ($textDocumentSubheading) +

+ {{ $textDocumentSubheading }} +

+ @endif + + @if (! $hideCompanyName) +

+ {{ setting('company.name') }} +

+ @endif + + @if (! $hideCompanyDetails) + @if (! $hideCompanyAddress) +

+ {!! nl2br(setting('company.address')) !!} + {!! $document->company->location !!} +

+ @endif + + @if (! $hideCompanyTaxNumber) +

+ @if (setting('company.tax_number')) + + {{ trans('general.tax_number') }}: + + + {{ setting('company.tax_number') }} + @endif +

+ @endif + + @if (!$hideCompanyPhone) +

+ @if (setting('company.phone')) + {{ setting('company.phone') }} + @endif +

+ @endif + + @if (!$hideCompanyEmail) +

+ {{ setting('company.email') }} +

+ @endif + @endif + @stack('company_details_end') +
-
- @foreach ($document->totals_sorted as $total) - @if ($total->code != 'total') - @stack($total->code . '_total_tr_start') -
- - {{ trans($total->title) }}: - - - - @money($total->amount, $document->currency_code, true) - -
- @stack($total->code . '_total_tr_end') - @else - @if ($document->paid) - @stack('paid_total_tr_start') -
- - {{ trans('invoices.paid') }}: - - - - - @money($document->paid, $document->currency_code, true) - -
- @stack('paid_total_tr_end') +
+
+
+ @if (! $hideContactInfo) +

+ {{ trans($textContactInfo) }} +

@endif - @stack('grand_total_tr_start') -
- - {{ trans($total->name) }}: - + @stack('name_input_start') + @if (! $hideContactName) +

+ {{ $document->contact_name }} +

+ @endif + @stack('name_input_end') - - @money($document->amount_due, $document->currency_code, true) - -
- @stack('grand_total_tr_end') - @endif - @endforeach + @stack('address_input_start') + @if (! $hideContactAddress) +

+ {!! nl2br($document->contact_address) !!} +
+ {!! $document->contact_location !!} +

+ @endif + @stack('address_input_end') + + @stack('tax_number_input_start') + @if (! $hideContactTaxNumber) + @if ($document->contact_tax_number) +

+ + {{ trans('general.tax_number') }}: + + + {{ $document->contact_tax_number }} +

+ @endif + @endif + @stack('tax_number_input_end') + + @stack('phone_input_start') + @if (! $hideContactPhone) + @if ($document->contact_phone) +

+ {{ $document->contact_phone }} +

+ @endif + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (! $hideContactEmail) +

+ {{ $document->contact_email }} +

+ @endif + @stack('email_input_end') +
+
+ +
+
+ @stack('order_number_input_start') + @if (! $hideOrderNumber) + @if ($document->order_number) +

+ + {{ trans($textOrderNumber) }}: + + + + {{ $document->order_number }} + +

+ @endif + @endif + @stack('order_number_input_end') + + @stack('invoice_number_input_start') + @if (! $hideDocumentNumber) +

+ + {{ trans($textDocumentNumber) }}: + + + + {{ $document->document_number }} + +

+ @endif + @stack('invoice_number_input_end') + + @stack('issued_at_input_start') + @if (! $hideIssuedAt) +

+ + {{ trans($textIssuedAt) }}: + + + + @date($document->issued_at) + +

+ @endif + @stack('issued_at_input_end') + + @stack('due_at_input_start') + @if (! $hideDueAt) +

+ + {{ trans($textDueAt) }}: + + + + @date($document->due_at) + +

+ @endif + @stack('due_at_input_end') +
+
-
-@if (! $hideFooter) - @if ($document->footer) -
-
-
- - {!! nl2br($document->footer) !!} - + @if (! $hideItems) +
+
+
+ + + + @stack('name_th_start') + @if (! $hideItems || (! $hideName && ! $hideDescription)) + + @endif + @stack('name_th_end') + + @stack('quantity_th_start') + @if (! $hideQuantity) + + @endif + @stack('quantity_th_end') + + @stack('price_th_start') + @if (! $hidePrice) + + @endif + @stack('price_th_end') + + @if (! $hideDiscount) + @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) + @stack('discount_td_start') + + @stack('discount_td_end') + @endif + @endif + + @stack('total_th_start') + @if (! $hideAmount) + + @endif + @stack('total_th_end') + + + + + @if ($document->items->count()) + @foreach($document->items as $item) + + @endforeach + @else + + + + @endif + +
+ {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + + {{ trans($textQuantity) }} + + {{ trans($textPrice) }} + + {{ trans('invoices.discount') }} + + {{ trans($textAmount) }} +
+ {{ trans('documents.empty_items') }} +
@endif -@endif + +
+
+
+ @stack('notes_input_start') + @if ($document->notes) +

+ {{ trans_choice('general.notes', 2) }} +

+ + {!! nl2br($document->notes) !!} + @endif + @stack('notes_input_end') +
+
+ +
+ @foreach ($document->totals_sorted as $total) + @if ($total->code != 'total') + @stack($total->code . '_total_tr_start') +
+ + {{ trans($total->title) }}: + + + + @money($total->amount, $document->currency_code, true) + +
+ @stack($total->code . '_total_tr_end') + @else + @if ($document->paid) + @stack('paid_total_tr_start') +
+ + {{ trans('invoices.paid') }}: + + + + - @money($document->paid, $document->currency_code, true) + +
+ @stack('paid_total_tr_end') + @endif + + @stack('grand_total_tr_start') +
+ + {{ trans($total->name) }}: + + + + @money($document->amount_due, $document->currency_code, true) + +
+ @stack('grand_total_tr_end') + @endif + @endforeach +
+
+ + @if (! $hideFooter) + @if ($document->footer) +
+
+
+ + {!! nl2br($document->footer) !!} + +
+
+
+ @endif + @endif +
\ No newline at end of file diff --git a/resources/views/components/transactions/show/template.blade.php b/resources/views/components/transactions/show/template.blade.php index 16852ce20..d37f1813d 100644 --- a/resources/views/components/transactions/show/template.blade.php +++ b/resources/views/components/transactions/show/template.blade.php @@ -1,4 +1,4 @@ -
+
@if ($transactionTemplate) @switch($transactionTemplate) @case('classic') diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index 02f33a471..69b302056 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -1,362 +1,364 @@ -@stack('company_start') -@if (!$hideCompany) - - - @if (!$hideCompanyLogo) - - @endif - - @if (!$hideCompanyDetails) - - @endif - -
- @stack('company_logo_start') - @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) - {{ $transaction->contact_name }} - @else - {{ setting('company.name') }} - @endif - @stack('company_logo_end') - - @stack('company_details_start') - @if (!$hideCompanyName) -

- {{ setting('company.name') }} -

- @endif - - @if (!$hideCompanyAddress) -

{!! (setting('company.address')) !!}

- @endif - - @if (!$hideCompanyTaxNumber) - @if (setting('company.tax_number')) -

- {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} -

+
+ @stack('company_start') + @if (!$hideCompany) + + + @if (!$hideCompanyLogo) + @endif - @if (!$hideCompanyPhone) - @if (setting('company.phone')) -

- {{ setting('company.phone') }} -

+ @if (!$hideCompanyDetails) + @endif + +
+ @stack('company_logo_start') + @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) + {{ $transaction->contact_name }} + @else + {{ setting('company.name') }} @endif + @stack('company_logo_end') + + @stack('company_details_start') + @if (!$hideCompanyName) +

+ {{ setting('company.name') }} +

@endif + + @if (!$hideCompanyAddress) +

{!! (setting('company.address')) !!}

+ @endif + + @if (!$hideCompanyTaxNumber) + @if (setting('company.tax_number')) +

+ {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} +

+ @endif + @endif + + @if (!$hideCompanyPhone) + @if (setting('company.phone')) +

+ {{ setting('company.phone') }} +

+ @endif + @endif + + @if (!$hideCompanyEmail) +

{{ setting('company.email') }}

+ @endif + @stack('company_details_end') +
+ @endif + @stack('company_end') - @if (!$hideCompanyEmail) -

{{ setting('company.email') }}

- @endif - @stack('company_details_end') -
-@endif -@stack('company_end') + @if (!$hideContentTitle) + + + + +
+

+ {{ trans($textContentTitle) }} +

+
+ @endif -@if (!$hideContentTitle) + @stack('number_input_start') + @if (!$hideNumber) + + + + + + @endif + @stack('number_input_end') + + @stack('paid_at_input_start') + @if (!$hidePaidAt) + + + + + + @endif + @stack('paid_at_input_end') + + @stack('account_id_input_start') + @if (!$hideAccount) + + + + + + @endif + @stack('account_id_input_end') + + @stack('category_id_input_start') + @if (!$hideCategory) + + + + + + @endif + @stack('category_id_input_end') + + @stack('payment_method_input_start') + @if (!$hidePaymentMethods) + + + + + + @endif + @stack('payment_method_input_end') + + @stack('reference_input_start') + @if (!$hideReference) + + + + + + @endif + @stack('reference_input_end') + + @stack('description_input_start') + @if (!$hideDescription) + + + + + + @endif + @stack('description_input_end') +
+ {{ trans_choice($textNumber, 1) }}: + + {{ $transaction->number }} +
+ {{ trans($textPaidAt) }}: + + @date($transaction->paid_at) +
+ {{ trans_choice($textAccount, 1) }}: + + {{ $transaction->account->name }} +
+ {{ trans_choice($textCategory, 1) }}: + + {{ $transaction->category->name }} +
+ {{ trans_choice($textPaymentMethods, 1) }}: + + {{ !empty($payment_methods[$transaction->payment_method]) ? $payment_methods[$transaction->payment_method] : trans('general.na') }} +
+ {{ trans($textReference) }}: + + {{ $transaction->reference }} +
+ {{ trans($textDescription) }}: + +

+ {!! nl2br($transaction->description) !!} +

+
+ +

- {{ trans($textContentTitle) }} + {{ trans($textPaidBy) }}

-@endif - - @stack('number_input_start') - @if (!$hideNumber) - - +
- {{ trans_choice($textNumber, 1) }}: -
+ @if (!$hideContact) - - - @endif - @stack('number_input_end') - - @stack('paid_at_input_start') - @if (!$hidePaidAt) - - - - - - @endif - @stack('paid_at_input_end') - - @stack('account_id_input_start') - @if (!$hideAccount) - - - - - - @endif - @stack('account_id_input_end') - - @stack('category_id_input_start') - @if (!$hideCategory) - - - - - - @endif - @stack('category_id_input_end') - - @stack('payment_method_input_start') - @if (!$hidePaymentMethods) - - - - - - @endif - @stack('payment_method_input_end') - - @stack('reference_input_start') - @if (!$hideReference) - - - - - - @endif - @stack('reference_input_end') - - @stack('description_input_start') - @if (!$hideDescription) - - - - - - @endif - @stack('description_input_end') -
- {{ $transaction->number }} -
- {{ trans($textPaidAt) }}: - - @date($transaction->paid_at) -
- {{ trans_choice($textAccount, 1) }}: - - {{ $transaction->account->name }} -
- {{ trans_choice($textCategory, 1) }}: - - {{ $transaction->category->name }} -
- {{ trans_choice($textPaymentMethods, 1) }}: - - {{ !empty($payment_methods[$transaction->payment_method]) ? $payment_methods[$transaction->payment_method] : trans('general.na') }} -
- {{ trans($textReference) }}: - - {{ $transaction->reference }} -
- {{ trans($textDescription) }}: - -

- {!! nl2br($transaction->description) !!} -

-
- - - - - -
-

- {{ trans($textPaidBy) }} -

-
- - - @if (!$hideContact) - - @if (! $hideContactInfo) - - - - @endif - - @stack('name_input_start') - @if (!$hideContactName) - - - - - @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (!$hideContactAddress) - - - - - @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (!$hideContactTaxNumber) - - - - - @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (!$hideContactPhone) - - - - - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (!$hideContactEmail) - - - - - @endif - @stack('email_input_end') - @endif - - - -
- {{ trans($textContactInfo) }}
-
- {{ trans('general.name') }} - - {{ $transaction->contact->name }} -
- {{ trans('general.address') }} - - {!! nl2br($transaction->contact->address) !!} -
- {{ trans('general.tax_number') }} - - @if ($transaction->contact->tax_number) - {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} - @endif -
- {{ trans('general.phone') }} - - @if ($transaction->contact->phone) - {{ $transaction->contact->phone }} - @endif -
- {{ trans('general.email') }} - - {{ $transaction->contact->email }} -
- -@if (!$hideRelated) - @if ($transaction->document) - - - - -
-

{{ trans($textRelatedTransansaction) }}

-
- - - - - - - - @if (!$hideRelatedDocumentDate) - - @endif - - - - - - - - + @if (! $hideContactInfo) - + + @endif - @if (!$hideRelatedDocumentDate) - + - @endif + + + @endif + @stack('name_input_end') - + + + + @endif + @stack('address_input_end') - @if (!$hideRelatedAmount) - @money($transaction->amount, $transaction->currency_code, true) + @stack('tax_number_input_start') + @if (!$hideContactTaxNumber) + + + - -
- @if (!$hideRelatedDocumentNumber) - {{ trans_choice($textRelatedDocumentNumber, 1) }}
- @endif - - @if (!$hideRelatedContact) - {{ trans_choice($textRelatedContact, 1) }} - @endif - 		- {{ trans($textRelatedDocumentDate) }} - - @if (!$hideRelatedDocumentAmount) - {{ trans($textRelatedDocumentAmount) }}
- @endif - - @if (!$hideRelatedAmount) - {{ trans($textRelatedAmount) }} - @endif -
- @if (!$hideRelatedDocumentNumber) - - {{ $transaction->document->document_number }} -
- @endif - - @if (!$hideRelatedContact) - {{ $transaction->document->contact_name }} - @endif + 		+ {{ trans($textContactInfo) }}
- @date($transaction->document->due_at) + @stack('name_input_start') + @if (!$hideContactName) +
+ {{ trans('general.name') }} + {{ $transaction->contact->name }} +
- @if (!$hideRelatedDocumentAmount) - @money($transaction->document->amount, $transaction->document->currency_code, true)
- @endif + @stack('address_input_start') + @if (!$hideContactAddress) +
+ {{ trans('general.address') }} + + {!! nl2br($transaction->contact->address) !!} +
+ {{ trans('general.tax_number') }} + + @if ($transaction->contact->tax_number) + {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} @endif
- @endif -@endif + @endif + @stack('tax_number_input_end') -@if (!$hideAmount) - + @stack('phone_input_start') + @if (!$hideContactPhone) + + + + + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (!$hideContactEmail) + + + + + @endif + @stack('email_input_end') + @endif - +
+ {{ trans('general.phone') }} + + @if ($transaction->contact->phone) + {{ $transaction->contact->phone }} + @endif +
+ {{ trans('general.email') }} + + {{ $transaction->contact->email }} +
- - - - - -
- {{ trans($textAmount) }}: - - @money($transaction->amount, $transaction->currency_code, true) -
-
-@endif + + @if (!$hideRelated) + @if ($transaction->document) + + + + +
+

{{ trans($textRelatedTransansaction) }}

+
+ + + + + + + + @if (!$hideRelatedDocumentDate) + + @endif + + + + + + + + + + + + @if (!$hideRelatedDocumentDate) + + @endif + + + + +
+ @if (!$hideRelatedDocumentNumber) + {{ trans_choice($textRelatedDocumentNumber, 1) }}
+ @endif + + @if (!$hideRelatedContact) + {{ trans_choice($textRelatedContact, 1) }} + @endif + 		+ {{ trans($textRelatedDocumentDate) }} + + @if (!$hideRelatedDocumentAmount) + {{ trans($textRelatedDocumentAmount) }}
+ @endif + + @if (!$hideRelatedAmount) + {{ trans($textRelatedAmount) }} + @endif +
+ @if (!$hideRelatedDocumentNumber) + + {{ $transaction->document->document_number }} +
+ @endif + + @if (!$hideRelatedContact) + {{ $transaction->document->contact_name }} + @endif + 		+ @date($transaction->document->due_at) + + @if (!$hideRelatedDocumentAmount) + @money($transaction->document->amount, $transaction->document->currency_code, true)
+ @endif + + @if (!$hideRelatedAmount) + @money($transaction->amount, $transaction->currency_code, true) + @endif +
+ @endif + @endif + + @if (!$hideAmount) + + + + +
+ + + + + +
+ {{ trans($textAmount) }}: + + @money($transaction->amount, $transaction->currency_code, true) +
+
+ @endif +
diff --git a/resources/views/components/transfers/show/content.blade.php b/resources/views/components/transfers/show/content.blade.php index 8f87aa0f8..da157817f 100644 --- a/resources/views/components/transfers/show/content.blade.php +++ b/resources/views/components/transfers/show/content.blade.php @@ -6,7 +6,7 @@
-
+
diff --git a/resources/views/components/transfers/template/default.blade.php b/resources/views/components/transfers/template/default.blade.php index 75a1ee2b2..66344ad30 100644 --- a/resources/views/components/transfers/template/default.blade.php +++ b/resources/views/components/transfers/template/default.blade.php @@ -1,217 +1,219 @@ - - +
+
+ + + + + +
+

+ {{ trans('transfers.from_account') }} +

+ + + + + + + +
+ {{ trans('accounts.account_name') }}: + + {{ $transfer->expense_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->expense_transaction->account->number }} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->expense_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->expense_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->expense_transaction->account->bank_address }} +
+
+ + + + + + + +
+

+ {{ trans('transfers.to_account') }} +

+ + + + + + + +
+ {{ trans('accounts.account_name') }}: + + {{ $transfer->income_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->income_transaction->account->number }} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->income_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->income_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->income_transaction->account->bank_address }} +
+
+ + - + +
-

- {{ trans('transfers.from_account') }} +

+

+ {{ trans_choice('transfers.details', 2) }}

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ trans('general.date') }}: + + +
+ {{ trans_choice('general.payment_methods', 1) }}: + + @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) + {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} + @else + + @endif +
+ {{ trans('general.reference') }}: + + {{ $transfer->expense_transaction->reference }} +
+ {{ trans('general.description') }} + + {{ $transfer->expense_transaction->description }} +
+ + + + - -
- - - -
- {{ trans('accounts.account_name') }}: + + {{ trans('general.amount') }}: - {{ $transfer->expense_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->expense_transaction->account->number }} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->expense_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->expense_transaction->account->bank_phone }} -
- - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->expense_transaction->account->bank_address }} + +
- - - - - - - -
-

- {{ trans('transfers.to_account') }} -

- - - - - - - -
- {{ trans('accounts.account_name') }}: - - {{ $transfer->income_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->income_transaction->account->number }} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->income_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->income_transaction->account->bank_phone }} -
- - - - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->income_transaction->account->bank_address }} -
-
- - - - - -
-

- {{ trans_choice('transfers.details', 2) }} -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ trans('general.date') }}: - - -
- {{ trans_choice('general.payment_methods', 1) }}: - - @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) - {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} - @else - - @endif -
- {{ trans('general.reference') }}: - - {{ $transfer->expense_transaction->reference }} -
- {{ trans('general.description') }} - - {{ $transfer->expense_transaction->description }} -
- - - - - -
- - - - - - -
- {{ trans('general.amount') }}: - - -
-
+ +
diff --git a/resources/views/components/transfers/template/second.blade.php b/resources/views/components/transfers/template/second.blade.php index 1d04d7aa2..d58fdf04c 100644 --- a/resources/views/components/transfers/template/second.blade.php +++ b/resources/views/components/transfers/template/second.blade.php @@ -1,217 +1,219 @@ - - - - -
-

- {{ trans_choice('transfers.details', 2) }} -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ trans('general.date') }}: - - -
- {{ trans_choice('general.payment_methods', 1) }}: - - @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) - {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} - @else - - @endif -
- {{ trans('general.reference') }}: - - {{ $transfer->expense_transaction->reference }} -
- {{ trans('general.description') }} - - {{ $transfer->expense_transaction->description }} -
- - - +
+
- + +
-

- {{ trans('transfers.from_account') }} +

+

+ {{ trans_choice('transfers.details', 2) }}

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ trans('general.date') }}: + + +
+ {{ trans_choice('general.payment_methods', 1) }}: + + @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) + {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} + @else + + @endif +
+ {{ trans('general.reference') }}: + + {{ $transfer->expense_transaction->reference }} +
+ {{ trans('general.description') }} + + {{ $transfer->expense_transaction->description }} +
+ + + + + + + +
+

+ {{ trans('transfers.from_account') }} +

+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->expense_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->expense_transaction->account->number}} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->expense_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->expense_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->expense_transaction->account->bank_address }} +
+
+ + + + + + + +
+

+ {{ trans('transfers.to_account') }} +

+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->income_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->income_transaction->account->number }} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->income_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->income_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->income_transaction->account->bank_address }} +
+
+ + + + - -
- - - -
- {{ trans('accounts.number') }}: + + {{ trans('general.amount') }}: - {{ $transfer->expense_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->expense_transaction->account->number}} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->expense_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->expense_transaction->account->bank_phone }} -
- - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->expense_transaction->account->bank_address }} + +
- - - - - - - -
-

- {{ trans('transfers.to_account') }} -

- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->income_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->income_transaction->account->number }} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->income_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->income_transaction->account->bank_phone }} -
- - - - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->income_transaction->account->bank_address }} -
-
- - - - - -
- - - - - - -
- {{ trans('general.amount') }}: - - -
-
+ +
diff --git a/resources/views/components/transfers/template/third.blade.php b/resources/views/components/transfers/template/third.blade.php index dd86193e2..3a17af2be 100644 --- a/resources/views/components/transfers/template/third.blade.php +++ b/resources/views/components/transfers/template/third.blade.php @@ -1,227 +1,229 @@ - - +
+
+ + + + + + + +
+ + + + + + +
+

+ {{ trans('transfers.from_account') }} +

+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->expense_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->expense_transaction->account->number}} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->expense_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->expense_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->expense_transaction->account->bank_address }} +
+
+ 		+ + + + + + +
+

+ {{ trans('transfers.to_account') }} +

+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->income_transaction->account->name }} +
+ + + + + + + +
+ {{ trans('accounts.number') }}: + + {{ $transfer->income_transaction->account->number }} +
+ + + + + + + +
+ {{ trans('accounts.bank_name') }}: + + {{ $transfer->income_transaction->account->bank_name }} +
+ + + + + + + +
+ {{ trans('general.phone') }}: + + {{ $transfer->income_transaction->account->bank_phone }} +
+ + + + + + + +
+ {{ trans('general.address') }}: + + {{ $transfer->income_transaction->account->bank_address }} +
+
+
+ + - - - -
- - - - + +
-

- {{ trans('transfers.from_account') }} -

+ 		+

+ {{ trans_choice('transfers.details', 2) }} +

+
- - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->expense_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->expense_transaction->account->number}} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->expense_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->expense_transaction->account->bank_phone }} -
- - - - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->expense_transaction->account->bank_address }} -
-
+ + + - + + + + + + + + + + + + + + + + + + + +
+ {{ trans('general.date') }}: + + +
+ {{ trans_choice('general.payment_methods', 1) }}: + + @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) + {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} + @else + + @endif +
+ {{ trans('general.reference') }}: + + {{ $transfer->expense_transaction->reference }} +
+ {{ trans('general.description') }} + + {{ $transfer->expense_transaction->description }} +
+ + + + - - + +
- - - + -
-

- {{ trans('transfers.to_account') }} -

+
+ {{ trans('general.amount') }}: +
- - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->income_transaction->account->name }} -
- - - - - - - -
- {{ trans('accounts.number') }}: - - {{ $transfer->income_transaction->account->number }} -
- - - - - - - -
- {{ trans('accounts.bank_name') }}: - - {{ $transfer->income_transaction->account->bank_name }} -
- - - - - - - -
- {{ trans('general.phone') }}: - - {{ $transfer->income_transaction->account->bank_phone }} -
- - - - - - - -
- {{ trans('general.address') }}: - - {{ $transfer->income_transaction->account->bank_address }} -
-
+ +
- - - - - - - -
-

- {{ trans_choice('transfers.details', 2) }} -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ trans('general.date') }}: - - -
- {{ trans_choice('general.payment_methods', 1) }}: - - @if (! empty($payment_methods[$transfer->expense_transaction->payment_method])) - {!! $payment_methods[$transfer->expense_transaction->payment_method] !!} - @else - - @endif -
- {{ trans('general.reference') }}: - - {{ $transfer->expense_transaction->reference }} -
- {{ trans('general.description') }} - - {{ $transfer->expense_transaction->description }} -
- - - - - -
- - - - - - -
- {{ trans('general.amount') }}: - - -
-
+ +
From b76e079ab92c9312f3572c9cf680c67ca23465f3 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 14 Jun 2022 11:32:45 +0300 Subject: [PATCH 06/34] auto height for textarea --- public/akaunting-js/generalAction.js | 15 ++++++++++++++- .../components/documents/form/note.blade.php | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index deb36a43b..5a35ce460 100644 --- a/public/akaunting-js/generalAction.js +++ b/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] \ No newline at end of file +// 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 \ No newline at end of file diff --git a/resources/views/components/documents/form/note.blade.php b/resources/views/components/documents/form/note.blade.php index f52eb32ad..10ea8066e 100644 --- a/resources/views/components/documents/form/note.blade.php +++ b/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 />
From 2d134a6816a151e820260b064ef67918e2604561 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 14 Jun 2022 14:13:24 +0300 Subject: [PATCH 07/34] body overflow change only moda open --- public/css/app.css | 2 +- resources/assets/js/components/AkauntingModal.vue | 8 ++++---- resources/assets/js/components/AkauntingModalAddNew.vue | 8 ++++---- resources/assets/sass/app.css | 2 +- resources/views/components/layouts/admin.blade.php | 4 ++-- resources/views/components/layouts/auth.blade.php | 4 ++-- resources/views/components/layouts/error.blade.php | 4 ++-- resources/views/components/layouts/modules.blade.php | 4 ++-- resources/views/components/layouts/portal.blade.php | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index cb0ec6e5e..3974536fb 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1588,7 +1588,7 @@ input[type="date"]::-webkit-inner-spin-button, } .overflow-overlay { - overflow: overlay; + overflow: overlay !important; } .py-top { diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue index 3cbe01bb0..e544bb7d6 100644 --- a/resources/assets/js/components/AkauntingModal.vue +++ b/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-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-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-hidden', 'overflow-overlay', '-ml-4'); } else { - documentClasses.remove("overflow-hidden"); + documentClasses.remove('overflow-hidden', 'overflow-overlay', '-ml-4'); } } } diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index 6da73b8ef..b6cf6233a 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/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-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-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-hidden', 'overflow-overlay', '-ml-4'); } else { - documentClasses.remove("overflow-hidden"); + documentClasses.remove('overflow-hidden', 'overflow-overlay', '-ml-4'); } } } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 0b13f324f..43ecd27d4 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -185,7 +185,7 @@ } .overflow-overlay { - overflow: overlay; + overflow: overlay !important; } .py-top { diff --git a/resources/views/components/layouts/admin.blade.php b/resources/views/components/layouts/admin.blade.php index faf8b1786..313a77ea8 100644 --- a/resources/views/components/layouts/admin.blade.php +++ b/resources/views/components/layouts/admin.blade.php @@ -13,9 +13,9 @@ @mobile - + @elsemobile - + @endmobile @stack('body_start') diff --git a/resources/views/components/layouts/auth.blade.php b/resources/views/components/layouts/auth.blade.php index 49bd5c07c..6e1ae616f 100644 --- a/resources/views/components/layouts/auth.blade.php +++ b/resources/views/components/layouts/auth.blade.php @@ -7,9 +7,9 @@ @mobile - + @elsemobile - + @endmobile @stack('body_start') diff --git a/resources/views/components/layouts/error.blade.php b/resources/views/components/layouts/error.blade.php index 2f8798c50..d27c5fa4b 100644 --- a/resources/views/components/layouts/error.blade.php +++ b/resources/views/components/layouts/error.blade.php @@ -7,9 +7,9 @@ @mobile - + @elsemobile - + @endmobile @stack('body_start') diff --git a/resources/views/components/layouts/modules.blade.php b/resources/views/components/layouts/modules.blade.php index a1e513380..6aef81c94 100644 --- a/resources/views/components/layouts/modules.blade.php +++ b/resources/views/components/layouts/modules.blade.php @@ -7,9 +7,9 @@ @mobile - + @elsemobile - + @endmobile @stack('body_start') diff --git a/resources/views/components/layouts/portal.blade.php b/resources/views/components/layouts/portal.blade.php index a9e974b1d..7a229ce43 100644 --- a/resources/views/components/layouts/portal.blade.php +++ b/resources/views/components/layouts/portal.blade.php @@ -7,9 +7,9 @@ @mobile - + @elsemobile - + @endmobile @stack('body_start') From ac9c4bd11d7a5ac5489458e2c2f19b5ff4188f77 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 14 Jun 2022 14:17:08 +0300 Subject: [PATCH 08/34] overflow scenario edited --- public/css/app.css | 2 +- resources/assets/js/components/AkauntingModal.vue | 8 ++++---- resources/assets/js/components/AkauntingModalAddNew.vue | 8 ++++---- resources/assets/sass/app.css | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 3974536fb..87dba8e1d 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1588,7 +1588,7 @@ input[type="date"]::-webkit-inner-spin-button, } .overflow-overlay { - overflow: overlay !important; + overflow-x: overlay; } .py-top { diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue index e544bb7d6..5dc8d4c7c 100644 --- a/resources/assets/js/components/AkauntingModal.vue +++ b/resources/assets/js/components/AkauntingModal.vue @@ -125,7 +125,7 @@ export default { if (this.show) { let documentClasses = document.body.classList; - documentClasses.add('overflow-hidden', 'overflow-overlay', '-ml-4'); + 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', 'overflow-overlay', '-ml-4'); + 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', 'overflow-overlay', '-ml-4'); + documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4'); } else { - documentClasses.remove('overflow-hidden', 'overflow-overlay', '-ml-4'); + documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4'); } } } diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index b6cf6233a..28c42c205 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -154,7 +154,7 @@ export default { created: function () { let documentClasses = document.body.classList; - documentClasses.add('overflow-hidden', 'overflow-overlay', '-ml-4'); + 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', 'overflow-overlay', '-ml-4'); + 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', 'overflow-overlay', '-ml-4'); + documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4'); } else { - documentClasses.remove('overflow-hidden', 'overflow-overlay', '-ml-4'); + documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4'); } } } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 43ecd27d4..f7d3fffb0 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -185,7 +185,7 @@ } .overflow-overlay { - overflow: overlay !important; + overflow-x: overlay; } .py-top { From 7d1668955d9cb241a74f216d05e3d8d3f87f8c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 14 Jun 2022 15:03:25 +0300 Subject: [PATCH 09/34] fixed utm link --- .../components/layouts/modules/show/information.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/layouts/modules/show/information.blade.php b/resources/views/components/layouts/modules/show/information.blade.php index 2a0b65108..23655263c 100644 --- a/resources/views/components/layouts/modules/show/information.blade.php +++ b/resources/views/components/layouts/modules/show/information.blade.php @@ -6,6 +6,6 @@
- * {!! trans('modules.information_monthly') !!} + * {!! trans('modules.information_monthly') !!} -
\ No newline at end of file +
From febf73cc1c36adbbc3793ef4d99fdd5a9bf5cf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 14 Jun 2022 15:06:55 +0300 Subject: [PATCH 10/34] Transaction styling and suggestion description set dynamic.. --- .../View/Components/Transactions/Show.php | 6 +- .../views/components/empty-page.blade.php | 8 +- .../transactions/show/buttons.blade.php | 2 +- .../transactions/show/content.blade.php | 2 + .../transactions/template/default.blade.php | 426 +++++++++--------- 5 files changed, 237 insertions(+), 207 deletions(-) diff --git a/app/Abstracts/View/Components/Transactions/Show.php b/app/Abstracts/View/Components/Transactions/Show.php index b6569c2d9..b02f6b0d4 100644 --- a/app/Abstracts/View/Components/Transactions/Show.php +++ b/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) diff --git a/resources/views/components/empty-page.blade.php b/resources/views/components/empty-page.blade.php index e1ade856b..2f0949bf8 100644 --- a/resources/views/components/empty-page.blade.php +++ b/resources/views/components/empty-page.blade.php @@ -46,9 +46,13 @@
  • -

    {{ $suggestion->name }}

    +

    + {{ $suggestion->name }} +

    -
    Enter details and create your first expense easily
    +
    + {{ $suggestion->description ?? '' }} +
    chevron_right diff --git a/resources/views/components/transactions/show/buttons.blade.php b/resources/views/components/transactions/show/buttons.blade.php index fe2a13d6a..2b60820cc 100644 --- a/resources/views/components/transactions/show/buttons.blade.php +++ b/resources/views/components/transactions/show/buttons.blade.php @@ -2,7 +2,7 @@ @if (! $hideButtonAddNew) @can($permissionCreate) - + {{ trans($textButtonAddNew) }} @endcan diff --git a/resources/views/components/transactions/show/content.blade.php b/resources/views/components/transactions/show/content.blade.php index 64d885530..80617c27c 100644 --- a/resources/views/components/transactions/show/content.blade.php +++ b/resources/views/components/transactions/show/content.blade.php @@ -29,10 +29,12 @@ @stack('recurring_message_end') @stack('row_create_start') + @if (! $hideCreated) + @endif @stack('row_create_end') @stack('schedule_start') diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index 69b302056..6ae93650b 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -1,61 +1,61 @@
    @stack('company_start') - @if (!$hideCompany) - - - @if (!$hideCompanyLogo) - - @endif - - @if (!$hideCompanyDetails) - + @endif + +
    - @stack('company_logo_start') - @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) - {{ $transaction->contact_name }} - @else - {{ setting('company.name') }} - @endif - @stack('company_logo_end') - - @stack('company_details_start') - @if (!$hideCompanyName) -

    - {{ setting('company.name') }} -

    - @endif - - @if (!$hideCompanyAddress) -

    {!! (setting('company.address')) !!}

    - @endif - - @if (!$hideCompanyTaxNumber) - @if (setting('company.tax_number')) -

    - {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} -

    + @if (! $hideCompany) + + + @if (! $hideCompanyLogo) + @endif - @if (!$hideCompanyPhone) - @if (setting('company.phone')) -

    - {{ setting('company.phone') }} -

    + @if (! $hideCompanyDetails) + - @endif - -
    + @stack('company_logo_start') + @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) + {{ $transaction->contact_name }} + @else + {{ setting('company.name') }} @endif + @stack('company_logo_end') + + @stack('company_details_start') + @if (! $hideCompanyName) +

    + {{ setting('company.name') }} +

    @endif - @endif - @if (!$hideCompanyEmail) -

    {{ setting('company.email') }}

    + @if (! $hideCompanyAddress) +

    {!! (setting('company.address')) !!}

    @endif - @stack('company_details_end') -
    + + @if (! $hideCompanyTaxNumber) + @if (setting('company.tax_number')) +

    + {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} +

    + @endif + @endif + + @if (! $hideCompanyPhone) + @if (setting('company.phone')) +

    + {{ setting('company.phone') }} +

    + @endif + @endif + + @if (! $hideCompanyEmail) +

    {{ setting('company.email') }}

    + @endif + @stack('company_details_end') +
    @endif @stack('company_end') - @if (!$hideContentTitle) + @if (! $hideContentTitle)
    @@ -69,7 +69,7 @@ @stack('number_input_start') - @if (!$hideNumber) + @if (! $hideNumber)
    {{ trans_choice($textNumber, 1) }}: @@ -83,7 +83,7 @@ @stack('number_input_end') @stack('paid_at_input_start') - @if (!$hidePaidAt) + @if (! $hidePaidAt)
    {{ trans($textPaidAt) }}: @@ -97,7 +97,7 @@ @stack('paid_at_input_end') @stack('account_id_input_start') - @if (!$hideAccount) + @if (! $hideAccount)
    {{ trans_choice($textAccount, 1) }}: @@ -111,7 +111,7 @@ @stack('account_id_input_end') @stack('category_id_input_start') - @if (!$hideCategory) + @if (! $hideCategory)
    {{ trans_choice($textCategory, 1) }}: @@ -125,7 +125,7 @@ @stack('category_id_input_end') @stack('payment_method_input_start') - @if (!$hidePaymentMethods) + @if (! $hidePaymentMethods)
    {{ trans_choice($textPaymentMethods, 1) }}: @@ -139,7 +139,7 @@ @stack('payment_method_input_end') @stack('reference_input_start') - @if (!$hideReference) + @if (! $hideReference)
    {{ trans($textReference) }}: @@ -153,7 +153,7 @@ @stack('reference_input_end') @stack('description_input_start') - @if (!$hideDescription) + @if (! $hideDescription)
    {{ trans($textDescription) }}: @@ -180,170 +180,189 @@
    - @if (!$hideContact) + @if (! $hideContact) + @if (! $hideContactInfo) + + + + @endif - @if (! $hideContactInfo) - - - + @stack('name_input_start') + @if (! $hideContactName) + + + + + + @endif + @stack('name_input_end') + + @stack('address_input_start') + @if (! $hideContactAddress) + + + + + + @endif + @stack('address_input_end') + + @stack('tax_number_input_start') + @if (! $hideContactTaxNumber) + + + + + + @endif + @stack('tax_number_input_end') + + @stack('phone_input_start') + @if (! $hideContactPhone) + + + + + + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (! $hideContactEmail) + + + + + + @endif + @stack('email_input_end') @endif - @stack('name_input_start') - @if (!$hideContactName) - - - - - @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (!$hideContactAddress) - - - - - @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (!$hideContactTaxNumber) - - - - - @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (!$hideContactPhone) - - - - - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (!$hideContactEmail) - - - - - @endif - @stack('email_input_end') - @endif
    + {{ trans($textContactInfo) }}
    +
    - {{ trans($textContactInfo) }}
    -
    + {{ trans('general.name') }} + + {{ $transaction->contact->name }} +
    + {{ trans('general.address') }} + + {!! nl2br($transaction->contact->address) !!} +
    + {{ trans('general.tax_number') }} + + @if ($transaction->contact->tax_number) + {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} + @endif +
    + {{ trans('general.phone') }} + + @if ($transaction->contact->phone) + {{ $transaction->contact->phone }} + @endif +
    + {{ trans('general.email') }} + + {{ $transaction->contact->email }} +
    - {{ trans('general.name') }} - - {{ $transaction->contact->name }} -
    - {{ trans('general.address') }} - - {!! nl2br($transaction->contact->address) !!} -
    - {{ trans('general.tax_number') }} - - @if ($transaction->contact->tax_number) - {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} - @endif -
    - {{ trans('general.phone') }} - - @if ($transaction->contact->phone) - {{ $transaction->contact->phone }} - @endif -
    - {{ trans('general.email') }} - - {{ $transaction->contact->email }} -
    - @if (!$hideRelated) + @if (! $hideRelated) @if ($transaction->document) - - - - -
    -

    {{ trans($textRelatedTransansaction) }}

    -
    - - - - - - - - @if (!$hideRelatedDocumentDate) - - @endif - - - - - - - - +
    - @if (!$hideRelatedDocumentNumber) - {{ trans_choice($textRelatedDocumentNumber, 1) }}
    - @endif - - @if (!$hideRelatedContact) - {{ trans_choice($textRelatedContact, 1) }} - @endif -     		- {{ trans($textRelatedDocumentDate) }} - - @if (!$hideRelatedDocumentAmount) - {{ trans($textRelatedDocumentAmount) }}
    - @endif - - @if (!$hideRelatedAmount) - {{ trans($textRelatedAmount) }} - @endif -
    - - - @if (!$hideRelatedDocumentDate) - - @endif - - - -
    - @if (!$hideRelatedDocumentNumber) - - {{ $transaction->document->document_number }} -
    - @endif - - @if (!$hideRelatedContact) - {{ $transaction->document->contact_name }} - @endif -     		- @date($transaction->document->due_at) - - @if (!$hideRelatedDocumentAmount) - @money($transaction->document->amount, $transaction->document->currency_code, true)
    - @endif - - @if (!$hideRelatedAmount) - @money($transaction->amount, $transaction->currency_code, true) - @endif +     		+

    + {{ trans($textRelatedTransansaction) }} +

    +
    + + + + + + + @if (! $hideRelatedDocumentDate) + + @endif + + + + + + + + + + @if (! $hideRelatedDocumentDate) + + @endif + + + + +
    + @if (! $hideRelatedDocumentNumber) + + {{ trans_choice($textRelatedDocumentNumber, 1) }} + +
    + @endif + + @if (! $hideRelatedContact) + + {{ trans_choice($textRelatedContact, 1) }} + + @endif +     		+ {{ trans($textRelatedDocumentDate) }} + + @if (! $hideRelatedDocumentAmount) + + {{ trans($textRelatedDocumentAmount) }} + +
    + @endif + + @if (! $hideRelatedAmount) + + {{ trans($textRelatedAmount) }} + + @endif +
    + @if (! $hideRelatedDocumentNumber) + + {{ $transaction->document->document_number }} + +
    + @endif + + @if (! $hideRelatedContact) + + {{ $transaction->document->contact_name }} + + @endif +     		+ @date($transaction->document->due_at) + + @if (! $hideRelatedDocumentAmount) + @money($transaction->document->amount, $transaction->document->currency_code, true)
    + @endif + + @if (! $hideRelatedAmount) + + @money($transaction->amount, $transaction->currency_code, true) + + @endif +
    @endif @endif - @if (!$hideAmount) + @if (! $hideAmount) + From 3bb00e835d0a2a3a9b762ecc549f606ba4c7557e Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 14 Jun 2022 16:23:03 +0300 Subject: [PATCH 11/34] preview dialogues edited --- .../views/banking/transactions/index.blade.php | 15 +++++++++------ .../components/contacts/show/content.blade.php | 4 ++-- .../documents/index/information.blade.php | 2 +- resources/views/portal/invoices/index.blade.php | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index e3574de72..ee7b5528d 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -162,15 +162,18 @@ {{ $item->contact->name }} - + @if ($item->document) - - {{ $item->document->document_number }} - + @else @endif diff --git a/resources/views/components/contacts/show/content.blade.php b/resources/views/components/contacts/show/content.blade.php index 765cfa22b..d0f9c7a01 100644 --- a/resources/views/components/contacts/show/content.blade.php +++ b/resources/views/components/contacts/show/content.blade.php @@ -215,12 +215,12 @@ {{ $item->contact_name }} - + {{ $item->document_number }} -
    +
    diff --git a/resources/views/components/documents/index/information.blade.php b/resources/views/components/documents/index/information.blade.php index a9b670b4c..a2e3fb1a6 100644 --- a/resources/views/components/documents/index/information.blade.php +++ b/resources/views/components/documents/index/information.blade.php @@ -1,4 +1,4 @@ -
    @@ -352,6 +371,7 @@ {{ trans($textAmount) }}: @money($transaction->amount, $transaction->currency_code, true) @if (! $hideItemDescription)