From ba54b85709aca1a5500e0993d53e9f3fb35e7ce6 Mon Sep 17 00:00:00 2001
From: Jay_Makwana <jaimakwana786@gmail.com>
Date: Thu, 14 Nov 2019 20:54:53 +0530
Subject: [PATCH] refactor template

---
 .../app/pdf/estimate/estimate1.blade.php      |  2 +-
 .../app/pdf/estimate/estimate2.blade.php      |  2 +-
 .../app/pdf/estimate/partials/notes.blade.php | 12 ++++++-----
 .../app/pdf/estimate/partials/table.blade.php | 20 +++++++++++++------
 .../views/app/pdf/invoice/invoice1.blade.php  | 10 ++++++----
 .../views/app/pdf/invoice/invoice2.blade.php  |  2 +-
 .../app/pdf/invoice/partials/notes.blade.php  | 12 ++++++-----
 .../app/pdf/invoice/partials/table.blade.php  | 18 ++++++++++++-----
 8 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
index c69b993e..716905dc 100644
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -263,7 +263,7 @@
         }
 
         tr.main-table-header th {
-            border-bottom: 1px solid #EAF1FB;
+            border-bottom: 0.620315px solid #E8E8E8;
             font-style: normal;
             font-weight: normal;
             font-size: 12px;
diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php
index 778e1916..e0098e38 100644
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@@ -264,7 +264,7 @@
         }
 
         tr.main-table-header th {
-            border-bottom: 1px solid #EAF1FB;
+            border-bottom: 0.620315px solid #E8E8E8;
             font-style: normal;
             font-weight: normal;
             font-size: 12px;
diff --git a/resources/views/app/pdf/estimate/partials/notes.blade.php b/resources/views/app/pdf/estimate/partials/notes.blade.php
index ccde1ae9..479ee279 100644
--- a/resources/views/app/pdf/estimate/partials/notes.blade.php
+++ b/resources/views/app/pdf/estimate/partials/notes.blade.php
@@ -1,6 +1,8 @@
-<div class="notes">
-    <div class="notes-label">
-        Notes
+@if ($estimate->notes != '' && $estimate->notes != null)
+    <div class="notes">
+        <div class="notes-label">
+            Notes
+        </div>
+        {{$estimate->notes}}
     </div>
-    {{$estimate->notes}}
-</div>
+@endif
diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php
index 304d1c38..40092a6d 100644
--- a/resources/views/app/pdf/estimate/partials/table.blade.php
+++ b/resources/views/app/pdf/estimate/partials/table.blade.php
@@ -1,27 +1,32 @@
 <table width="100%" class="table2" cellspacing="0" border="0">
     <tr class="main-table-header">
+        <th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">#</th>
         @if($estimate->discount_per_item === 'NO')
             <th width="80%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
         @else
             <th width="40%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
         @endif
         <th width="17%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">Quantity</th>
-        <th width="18%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 40px">Price</th>
+        <th width="18%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 40px">Price</th>
         @if($estimate->discount_per_item === 'YES')
-            <th width="10%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 10px">Discount</th>
+            <th width="10%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-left: 10px">Discount</th>
         @endif
         <th width="15%" class="ItemTableHeader" style="text-align: right; color: #55547A;">Amount</th>
     </tr>
+    @php
+        $index = 1
+    @endphp
     @foreach ($estimate->items as $item)
         <tr class="item-details">
+            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;">{{$index}}</td>
             <td class="inv-item items" style="text-align: left; color: #040405;padding-left: 0px">
                 <span>{{ $item->name }}</span><br>
                 <span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{{ $item->description }}</span>
             </td>
             <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px">{{$item->quantity}}</td>
-            <td class="inv-item items" style="text-align: left; color: #040405; padding-left: 40px">{{$item->price/100}}</td>
+            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 40px">{{$item->price/100}}</td>
             @if($estimate->discount_per_item === 'YES')
-                <td class="inv-item items" style="text-align: left; color: #040405; padding-left: 10px">
+                <td class="inv-item items" style="text-align: right; color: #040405; padding-left: 10px">
                     @if($item->discount_type === 'fixed')
                         {{$item->discount_val/100}}
                     @endif
@@ -30,12 +35,15 @@
                     @endif
                 </td>
             @endif
-            <td class="inv-item items" style="text-align: right; color: #040405">{{$item->total/100}}</td>
+            <td class="inv-item items" style="text-align: right; color: #040405;">{{$item->total/100}}</td>
         </tr>
+        @php
+            $index += 1
+        @endphp
     @endforeach
 </table>
 
-<table width="100%" style="margin-left:420px" cellspacing="0px" border="0" class="table3">
+<table width="100%" cellspacing="0px" style="margin-left:420px" border="0" class="table3 @if(count($estimate->items) > 12) page-break @endif">
     <tr>
         <td class="no-borde" style="color: #55547A; padding-left:10px;  font-size:12px;">Subtotal</td>
         <td class="no-border items"
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index eed49d6d..635a5c0e 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -11,6 +11,7 @@
         html {
             margin: 0px;
             padding: 0px;
+            margin-top: 50px;
         }
 
         table {
@@ -35,7 +36,7 @@
             width: 100%;
             height: 90px;
             left: 0px;
-            top: 0px;
+            top: -50px;
         }
 
         .header-logo {
@@ -71,7 +72,7 @@
 
         .wrapper {
            display: block;
-           padding-top: 60px;
+           padding-top: 16px;
            padding-bottom: 60px;
         }
 
@@ -251,6 +252,7 @@
             page-break-after: auto;
         }
 
+
         .table2 hr {
             height:0.1px;
         }
@@ -263,7 +265,7 @@
         }
 
         tr.main-table-header th {
-            border-bottom: 1px solid #EAF1FB;
+            border-bottom: 0.620315px solid #E8E8E8;
             font-style: normal;
             font-weight: normal;
             font-size: 12px;
@@ -380,8 +382,8 @@
                 </td>
             </tr>
         </table>
+        <hr class="header-line" style="border: 0.620315px solid #E8E8E8;"/>
     </div>
-    <hr class="header-line" />
     <div class="wrapper">
         <div class="address">
             <div class="company">
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index 342c4960..f7784c61 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -264,7 +264,7 @@
         }
 
         tr.main-table-header th {
-            border-bottom: 1px solid #EAF1FB;
+            border-bottom: 0.620315px solid #E8E8E8;
             font-style: normal;
             font-weight: normal;
             font-size: 12px;
diff --git a/resources/views/app/pdf/invoice/partials/notes.blade.php b/resources/views/app/pdf/invoice/partials/notes.blade.php
index cb1c8062..50c690dd 100644
--- a/resources/views/app/pdf/invoice/partials/notes.blade.php
+++ b/resources/views/app/pdf/invoice/partials/notes.blade.php
@@ -1,6 +1,8 @@
-<div class="notes">
-    <div class="notes-label">
-        Notes
+@if ($invoice->notes != '' && $invoice->notes != null)
+    <div class="notes">
+        <div class="notes-label">
+            Notes
+        </div>
+        {{$invoice->notes}}
     </div>
-    {{$invoice->notes}}
-</div>
+@endif
diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php
index 9e42552b..aa4e6758 100644
--- a/resources/views/app/pdf/invoice/partials/table.blade.php
+++ b/resources/views/app/pdf/invoice/partials/table.blade.php
@@ -1,27 +1,32 @@
 <table width="100%" class="table2" cellspacing="0" border="0">
     <tr class="main-table-header">
+        <th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">#</th>
         @if($invoice->discount_per_item === 'NO')
             <th width="80%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
         @else
             <th width="40%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
         @endif
         <th width="17%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">Quantity</th>
-        <th width="18%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 40px">Price</th>
+        <th width="18%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 40px">Price</th>
         @if($invoice->discount_per_item === 'YES')
-            <th width="10%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 10px">Discount</th>
+            <th width="10%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-left: 10px">Discount</th>
         @endif
         <th width="15%" class="ItemTableHeader" style="text-align: right; color: #55547A;">Amount</th>
     </tr>
+    @php
+        $index = 1
+    @endphp
     @foreach ($invoice->items as $item)
         <tr class="item-details">
+            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;">{{$index}}</td>
             <td class="inv-item items" style="text-align: left; color: #040405;padding-left: 0px">
                 <span>{{ $item->name }}</span><br>
                 <span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{{ $item->description }}</span>
             </td>
             <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px">{{$item->quantity}}</td>
-            <td class="inv-item items" style="text-align: left; color: #040405; padding-left: 40px">{{$item->price/100}}</td>
+            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 40px">{{$item->price/100}}</td>
             @if($invoice->discount_per_item === 'YES')
-                <td class="inv-item items" style="text-align: left; color: #040405; padding-left: 10px">
+                <td class="inv-item items" style="text-align: right; color: #040405; padding-left: 10px">
                     @if($item->discount_type === 'fixed')
                         {{$item->discount_val/100}}
                     @endif
@@ -30,8 +35,11 @@
                     @endif
                 </td>
             @endif
-            <td class="inv-item items" style="text-align: right; color: #040405">{{$item->total/100}}</td>
+            <td class="inv-item items" style="text-align: right; color: #040405;">{{$item->total/100}}</td>
         </tr>
+        @php
+            $index += 1
+        @endphp
     @endforeach
 </table>