From 38575e93e8441bd42d4318cc7619b4227bdefae3 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 20 Dec 2022 09:45:41 -0800
Subject: [PATCH 1/2] fixes the rules for adding page-break and padding at the
 end of document

---
 resources/views/hardware/labels.blade.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index 98318d0fac..97d25295bd 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -52,7 +52,6 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
     }
     img.barcode {
         display:block;
-
         padding-top: .11in;
         width: 100%;
     }
@@ -167,9 +166,9 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
 
     </div>
 
-    @if ($count % $settings->labels_per_page == 0)
-        <div class="page-break"></div>
-        <div class="next-padding">&nbsp;</div>
+    @if (($count % $settings->labels_per_page == 0) && $count!=count($assets))
+    <div class="page-break"></div>
+    <div class="next-padding">&nbsp;</div>
     @endif
 
 @endforeach

From 301c4fda6e81eecbe4abb9c0f89b28662fa05b1f Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 5 Jan 2023 09:55:25 -0800
Subject: [PATCH 2/2] fixes conflicts

---
 resources/views/hardware/labels.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index 97d25295bd..b25b08a0a9 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -52,7 +52,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
     }
     img.barcode {
         display:block;
-        padding-top: .11in;
+        margin-top:-7px;
         width: 100%;
     }
     div.label-logo {