refactor estimate & invoice templates

This commit is contained in:
Mohit Panjwani
2021-04-12 14:40:59 +05:30
parent 63f7cdec82
commit cdaa1ff103
6 changed files with 176 additions and 152 deletions

View File

@ -400,11 +400,13 @@
</table>
<hr class="header-bottom-divider" />
</div>
<div class="wrapper">
<div class="company-details-container">
<div class="company-address-container company-address">
{!! $company_address !!}
</div>
<div class="estimate-details-container">
<table class="estimate-details-table">
<tr>
@ -423,35 +425,39 @@
</div>
<div style="clear: both;"></div>
</div>
<div class="customer-address-container">
@if($billing_address !== '</br>')
<div class="billing-address-container billing-address">
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
@endif
@if($billing_address !== '</br>')
<div class="shipping-address-container shipping-address">
@else
<div class="shipping-address-container--left shipping-address" style="padding-left:30px;">
@endif
<div @if($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" style="padding-left:30px;" @endif>
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to') </b> <br>
{!! $shipping_address !!}
@endif
</div>
<div style="clear: both;"></div>
</div>
<div style="position:relative">
@include('app.pdf.estimate.partials.table')
</div>
<div class="notes">
@if($notes)
<div class="notes-label">
@lang('pdf_notes')
</div>
{!! $notes !!}
@endif
</div>

View File

@ -94,7 +94,7 @@
/* -- Address -- */
.wrapper {
.content-wrapper {
display: block;
margin-top: 60px;
padding-bottom: 20px;
@ -400,13 +400,14 @@
@if($logo)
<td width="60%" class="header-section-left">
<img class="header-logo" src="{{ $logo }}" alt="Company Logo">
</td>
@else
<td width="60%" class="header-section-left" style="padding-top: 0px;">
@if($estimate->user->company)
<h1 class="header-logo"> {{$estimate->user->company->name}} </h1>
@endif
@endif
</td>
@endif
<td width="40%" class="header-section-right estimate-details-container">
<h1>@lang('pdf_estimate_label')</h1>
<h4>{{$estimate->estimate_number}}</h4>
@ -416,32 +417,32 @@
</table>
</div>
<hr>
<div class="wrapper">
<div class="content-wrapper">
<div class="address-container">
<div class="company-address-container company-address">
{!! $company_address !!}
</div>
@if($shipping_address !== '</br>')
<div class="shipping-address-container shipping-address">
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}
@endif
</div>
@endif
@if($shipping_address !== '</br>')
<div class="billing-address-container billing-address">
@else
<div class="billing-address-container billing-address" style="float:right; margin-right:30px;">
@endif
<div class="billing-address-container billing-address" @if($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.estimate.partials.table')
<div class="notes">
@if($notes)
<div class="notes-label">

View File

@ -354,7 +354,7 @@
<h1 class="header-logo"> {{$estimate->user->company->name}} </h1>
@endif
</td>
<td width="50%" class="company-address-container company-address text-right">
<td width="50%" class="text-right company-address-container company-address">
{!! $company_address !!}
</td>
</tr>
@ -368,20 +368,18 @@
<div class="customer-address-container">
<div class="billing-address-container billing-address">
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
@if($estimate->user->billingaddress)
<div class="shipping-address-container shipping-address">
@else
<div class="shipping-address-container--left shipping-address">
@endif
<div @if($estimate->user->billingaddress) class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}
@endif
</div>
<div style="clear: both;"></div>
</div>
@ -402,8 +400,9 @@
</table>
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.estimate.partials.table')
<div class="notes">
@if($notes)
<div class="notes-label">

View File

@ -116,6 +116,7 @@
padding-left: 40px;
width: 160px;
}
.shipping-address {
font-size: 12px;
line-height: 15px;
@ -349,11 +350,13 @@
</table>
<hr class="header-bottom-divider" style="border: 0.620315px solid #E8E8E8;" />
</div>
<div class="content-wrapper">
<div style="padding-top: 30px">
<div class="company-address-container company-address">
{!! $company_address !!}
</div>
<div class="invoice-details-container">
<table>
<tr>
@ -370,33 +373,40 @@
</tr>
</table>
</div>
<div style="clear: both;"></div>
</div>
<div class="billing-address-container billing-address">
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
<div class="shipping-address-container shipping-address" @if($billing_address !=='</br>' ) style="float:left;" @else style="display:block; float:left: padding-left: 0px;" @endif>
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}
@endif
</div>
<div style="position: relative; clear: both;">
@include('app.pdf.invoice.partials.table')
</div>
<div class="notes">
@if($notes)
<div class="notes-label">
@lang('pdf_notes')
</div>
{!! $notes !!}
@endif
</div>
</div>
</body>
</html>

View File

@ -382,13 +382,15 @@
@if($logo)
<td width="60%" class="header-section-left">
<img class="header-logo" src="{{ $logo }}" alt="Company Logo">
</td>
@else
<td width="60%" class="header-section-left" style="padding-top: 0px;">
@if($invoice->user->company)
<h1 class="header-logo"> {{$invoice->user->company->name}} </h1>
@endif
@endif
</td>
@endif
<td width="40%" class="header-section-right invoice-details-container">
<h1>@lang('pdf_invoice_label')</h1>
<h4>{{$invoice->invoice_number}}</h4>
@ -397,39 +399,43 @@
</tr>
</table>
</div>
<hr>
<div class="content-wrapper">
<div class="address-container">
<div class="company-address-container company-address">
{!! $company_address !!}
</div>
@if($shipping_address !== '</br>')
<div class="shipping-address-container shipping-address">
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}
@endif
</div>
@endif
@if($shipping_address !== '</br>')
<div class="billing-address-container billing-address">
@else
<div class="billing-address-container billing-address" style="float:right; margin-right:30px;">
@endif
<div class="billing-address-container billing-address" @if($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.invoice.partials.table')
{{-- @include('app.pdf.invoice.partials.notes') --}}
<div class="notes">
@if($notes)
<div class="notes-label">
@lang('pdf_notes')
</div>
{!! $notes !!}
@endif
</div>

View File

@ -34,17 +34,20 @@
width: 100%;
padding: 0px 30px;
}
.header-logo {
height: 50px;
text-transform: capitalize;
color: #817AE3;
padding-top: 0px;
}
.company-address-container {
width: 50%;
padding-left: 80px;
margin-bottom: 2px;
}
.company-address {
margin-top: 12px;
font-size: 12px;
@ -312,7 +315,7 @@
<h1 class="header-logo"> {{$invoice->user->company->name}} </h1>
@endif
</td>
<td width="50%" class="company-address-container company-address text-right">
<td width="50%" class="text-right company-address-container company-address">
{!! $company_address !!}
</td>
</tr>
@ -326,17 +329,14 @@
<div class="customer-address-container">
<div class="billing-address-container billing-address">
@if($billing_address)
@lang('pdf_bill_to')
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}
@endif
</div>
@if($billing_address !== '</br>')
<div class="shipping-address-container shipping-address">
@else
<div class="shipping-address-container--left shipping-address">
@endif
<div @if($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
@if($shipping_address)
@lang('pdf_ship_to')
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}
@endif
</div>
@ -361,17 +361,19 @@
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.invoice.partials.table')
<div class="notes">
@if($notes)
<div class="notes-label">
@lang('pdf_notes')
</div>
{!! $notes !!}
@endif
</div>
</div>
</div>
</body>
</html>