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') }}: - - -
-
+ +