Update dompdf version

crater-invoice-inc · Jan 12, 2022 · 941bc4b · 941bc4b
2 parents f677a54 + a14655d
commit 941bc4b
Show file tree

Hide file tree

Showing 9 changed files with 212 additions and 173 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
   "require": {
     "php": "^7.4 || ^8.0",
     "aws/aws-sdk-php": "^3.142",
+    "barryvdh/laravel-dompdf": "^0.9.0",
     "crater-invoice/modules": "^1.0.0",
-    "barryvdh/laravel-dompdf": "^0.8.7",
     "doctrine/dbal": "^2.10",
     "dragonmantank/cron-expression": "^3.1",
     "fideloper/proxy": "^4.0",
@@ -88,4 +88,4 @@
       "dont-discover": []
     }
   }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title>
+    <title>@lang('pdf_estimate_label') - {{ $estimate->estimate_number }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">
@@ -46,7 +46,7 @@
         }
 
         .header-logo {
-            height: 50px;
+
             margin-top: 20px;
             text-transform: capitalize;
             color: #817AE3;
@@ -260,6 +260,7 @@
 
         .total-display-container {
             padding: 0 25px;
+
         }
 
         .total-display-table {
@@ -268,8 +269,10 @@
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;
-            margin-left: 500px;
             margin-top: 20px;
+            float: right;
+            width: auto;
+
         }
 
         .total-table-attribute-label {
@@ -308,7 +311,7 @@
         .notes {
             font-size: 12px;
             color: #595959;
-            margin-top: 15px;
+            margin-top: 80px;
             margin-left: 30px;
             width: 442px;
             text-align: left;
@@ -381,6 +384,7 @@
         .pl-0 {
             padding-left: 0;
         }
+
     </style>
 </head>
 
@@ -389,11 +393,11 @@
         <table width="100%">
             <tr>
                 <td class="text-center">
-                    @if($logo)
-                        <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
+                    @if ($logo)
+                        <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
                     @else
-                        @if($estimate->customer->company)
-                            <h2 class="header-logo"> {{$estimate->customer->company->name}} </h2>
+                        @if ($estimate->customer->company)
+                            <h2 class="header-logo"> {{ $estimate->customer->company->name }} </h2>
                         @endif
                     @endif
                 </td>
@@ -412,36 +416,36 @@
                 <table class="estimate-details-table">
                     <tr>
                         <td class="attribute-label">@lang('pdf_estimate_number')</td>
-                        <td class="attribute-value"> &nbsp;{{$estimate->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>
+                        <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>
+                        <td class="attribute-value"> &nbsp;{{ $estimate->formattedExpiryDate }}</td>
                     </tr>
                 </table>
             </div>
             <div style="clear: both;"></div>
         </div>
 
         <div class="customer-address-container">
-            @if($billing_address !== '</br>')
+            @if ($billing_address !== '</br>')
                 <div class="billing-address-container billing-address">
-                    @if($billing_address)
+                    @if ($billing_address)
                         <b>@lang('pdf_bill_to')</b> <br>
                         {!! $billing_address !!}
                     @endif
                 </div>
             @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>
+            <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)
-                     <b>@lang('pdf_ship_to') </b> <br>
+                @if ($shipping_address)
+                    <b>@lang('pdf_ship_to') </b> <br>
                     {!! $shipping_address !!}
                 @endif
             </div>
@@ -454,7 +458,7 @@
         </div>
 
         <div class="notes">
-            @if($notes)
+            @if ($notes)
                 <div class="notes-label">
                     @lang('pdf_notes')
                 </div>