From cdaa1ff1039ad89a847642fa002806bfa40804b7 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Mon, 12 Apr 2021 14:40:59 +0530
Subject: [PATCH] refactor estimate & invoice templates

---
 .../app/pdf/estimate/estimate1.blade.php      | 52 ++++++------
 .../app/pdf/estimate/estimate2.blade.php      | 51 ++++++------
 .../app/pdf/estimate/estimate3.blade.php      | 57 +++++++------
 .../views/app/pdf/invoice/invoice1.blade.php  | 16 +++-
 .../views/app/pdf/invoice/invoice2.blade.php  | 70 ++++++++--------
 .../views/app/pdf/invoice/invoice3.blade.php  | 82 ++++++++++---------
 6 files changed, 176 insertions(+), 152 deletions(-)

diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
index 0b13c335..0a66346d 100644
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -389,22 +389,24 @@
             <tr>
                 <td class="text-center">
                     @if($logo)
-                    <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
+                        <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
                     @else
-                    @if($estimate->user->company)
-                    <h2 class="header-logo"> {{$estimate->user->company->name}} </h2>
-                    @endif
+                        @if($estimate->user->company)
+                            <h2 class="header-logo"> {{$estimate->user->company->name}} </h2>
+                        @endif
                     @endif
                 </td>
             </tr>
         </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,39 +425,43 @@
             </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>
         </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>
+    </div>
 </body>
 
 </html>
diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php
index bb6a8ca2..5d881580 100644
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@@ -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">
-                    @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>
+                @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
+                    </td>
+                @endif
                 <td width="40%" class="header-section-right estimate-details-container">
                     <h1>@lang('pdf_estimate_label')</h1>
                     <h4>{{$estimate->estimate_number}}</h4>
@@ -416,41 +417,41 @@
         </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">
-                        @lang('pdf_notes')
-                    </div>
-                    {!! $notes !!}
-                @endif
-            </div>
         </div>
+
+        @include('app.pdf.estimate.partials.table')
+
+        <div class="notes">
+            @if($notes)
+                <div class="notes-label">
+                    @lang('pdf_notes')
+                </div>
+                {!! $notes !!}
+            @endif
+        </div>
+    </div>
 </body>
 
 </html>
diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php
index 3986151b..7efb93a2 100644
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@@ -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,42 +368,41 @@
             <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
-                        @if($shipping_address)
-                            @lang('pdf_ship_to')
-                            {!! $shipping_address !!}
-                        @endif
-                    </div>
-                    <div style="clear: both;"></div>
+
+                <div @if($estimate->user->billingaddress) class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
+                    @if($shipping_address)
+                        <b>@lang('pdf_ship_to')</b> <br>
+                        {!! $shipping_address !!}
+                    @endif
                 </div>
 
-                <div class="estimate-details-container">
-                    <table>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_estimate_number')</td>
-                            <td class="attribute-value"> &nbsp;{{$estimate->estimate_number}}</td>
-                        </tr>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_estimate_date') </td>
-                            <td class="attribute-value"> &nbsp;{{$estimate->formattedEstimateDate}}</td>
-                        </tr>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_estimate_expire_date')</td>
-                            <td class="attribute-value"> &nbsp;{{$estimate->formattedExpiryDate}}</td>
-                        </tr>
-                    </table>
-                </div>
                 <div style="clear: both;"></div>
             </div>
+
+            <div class="estimate-details-container">
+                <table>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_estimate_number')</td>
+                        <td class="attribute-value"> &nbsp;{{$estimate->estimate_number}}</td>
+                    </tr>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_estimate_date') </td>
+                        <td class="attribute-value"> &nbsp;{{$estimate->formattedEstimateDate}}</td>
+                    </tr>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_estimate_expire_date')</td>
+                        <td class="attribute-value"> &nbsp;{{$estimate->formattedExpiryDate}}</td>
+                    </tr>
+                </table>
+            </div>
+            <div style="clear: both;"></div>
+
             @include('app.pdf.estimate.partials.table')
+
             <div class="notes">
                 @if($notes)
                     <div class="notes-label">
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index b30a7a21..0cc849b7 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -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>
+        <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>
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index a99209c7..cf90f5a4 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -123,7 +123,7 @@
             /* margin-top: 18px; */
         }
 
-        .company-address{
+        .company-address {
             font-size: 10px;
             line-height: 15px;
             color: #595959;
@@ -156,7 +156,7 @@
             margin-bottom: 0px;
         }
 
-        .billing-address{
+        .billing-address {
             font-size: 10px;
             line-height: 15px;
             color: #595959;
@@ -380,15 +380,17 @@
         <table width="100%">
             <tr>
                 @if($logo)
-                <td width="60%" class="header-section-left">
-                    <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
-                    @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>
+                    <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
+                    </td>
+                @endif
+
                 <td width="40%" class="header-section-right invoice-details-container">
                     <h1>@lang('pdf_invoice_label')</h1>
                     <h4>{{$invoice->invoice_number}}</h4>
@@ -397,43 +399,47 @@
             </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
-                    @if($billing_address)
-                        @lang('pdf_bill_to')
-                        {!! $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 !!}
+
+
+            <div class="billing-address-container billing-address" @if($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
+                @if($billing_address)
+                    <b>@lang('pdf_bill_to')</b> <br>
+                    {!! $billing_address !!}
                 @endif
             </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>
 </body>
 
 </html>
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index 6f1b4deb..382dca5f 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -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;
@@ -70,12 +73,12 @@
 
         /* -- Shipping -- */
         .shipping-address-container {
-            float:right;
+            float: right;
             display: block;
         }
 
         .shipping-address-container--left {
-            float:left;
+            float: left;
             display: block;
             padding-left: 0;
         }
@@ -243,7 +246,7 @@
             padding-bottom: 10px;
         }
 
-         /* -- Helpers -- */
+        /* -- Helpers -- */
 
         .text-primary {
             color: #5851DB;
@@ -307,12 +310,12 @@
             <tr>
                 <td width="50%" class="header-section-left">
                     @if($logo)
-                        <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
+                    <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
                     @else
-                        <h1 class="header-logo"> {{$invoice->user->company->name}} </h1>
+                    <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,50 +329,49 @@
             <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>
-                    <div style="clear: both;"></div>
-                </div>
-
-                <div class="invoice-details-container">
-                    <table>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_invoice_number')</td>
-                            <td class="attribute-value"> &nbsp;{{$invoice->invoice_number}}</td>
-                        </tr>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_invoice_date')</td>
-                            <td class="attribute-value"> &nbsp;{{$invoice->formattedInvoiceDate}}</td>
-                        </tr>
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_invoice_due_date')</td>
-                            <td class="attribute-value"> &nbsp;{{$invoice->formattedDueDate}}</td>
-                        </tr>
-                    </table>
                 </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 class="invoice-details-container">
+                <table>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_invoice_number')</td>
+                        <td class="attribute-value"> &nbsp;{{$invoice->invoice_number}}</td>
+                    </tr>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_invoice_date')</td>
+                        <td class="attribute-value"> &nbsp;{{$invoice->formattedInvoiceDate}}</td>
+                    </tr>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_invoice_due_date')</td>
+                        <td class="attribute-value"> &nbsp;{{$invoice->formattedDueDate}}</td>
+                    </tr>
+                </table>
             </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>
 </body>