From 07c3d1fb3eaf9665cd2788cd1336c5f0d4b4b9b2 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Fri, 24 Jan 2020 21:20:08 +0300 Subject: [PATCH] item aligment updated for all shows --- public/css/custom.css | 5 +++++ .../views/portal/invoices/show.blade.php | 16 +++++++------- .../views/portal/invoices/signed.blade.php | 22 +++++++++---------- .../views/purchases/bills/show.blade.php | 14 ++++++------ resources/views/sales/invoices/show.blade.php | 12 +++++----- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 881212436..403c62325 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -677,6 +677,11 @@ table .align-items-center td span.badge { } /*--------Empty Page Image Finish--------*/ +.text-pre-nowrap +{ + white-space: pre-wrap !important; +} + /*----------------RESPONSIVE START LINE----------------*/ diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index 75c91a664..df0517638 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -165,15 +165,15 @@ @stack('name_th_start') - {{ trans_choice($text_override['items'], 2) }} + {{ trans_choice($text_override['items'], 2) }} @stack('name_th_end') @stack('quantity_th_start') - {{ trans($text_override['quantity']) }} + {{ trans($text_override['quantity']) }} @stack('quantity_th_end') @stack('price_th_start') - {{ trans($text_override['price']) }} + {{ trans($text_override['price']) }} @stack('price_th_end') @stack('total_th_start') @@ -183,20 +183,20 @@ @foreach($invoice->items as $invoice_item) @stack('name_td_start') - + {{ $invoice_item->name }} @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} +
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} @endif @stack('name_td_end') @stack('quantity_td_start') - {{ $invoice_item->quantity }} + {{ $invoice_item->quantity }} @stack('quantity_td_end') @stack('price_td_start') - @money($invoice_item->price, $invoice->currency_code, true) + @money($invoice_item->price, $invoice->currency_code, true) @stack('price_td_end') @stack('total_td_start') @@ -268,7 +268,7 @@ @stack('card_footer_start') -
+
@if($invoice->status != 'paid') diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index 1dd0d9963..252fe76fa 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -144,23 +144,23 @@
- - - - - + + + + + @foreach($invoice->items as $invoice_item) - - + - - - + + + @endforeach diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index 997e1309f..9044cb92d 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -322,15 +322,15 @@ @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') - + @stack('price_th_end') @stack('total_th_start') @@ -340,20 +340,20 @@ @foreach($bill->items as $bill_item) @stack('name_td_start') - @stack('name_td_end') @stack('quantity_td_start') - + @stack('quantity_td_end') @stack('price_td_start') - + @stack('price_td_end') @stack('total_td_start') diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index de56bd2c6..edb7bfbd5 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -345,11 +345,11 @@ @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') @@ -363,20 +363,20 @@ @foreach($invoice->items as $invoice_item) @stack('name_td_start') - @stack('name_td_end') @stack('quantity_td_start') - + @stack('quantity_td_end') @stack('price_td_start') - + @stack('price_td_end') @stack('total_td_start')
{{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
{{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
+
{{ $invoice_item->name }} @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} +
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} @endif 		{{ $invoice_item->quantity }}@money($invoice_item->price, $invoice->currency_code, true)@money($invoice_item->total, $invoice->currency_code, true){{ $invoice_item->quantity }}@money($invoice_item->price, $invoice->currency_code, true)@money($invoice_item->total, $invoice->currency_code, true)
{{ trans_choice('general.items', 1) }}{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.price') }}
+ {{ $bill_item->name }} @if (!empty($bill_item->item->description)) -
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} +
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} @endif 		{{ $bill_item->quantity }}{{ $bill_item->quantity }}@money($bill_item->price, $bill->currency_code, true)@money($bill_item->price, $bill->currency_code, true)
{{ trans_choice($text_override['items'], 2) }}{{ trans_choice($text_override['items'], 2) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['quantity']) }}
+ {{ $invoice_item->name }} @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} +
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} @endif 		{{ $invoice_item->quantity }}{{ $invoice_item->quantity }}@money($invoice_item->price, $invoice->currency_code, true)@money($invoice_item->price, $invoice->currency_code, true)