From f0852498ed759787da37ca3ef2b0930e29859190 Mon Sep 17 00:00:00 2001 From: IceToast Date: Wed, 22 Dec 2021 14:50:00 +0100 Subject: [PATCH] =?UTF-8?q?revert:=20=F0=9F=8E=A8=20removed=20random=20for?= =?UTF-8?q?matting=20lol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoices/templates/controlpanel.blade.php | 686 +++++++++--------- .../invoices/templates/default.blade.php | 686 +++++++++--------- 2 files changed, 662 insertions(+), 710 deletions(-) diff --git a/resources/views/vendor/invoices/templates/controlpanel.blade.php b/resources/views/vendor/invoices/templates/controlpanel.blade.php index 1842aac3..20ce8587 100644 --- a/resources/views/vendor/invoices/templates/controlpanel.blade.php +++ b/resources/views/vendor/invoices/templates/controlpanel.blade.php @@ -1,324 +1,301 @@ + + {{ $invoice->name }} + - - {{ $invoice->name }} - + + - .text-uppercase { - text-transform: uppercase !important; - } + + {{-- Header --}} + @if($invoice->logo) + logo + @endif - * { - font-family: "DejaVu Sans"; - } - - body, - h1, - h2, - h3, - h4, - h5, - h6, - table, - th, - tr, - td, - p, - div { - line-height: 1.1; - } - - .party-header { - font-size: 1.5rem; - font-weight: 400; - } - - .total-amount { - font-size: 12px; - font-weight: 700; - } - - .border-0 { - border: none !important; - } - - .cool-gray { - color: #6B7280; - } - - .cool-green { - color: #308d00; - } - - - - - - {{-- Header --}} - @if ($invoice->logo) - logo - @endif - - - - - - - + + + + + @endif + @if($invoice->taxable_amount) + + + + + + @endif + @if($invoice->tax_rate) + + + + + + @endif + @if($invoice->hasItemOrInvoiceTax()) + + + + + + @endif + @if($invoice->shipping_amount) + + + + + + @endif + + + + + + +
-

- {{ $invoice->name }} {{ $invoice->getSerialNumber() }} -

- 		- @if ($invoice->status) -

- {{ $invoice->status }} + + + + + + + + +
+

+ {{ $invoice->name }} {{$invoice->getSerialNumber()}}

+ 		+ @if($invoice->status) +

+ {{ $invoice->status }} +

+ @endif +

{{ __('Serial No.') }} {{ $invoice->getSerialNumber() }}

+

{{ __('Invoice date') }}: {{ $invoice->getDate() }}

+
+ + {{-- Seller - Buyer --}} + + + + + + + + + + + + + + + +
+ {{ __('Seller') }} + + {{ __('Buyer') }} +
+ @if($invoice->seller->name) +

+ {{ $invoice->seller->name }} +

+ @endif + + @if($invoice->seller->address) +

+ {{ __('Address') }}: {{ $invoice->seller->address }} +

+ @endif + + @if($invoice->seller->code) +

+ {{ __('Code') }}: {{ $invoice->seller->code }} +

+ @endif + + @if($invoice->seller->vat) +

+ {{ __('VAT Code') }}: {{ $invoice->seller->vat }} +

+ @endif + + @if($invoice->seller->phone) +

+ {{ __('Phone') }}: {{ $invoice->seller->phone }} +

+ @endif + + @foreach($invoice->seller->custom_fields as $key => $value) +

+ {{ ucfirst($key) }}: {{ $value }} +

+ @endforeach + 		+ @if($invoice->buyer->name) +

+ {{ $invoice->buyer->name }} +

+ @endif + + @if($invoice->buyer->adress) +

+ {{ __('Address') }}: {{ $invoice->buyer->address }} +

+ @endif + + @if($invoice->buyer->code) +

+ {{ __('Code') }}: {{ $invoice->buyer->code }} +

+ @endif + + @if($invoice->buyer->vat) +

+ {{ __('VAT Code') }}: {{ $invoice->buyer->vat }} +

+ @endif + + @if($invoice->buyer->phone) +

+ {{ __('Phone') }}: {{ $invoice->buyer->phone }} +

+ @endif + + @foreach($invoice->buyer->custom_fields as $key => $value) +

+ {{ ucfirst($key) }}: {{ $value }} +

+ @endforeach +
+ + {{-- Table --}} + + + + + @if($invoice->hasItemUnits) + @endif -

{{ __('Serial No.') }} {{ $invoice->getSerialNumber() }}

-

{{ __('Invoice date') }}: {{ $invoice->getDate() }}

- - - -
{{ __('Description') }}{{ __('Units') }}
- - {{-- Seller - Buyer --}} - - - - - - - - - - - + + @if($invoice->hasItemDiscount) + @endif - - @if ($invoice->seller->address) -

- {{ __('Address') }}: {{ $invoice->seller->address }} -

+ @if($invoice->hasItemTax) + @endif - - @if ($invoice->seller->code) -

- {{ __('Code') }}: {{ $invoice->seller->code }} -

- @endif - - @if ($invoice->seller->vat) -

- {{ __('VAT Code') }}: {{ $invoice->seller->vat }} -

- @endif - - @if ($invoice->seller->phone) -

- {{ __('Phone') }}: {{ $invoice->seller->phone }} -

- @endif - - @foreach ($invoice->seller->custom_fields as $key => $value) -

- {{ ucfirst($key) }}: {{ $value }} -

- @endforeach - - - - - -
- {{ __('Seller') }} - - {{ __('Buyer') }} -
- @if ($invoice->seller->name) -

- {{ $invoice->seller->name }} -

+ 		{{ __('Quantity') }}{{ __('Price') }}{{ __('Discount') }}{{ __('Tax') }} - @if ($invoice->buyer->name) -

- {{ $invoice->buyer->name }} -

- @endif - - @if ($invoice->buyer->adress) -

- {{ __('Address') }}: {{ $invoice->buyer->address }} -

- @endif - - @if ($invoice->buyer->code) -

- {{ __('Code') }}: {{ $invoice->buyer->code }} -

- @endif - - @if ($invoice->buyer->vat) -

- {{ __('VAT Code') }}: {{ $invoice->buyer->vat }} -

- @endif - - @if ($invoice->buyer->phone) -

- {{ __('Phone') }}: {{ $invoice->buyer->phone }} -

- @endif - - @foreach ($invoice->buyer->custom_fields as $key => $value) -

- {{ ucfirst($key) }}: {{ $value }} -

- @endforeach -
- - {{-- Table --}} - - - - - @if ($invoice->hasItemUnits) - - @endif - - - @if ($invoice->hasItemDiscount) - - @endif - @if ($invoice->hasItemTax) - - @endif - - - - - {{-- Items --}} - @foreach ($invoice->items as $item) + + + + + {{-- Items --}} + @foreach($invoice->items as $item) - @if ($invoice->hasItemUnits) + @if($invoice->hasItemUnits) @endif - @if ($invoice->hasItemDiscount) + @if($invoice->hasItemDiscount) @endif - @if ($invoice->hasItemTax) + @if($invoice->hasItemTax) @@ -328,87 +305,86 @@ {{ $invoice->formatCurrency($item->sub_total_price) }} - @endforeach - {{-- Summary --}} - @if ($invoice->hasItemOrInvoiceDiscount()) - - - - - - @endif - @if ($invoice->taxable_amount) - - - - - - @endif - @if ($invoice->tax_rate) - - - - - - @endif - @if ($invoice->hasItemOrInvoiceTax()) - - - - - - @endif - @if ($invoice->shipping_amount) - - - - - - @endif - - - - - - -
{{ __('Description') }}{{ __('Units') }}{{ __('Quantity') }}{{ __('Price') }}{{ __('Discount') }}{{ __('Tax') }}{{ __('Subtotal') }}
{{ __('Subtotal') }}
{{ $item->title }} - @if ($item->description) + @if($item->description)

{{ $item->description }}

@endif 		{{ $item->units }}{{ $item->quantity }} {{ $invoice->formatCurrency($item->price_per_unit) }} {{ $invoice->formatCurrency($item->discount) }} {{ $invoice->formatCurrency($item->tax) }}
{{ __('Total discount') }} - {{ $invoice->formatCurrency($invoice->total_discount) }} -
{{ __('Taxable amount') }} - {{ $invoice->formatCurrency($invoice->taxable_amount) }} -
{{ __('Tax rate') }} - {{ $invoice->tax_rate }}% -
{{ __('Total taxes') }} - {{ $invoice->formatCurrency($invoice->total_taxes) }} -
{{ __('Shipping') }} - {{ $invoice->formatCurrency($invoice->shipping_amount) }} -
{{ __('Total amount') }} - {{ $invoice->formatCurrency($invoice->total_amount) }} -
+ @endforeach + {{-- Summary --}} + @if($invoice->hasItemOrInvoiceDiscount()) +

{{ __('Total discount') }} + {{ $invoice->formatCurrency($invoice->total_discount) }} +
{{ __('Taxable amount') }} + {{ $invoice->formatCurrency($invoice->taxable_amount) }} +
{{ __('Tax rate') }} + {{ $invoice->tax_rate }}% +
{{ __('Total taxes') }} + {{ $invoice->formatCurrency($invoice->total_taxes) }} +
{{ __('Shipping') }} + {{ $invoice->formatCurrency($invoice->shipping_amount) }} +
{{ __('Total amount') }} + {{ $invoice->formatCurrency($invoice->total_amount) }} +
+ + @if($invoice->notes) +

+ {{ __('Notes') }}: {!! $invoice->notes !!} +

+ @endif - @if ($invoice->notes)

- {{ __('Notes') }}: {!! $invoice->notes !!} + {{ __('Amount in words') }}: {{ $invoice->getTotalAmountInWords() }} +

+

+ {{ __('Please pay until') }}: {{ $invoice->getPayUntilDate() }}

- @endif - -

- {{ __('Amount in words') }}: {{ $invoice->getTotalAmountInWords() }} -

-

- {{ __('Please pay until') }}: {{ $invoice->getPayUntilDate() }} -

- - - + + diff --git a/resources/views/vendor/invoices/templates/default.blade.php b/resources/views/vendor/invoices/templates/default.blade.php index b0b1caae..9c672bdd 100644 --- a/resources/views/vendor/invoices/templates/default.blade.php +++ b/resources/views/vendor/invoices/templates/default.blade.php @@ -1,324 +1,301 @@ + + {{ $invoice->name }} + - - {{ $invoice->name }} - + + - .text-uppercase { - text-transform: uppercase !important; - } + + {{-- Header --}} + @if($invoice->logo) + logo + @endif - * { - font-family: "DejaVu Sans"; - } - - body, - h1, - h2, - h3, - h4, - h5, - h6, - table, - th, - tr, - td, - p, - div { - line-height: 1.1; - } - - .party-header { - font-size: 1.5rem; - font-weight: 400; - } - - .total-amount { - font-size: 12px; - font-weight: 700; - } - - .border-0 { - border: none !important; - } - - .cool-gray { - color: #6B7280; - } - - .cool-green { - color: #308d00; - } - - - - - - {{-- Header --}} - @if ($invoice->logo) - logo - @endif - - - - - - - + + + + + @endif + @if($invoice->taxable_amount) + + + + + + @endif + @if($invoice->tax_rate) + + + + + + @endif + @if($invoice->hasItemOrInvoiceTax()) + + + + + + @endif + @if($invoice->shipping_amount) + + + + + + @endif + + + + + + +
-

- {{ $invoice->name }} {{ $invoice->getSerialNumber() }} -

- 		- @if ($invoice->status) -

- {{ $invoice->status }} + + + + + + + + +
+

+ {{ $invoice->name }} {{$invoice->getSerialNumber()}}

+ 		+ @if($invoice->status) +

+ {{ $invoice->status }} +

+ @endif +

{{ __('invoices::invoice.serial') }} {{ $invoice->getSerialNumber() }}

+

{{ __('invoices::invoice.date') }}: {{ $invoice->getDate() }}

+
+ + {{-- Seller - Buyer --}} + + + + + + + + + + + + + + + +
+ {{ __('invoices::invoice.seller') }} + + {{ __('invoices::invoice.buyer') }} +
+ @if($invoice->seller->name) +

+ {{ $invoice->seller->name }} +

+ @endif + + @if($invoice->seller->address) +

+ {{ __('invoices::invoice.address') }}: {{ $invoice->seller->address }} +

+ @endif + + @if($invoice->seller->code) +

+ {{ __('invoices::invoice.code') }}: {{ $invoice->seller->code }} +

+ @endif + + @if($invoice->seller->vat) +

+ {{ __('invoices::invoice.vat') }}: {{ $invoice->seller->vat }} +

+ @endif + + @if($invoice->seller->phone) +

+ {{ __('invoices::invoice.phone') }}: {{ $invoice->seller->phone }} +

+ @endif + + @foreach($invoice->seller->custom_fields as $key => $value) +

+ {{ ucfirst($key) }}: {{ $value }} +

+ @endforeach + 		+ @if($invoice->buyer->name) +

+ {{ $invoice->buyer->name }} +

+ @endif + + @if($invoice->buyer->address) +

+ {{ __('invoices::invoice.address') }}: {{ $invoice->buyer->address }} +

+ @endif + + @if($invoice->buyer->code) +

+ {{ __('invoices::invoice.code') }}: {{ $invoice->buyer->code }} +

+ @endif + + @if($invoice->buyer->vat) +

+ {{ __('invoices::invoice.vat') }}: {{ $invoice->buyer->vat }} +

+ @endif + + @if($invoice->buyer->phone) +

+ {{ __('invoices::invoice.phone') }}: {{ $invoice->buyer->phone }} +

+ @endif + + @foreach($invoice->buyer->custom_fields as $key => $value) +

+ {{ ucfirst($key) }}: {{ $value }} +

+ @endforeach +
+ + {{-- Table --}} + + + + + @if($invoice->hasItemUnits) + @endif -

{{ __('invoices::invoice.serial') }} {{ $invoice->getSerialNumber() }}

-

{{ __('invoices::invoice.date') }}: {{ $invoice->getDate() }}

- - - -
{{ __('invoices::invoice.description') }}{{ __('invoices::invoice.units') }}
- - {{-- Seller - Buyer --}} - - - - - - - - - - - + + @if($invoice->hasItemDiscount) + @endif - - @if ($invoice->seller->address) -

- {{ __('invoices::invoice.address') }}: {{ $invoice->seller->address }} -

+ @if($invoice->hasItemTax) + @endif - - @if ($invoice->seller->code) -

- {{ __('invoices::invoice.code') }}: {{ $invoice->seller->code }} -

- @endif - - @if ($invoice->seller->vat) -

- {{ __('invoices::invoice.vat') }}: {{ $invoice->seller->vat }} -

- @endif - - @if ($invoice->seller->phone) -

- {{ __('invoices::invoice.phone') }}: {{ $invoice->seller->phone }} -

- @endif - - @foreach ($invoice->seller->custom_fields as $key => $value) -

- {{ ucfirst($key) }}: {{ $value }} -

- @endforeach - - - - - -
- {{ __('invoices::invoice.seller') }} - - {{ __('invoices::invoice.buyer') }} -
- @if ($invoice->seller->name) -

- {{ $invoice->seller->name }} -

+ 		{{ __('invoices::invoice.quantity') }}{{ __('invoices::invoice.price') }}{{ __('invoices::invoice.discount') }}{{ __('invoices::invoice.tax') }} - @if ($invoice->buyer->name) -

- {{ $invoice->buyer->name }} -

- @endif - - @if ($invoice->buyer->address) -

- {{ __('invoices::invoice.address') }}: {{ $invoice->buyer->address }} -

- @endif - - @if ($invoice->buyer->code) -

- {{ __('invoices::invoice.code') }}: {{ $invoice->buyer->code }} -

- @endif - - @if ($invoice->buyer->vat) -

- {{ __('invoices::invoice.vat') }}: {{ $invoice->buyer->vat }} -

- @endif - - @if ($invoice->buyer->phone) -

- {{ __('invoices::invoice.phone') }}: {{ $invoice->buyer->phone }} -

- @endif - - @foreach ($invoice->buyer->custom_fields as $key => $value) -

- {{ ucfirst($key) }}: {{ $value }} -

- @endforeach -
- - {{-- Table --}} - - - - - @if ($invoice->hasItemUnits) - - @endif - - - @if ($invoice->hasItemDiscount) - - @endif - @if ($invoice->hasItemTax) - - @endif - - - - - {{-- Items --}} - @foreach ($invoice->items as $item) + + + + + {{-- Items --}} + @foreach($invoice->items as $item) - @if ($invoice->hasItemUnits) + @if($invoice->hasItemUnits) @endif - @if ($invoice->hasItemDiscount) + @if($invoice->hasItemDiscount) @endif - @if ($invoice->hasItemTax) + @if($invoice->hasItemTax) @@ -328,87 +305,86 @@ {{ $invoice->formatCurrency($item->sub_total_price) }} - @endforeach - {{-- Summary --}} - @if ($invoice->hasItemOrInvoiceDiscount()) - - - - - - @endif - @if ($invoice->taxable_amount) - - - - - - @endif - @if ($invoice->tax_rate) - - - - - - @endif - @if ($invoice->hasItemOrInvoiceTax()) - - - - - - @endif - @if ($invoice->shipping_amount) - - - - - - @endif - - - - - - -
{{ __('invoices::invoice.description') }}{{ __('invoices::invoice.units') }}{{ __('invoices::invoice.quantity') }}{{ __('invoices::invoice.price') }}{{ __('invoices::invoice.discount') }}{{ __('invoices::invoice.tax') }}{{ __('invoices::invoice.sub_total') }}
{{ __('invoices::invoice.sub_total') }}
{{ $item->title }} - @if ($item->description) + @if($item->description)

{{ $item->description }}

@endif 		{{ $item->units }}{{ $item->quantity }} {{ $invoice->formatCurrency($item->price_per_unit) }} {{ $invoice->formatCurrency($item->discount) }} {{ $invoice->formatCurrency($item->tax) }}
{{ __('invoices::invoice.total_discount') }} - {{ $invoice->formatCurrency($invoice->total_discount) }} -
{{ __('invoices::invoice.taxable_amount') }} - {{ $invoice->formatCurrency($invoice->taxable_amount) }} -
{{ __('invoices::invoice.tax_rate') }} - {{ $invoice->tax_rate }}% -
{{ __('invoices::invoice.total_taxes') }} - {{ $invoice->formatCurrency($invoice->total_taxes) }} -
{{ __('invoices::invoice.shipping') }} - {{ $invoice->formatCurrency($invoice->shipping_amount) }} -
{{ __('invoices::invoice.total_amount') }} - {{ $invoice->formatCurrency($invoice->total_amount) }} -
+ @endforeach + {{-- Summary --}} + @if($invoice->hasItemOrInvoiceDiscount()) +

{{ __('invoices::invoice.total_discount') }} + {{ $invoice->formatCurrency($invoice->total_discount) }} +
{{ __('invoices::invoice.taxable_amount') }} + {{ $invoice->formatCurrency($invoice->taxable_amount) }} +
{{ __('invoices::invoice.tax_rate') }} + {{ $invoice->tax_rate }}% +
{{ __('invoices::invoice.total_taxes') }} + {{ $invoice->formatCurrency($invoice->total_taxes) }} +
{{ __('invoices::invoice.shipping') }} + {{ $invoice->formatCurrency($invoice->shipping_amount) }} +
{{ __('invoices::invoice.total_amount') }} + {{ $invoice->formatCurrency($invoice->total_amount) }} +
+ + @if($invoice->notes) +

+ {{ __('invoices::invoice.notes') }}: {!! $invoice->notes !!} +

+ @endif - @if ($invoice->notes)

- {{ __('invoices::invoice.notes') }}: {!! $invoice->notes !!} + {{ __('invoices::invoice.amount_in_words') }}: {{ $invoice->getTotalAmountInWords() }} +

+

+ {{ __('invoices::invoice.pay_until') }}: {{ $invoice->getPayUntilDate() }}

- @endif - -

- {{ __('invoices::invoice.amount_in_words') }}: {{ $invoice->getTotalAmountInWords() }} -

-

- {{ __('invoices::invoice.pay_until') }}: {{ $invoice->getPayUntilDate() }} -

- - - + +