shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1186 from batuhawk/master

Browse Source 
Item aligment updated for all shows
This commit is contained in:
Batuhan Baş 2020-01-24 21:20:49 +03:00 committed by GitHub
commit 9fd944cb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/css/custom.css vendored
View File

@ -677,6 +677,11 @@ table .align-items-center td span.badge {
} }
/*--------Empty Page Image Finish--------*/ /*--------Empty Page Image Finish--------*/
.text-pre-nowrap
{
white-space: pre-wrap !important;
}
/*----------------RESPONSIVE START LINE----------------*/ /*----------------RESPONSIVE START LINE----------------*/

16
resources/views/portal/invoices/show.blade.php
View File

@ -165,15 +165,15 @@
<tbody> <tbody>
<tr class="row"> <tr class="row">
@stack('name_th_start') @stack('name_th_start')
<th class="col-xs-4 col-sm-3 pl-5">{{ trans_choice($text_override['items'], 2) }}</th> <th class="col-xs-4 col-sm-5 pl-5">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end') @stack('name_th_end')
@stack('quantity_th_start') @stack('quantity_th_start')
<th class="col-xs-4 col-sm-3 text-center">{{ trans($text_override['quantity']) }}</th> <th class="col-xs-4 col-sm-1 text-center">{{ trans($text_override['quantity']) }}</th>
@stack('quantity_th_end') @stack('quantity_th_end')
@stack('price_th_start') @stack('price_th_start')
<th class="col-sm-3 text-center pl-5">{{ trans($text_override['price']) }}</th> <th class="col-sm-3 text-right d-none d-sm-block">{{ trans($text_override['price']) }}</th>
@stack('price_th_end') @stack('price_th_end')
@stack('total_th_start') @stack('total_th_start')
@ -183,20 +183,20 @@
@foreach($invoice->items as $invoice_item) @foreach($invoice->items as $invoice_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5"> <td class="col-xs-4 col-sm-5 pl-5">
{{ $invoice_item->name }} {{ $invoice_item->name }}
@if (!empty($invoice_item->item->description)) @if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small> <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $invoice_item->quantity }}</td> <td class="col-xs-4 col-sm-1 text-center">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($invoice_item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
@ -268,7 +268,7 @@
</div> </div>
@stack('card_footer_start') @stack('card_footer_start')
<div class="card-footer pb-0"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
@if($invoice->status != 'paid') @if($invoice->status != 'paid')

22
resources/views/portal/invoices/signed.blade.php
View File

@ -144,23 +144,23 @@
<div class="col-md-12 table-responsive"> <div class="col-md-12 table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<tbody> <tbody>
<tr> <tr class="row">
<th class="pl-5">{{ trans_choice('general.items', 1) }}</th> <th class="col-xs-4 col-sm-5 pl-5">{{ trans_choice('general.items', 1) }}</th>
<th class="text-center">{{ trans('invoices.quantity') }}</th> <th class="col-xs-4 col-sm-1 text-center">{{ trans('invoices.quantity') }}</th>
<th class="text-center pl-7">{{ trans('invoices.price') }}</th> <th class="col-sm-3 text-right d-none d-sm-block">{{ trans('invoices.price') }}</th>
<th class="text-right pr-5">{{ trans('invoices.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
</tr> </tr>
@foreach($invoice->items as $invoice_item) @foreach($invoice->items as $invoice_item)
<tr> <tr class="row">
<td class="pl-5"> <td class="col-xs-4 col-sm-5 pl-5">
{{ $invoice_item->name }} {{ $invoice_item->name }}
@if (!empty($invoice_item->item->description)) @if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small> <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
@endif @endif
</td> </td>
<td class="text-center">{{ $invoice_item->quantity }}</td> <td class="col-xs-4 col-sm-1 text-center">{{ $invoice_item->quantity }}</td>
<td class="text-center pl-7">@money($invoice_item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
<td class="text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td> <td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

14
resources/views/purchases/bills/show.blade.php
View File

@ -322,15 +322,15 @@
<tbody> <tbody>
<tr class="row"> <tr class="row">
@stack('name_th_start') @stack('name_th_start')
<th class="col-xs-4 col-sm-3 pl-5">{{ trans_choice('general.items', 1) }}</th> <th class="col-xs-4 col-sm-5 pl-5">{{ trans_choice('general.items', 1) }}</th>
@stack('name_th_end') @stack('name_th_end')
@stack('quantity_th_start') @stack('quantity_th_start')
<th class="col-xs-4 col-sm-3 text-center">{{ trans('bills.quantity') }}</th> <th class="col-xs-4 col-sm-1 text-center">{{ trans('bills.quantity') }}</th>
@stack('quantity_th_end') @stack('quantity_th_end')
@stack('price_th_start') @stack('price_th_start')
<th class="col-sm-3 text-right d-none d-sm-block pl-5">{{ trans('bills.price') }}</th> <th class="col-sm-3 text-right d-none d-sm-block">{{ trans('bills.price') }}</th>
@stack('price_th_end') @stack('price_th_end')
@stack('total_th_start') @stack('total_th_start')
@ -340,20 +340,20 @@
@foreach($bill->items as $bill_item) @foreach($bill->items as $bill_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5 long-texts"> <td class="col-xs-4 col-sm-5 pl-5">
{{ $bill_item->name }} {{ $bill_item->name }}
@if (!empty($bill_item->item->description)) @if (!empty($bill_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small> <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $bill_item->quantity }}</td> <td class="col-xs-4 col-sm-1 text-center">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($bill_item->price, $bill->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')

12
resources/views/sales/invoices/show.blade.php
View File

@ -345,11 +345,11 @@
<tbody> <tbody>
<tr class="row"> <tr class="row">
@stack('name_th_start') @stack('name_th_start')
<th class="col-xs-4 col-sm-3 pl-5">{{ trans_choice($text_override['items'], 2) }}</th> <th class="col-xs-4 col-sm-5 pl-5">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end') @stack('name_th_end')
@stack('quantity_th_start') @stack('quantity_th_start')
<th class="col-xs-4 col-sm-3 text-center">{{ trans($text_override['quantity']) }}</th> <th class="col-xs-4 col-sm-1 text-center">{{ trans($text_override['quantity']) }}</th>
@stack('quantity_th_end') @stack('quantity_th_end')
@stack('price_th_start') @stack('price_th_start')
@ -363,20 +363,20 @@
@foreach($invoice->items as $invoice_item) @foreach($invoice->items as $invoice_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5 long-texts"> <td class="col-xs-4 col-sm-5 pl-5">
{{ $invoice_item->name }} {{ $invoice_item->name }}
@if (!empty($invoice_item->item->description)) @if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small> <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $invoice_item->quantity }}</td> <td class="col-xs-4 col-sm-1 text-center">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($invoice_item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')