Fix issues on invoice template

This commit is contained in:
radhu587
2020-05-08 18:49:02 +05:30
parent a739a938fc
commit 325f90bba5
9 changed files with 235 additions and 204 deletions

View File

@ -137,7 +137,7 @@
.shipping-address-container--left {
float: left;
padding-left: 30px;
padding-left: 0px;
}
.shipping-address-label {

View File

@ -21,7 +21,6 @@
}
hr {
margin: 0 30px 0 30px;
color: rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
}
@ -75,10 +74,10 @@
.estimate-details-container h1 {
margin: 0;
font-weight: 500;
font-size: 24px;
line-height: 36px;
text-align: right;
font-family: "DejaVu Sans";
}
.estimate-details-container h4 {
@ -158,7 +157,7 @@
}
.billing-address-name {
max-width: 250px;
max-width: 160px;
font-size: 15px;
line-height: 22px;
padding: 0px;
@ -191,7 +190,7 @@
}
.shipping-address-name {
max-width: 250px;
max-width: 160px;
font-size: 15px;
line-height: 22px;
padding: 0px;
@ -231,6 +230,7 @@
.items-table hr {
height: 0.1px;
margin: 0 30px;
}
.item-table-heading {
@ -281,13 +281,16 @@
padding: 0 25px;
}
.item-cell-table-hr {
margin: 0 25px 0 30px;
}
.total-display-table {
box-sizing: border-box;
page-break-inside: avoid;
page-break-before: auto;
page-break-after: auto;
margin-left: 500px;
margin-top: 20px;
border: 1px solid #EAF1FB;
border-top: none;
}
@ -309,20 +312,6 @@
padding-bottom: 2px;
}
.total-border-left {
border: 1px solid #E8E8E8 !important;
border-right: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
.total-border-right {
border: 1px solid #E8E8E8 !important;
border-left: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
/* -- Notes -- */
.notes {
@ -437,7 +426,7 @@
@if($estimate->user->shippingaddress)
<div class="billing-address-container">
@else
<div class="billing-address-container" style="float:right;padding-right:0px;">
<div class="billing-address-container" style="float:right; padding-right:0px;">
@endif
@include('app.pdf.estimate.partials.billing-address')
</div>

View File

@ -24,7 +24,6 @@
hr {
color: rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
margin: 0 30px 0 30px;
}
/* -- Header -- */
@ -128,6 +127,7 @@
.shipping-address-container--left {
float: left;
padding-left: 0;
}
.shipping-address-label {
@ -213,6 +213,7 @@
.items-table hr {
height: 0.1px;
margin: 0 30px;
}
.item-table-heading {
@ -253,6 +254,10 @@
line-height: 12px;
}
.item-cell-table-hr {
margin: 0 30px 0 30px;
}
/* -- Total Display Table -- */
.total-display-container {
@ -266,8 +271,6 @@
page-break-after: auto;
margin-left: 500px;
margin-top: 20px;
border: 1px solid #EAF1FB;
border-top: none;
}
.total-table-attribute-label {

View File

@ -62,68 +62,68 @@
@endforeach
</table>
<hr class="items-table-hr">
<hr class="item-cell-table-hr">
<div class="total-display-container">
<table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($estimate->items) > 12) page-break @endif">
<tr>
<td class="border-0 total-table-attribute-label">Subtotal</td>
<td class="border-0 item-cell total-table-attribute-value ">{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!}</td>
</tr>
@if ($estimate->tax_per_item === 'YES')
@for ($i = 0; $i < count($labels); $i++)
<tr>
<td class="border-0 total-table-attribute-label">
{{$labels[$i]}}
</td>
<td class="border-0 item-cell total-table-attribute-value">
{!! format_money_pdf($taxes[$i], $estimate->user->currency) !!}
</td>
</tr>
@endfor
@else
@foreach ($estimate->taxes as $tax)
<tr>
<td class="border-0 total-table-attribute-label">
{{$tax->name.' ('.$tax->percent.'%)'}}
</td>
<td class="border-0 item-cell total-table-attribute-value" >
{!! format_money_pdf($tax->amount, $estimate->user->currency) !!}
</td>
</tr>
@endforeach
@endif
@if ($estimate->discount_per_item === 'NO')
<table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($estimate->items) > 12) page-break @endif">
<tr>
<td class="border-0 total-table-attribute-label pl-10">
@if($estimate->discount_type === 'fixed')
Discount
@endif
@if($estimate->discount_type === 'percentage')
Discount ({{$estimate->discount}}%)
@endif
</td>
<td class="border-0 item-cell total-table-attribute-value text-right">
@if($estimate->discount_type === 'fixed')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
@if($estimate->discount_type === 'percentage')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
<td class="border-0 total-table-attribute-label">Subtotal</td>
<td class="border-0 item-cell total-table-attribute-value ">{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!}</td>
</tr>
@if ($estimate->tax_per_item === 'YES')
@for ($i = 0; $i < count($labels); $i++)
<tr>
<td class="border-0 total-table-attribute-label">
{{$labels[$i]}}
</td>
<td class="border-0 item-cell total-table-attribute-value">
{!! format_money_pdf($taxes[$i], $estimate->user->currency) !!}
</td>
</tr>
@endfor
@else
@foreach ($estimate->taxes as $tax)
<tr>
<td class="border-0 total-table-attribute-label">
{{$tax->name.' ('.$tax->percent.'%)'}}
</td>
<td class="border-0 item-cell total-table-attribute-value" >
{!! format_money_pdf($tax->amount, $estimate->user->currency) !!}
</td>
</tr>
@endforeach
@endif
@if ($estimate->discount_per_item === 'NO')
<tr>
<td class="border-0 total-table-attribute-label pl-10">
@if($estimate->discount_type === 'fixed')
Discount
@endif
@if($estimate->discount_type === 'percentage')
Discount ({{$estimate->discount}}%)
@endif
</td>
<td class="border-0 item-cell total-table-attribute-value text-right">
@if($estimate->discount_type === 'fixed')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
@if($estimate->discount_type === 'percentage')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
</td>
</tr>
@endif
<tr>
<td class="py-3"></td>
<td class="py-3"></td>
</tr>
<tr>
<td class="border-0 total-border-left total-table-attribute-label">Total</td>
<td class="border-0 total-border-right item-cell py-8 total-table-attribute-value text-primary">
{!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
</td>
</tr>
@endif
<tr>
<td class="py-3"></td>
<td class="py-3"></td>
</tr>
<tr>
<td class="border-0 total-border-left total-table-attribute-label">Total</td>
<td class="border-0 total-border-right item-cell py-8 total-table-attribute-value text-primary">
{!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
</td>
</tr>
</table>
</table>
</div>