From 1664a6d568b0e152180bf4b4061609619cb42a06 Mon Sep 17 00:00:00 2001
From: unknown <gokulerusappan10000@gmail.com>
Date: Fri, 6 Feb 2026 19:41:52 +0530
Subject: [PATCH] sales bill edit fix after testing

---
 .../StandardTable/StandardTablePayment.jsx    |   12 +-
 .../OtherConponents/Reprint/BSReprint.jsx     |    1 +
 .../PrintTemplates/A4/A4Standard.jsx          |    6 +-
 .../PrintTemplates/A4/PrintA4Style11.jsx      |   12 +-
 .../PrintTemplates/A4/PrintStyleA5.jsx        |   18 +-
 .../ThermalPrinter/PrintStyle1.jsx            |   12 +-
 .../ThermalPrinter/PrintStyle10.jsx           |    9 +-
 .../ThermalPrinter/PrintStyle11.jsx           |    9 +-
 .../ThermalPrinter/PrintStyle12.jsx           |    9 +-
 .../ThermalPrinter/PrintStyle2.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle3.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle4.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle5.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle6.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle7.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle8.jsx            |    9 +-
 .../ThermalPrinter/PrintStyle9.jsx            |    9 +-
 src/Pages/Product/Printstyles.js              |   10 +-
 src/Pages/Product/StickerTemplates.jsx        | 2819 +++++++++--------
 .../paymentpdfPage/PaymentPdfBooking.jsx      |    3 +-
 20 files changed, 1523 insertions(+), 1469 deletions(-)

diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
index 8af94a4..678f803 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
@@ -3457,15 +3457,9 @@ const StandardTablePayment = () => {
             <div>Total :</div>
             <p>
               ₹
-              {safeRound(
-                orderCardDetail?.reduce(
-                  (acc, data) => parseFloat(data?.TotalAmt || 0) + acc,
-                  0
-                ) -
-                ((OverAllSales > 0 ? OverAllSales : 0) +
-                  (OverAllEstimate > 0 ? OverAllEstimate : 0) +
-                  (Discount > 0 ? Discount : 0))
-              )}
+              {safeRound(credit && overAllBal >= 0
+                ? Math.max(0, TotalAmount - overAllBal)
+                : TotalAmount)}
             </p>
           </div>
         </div>
diff --git a/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx b/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
index c89fe41..a1086e2 100644
--- a/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
+++ b/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
@@ -1278,6 +1278,7 @@ function BSReprint({ setOpenModel = () => { } }) {
       VariantAvailableTo: item?.AvailableTo || null,
       OrderQty: item?.SalesQty,
       OrderRate: item?.Rate,
+      SellingPrice: item?.Rate,
       // TotalAmt: formatAmount((item.TotalAmt - item.OfferValue)),
     }));
 
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
index 5027bfb..d02210c 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
@@ -2434,7 +2434,8 @@ const InvoiceTemplate = ({
                                       'REFUND'
                                       ? '-'
                                       : '+'}
-                                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                   </span>
                                 </div>
                                 <div
@@ -3405,7 +3406,8 @@ const InvoiceTemplate = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
index 6e73f7e..2d3f57d 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
@@ -976,7 +976,8 @@ const PrintA4Style11 = ({
                                             <span>{'Adjustment Amount'}</span>
                                             <span>
                                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                             </span>
                                           </div>
                                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2019,7 +2020,8 @@ const PrintA4Style11 = ({
                                             <span>{'Adjustment Amount'}</span>
                                             <span>
                                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                             </span>
                                           </div>
                                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2672,7 +2674,8 @@ const PrintA4Style11 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -3238,7 +3241,8 @@ const PrintA4Style11 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
index 8d34cdb..220a7b5 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
@@ -977,7 +977,8 @@ const PrintA5Style11 = ({
                                             <span>{'Adjustment Amount'}</span>
                                             <span>
                                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                             </span>
                                           </div>
                                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -1957,7 +1958,8 @@ const PrintA5Style11 = ({
                                             <span>{'Adjustment Amount'}</span>
                                             <span>
                                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                             </span>
                                           </div>
                                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2549,7 +2551,8 @@ const PrintA5Style11 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2589,7 +2592,8 @@ const PrintA5Style11 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -3136,7 +3140,8 @@ const PrintA5Style11 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -3176,7 +3181,8 @@ const PrintA5Style11 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
index 74a9c94..4ff7674 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
@@ -1267,7 +1267,8 @@ const PrintStyle1 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2130,7 +2131,8 @@ const PrintStyle1 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
@@ -2958,7 +2960,8 @@ const PrintStyle1 = ({
                       <span>{'Adjustment Amount'}</span>
                       <span>
                         {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                        {(lastTransaction?.Amount || 0).toFixed(2)}
+                        {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                       </span>
                     </div>
                     <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
@@ -4443,7 +4446,8 @@ const PrintStyle1 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
index a378875..03f6566 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
@@ -1861,7 +1861,8 @@ const PrintStyle10 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -2810,7 +2811,8 @@ const PrintStyle10 = ({
                             {lastTransaction?.AdjustmentType === 'REFUND'
                               ? '-'
                               : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div
@@ -4360,7 +4362,8 @@ const PrintStyle10 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
index 0d6de8f..ba36f70 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
@@ -1829,7 +1829,8 @@ const PrintStyle11 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -2782,7 +2783,8 @@ const PrintStyle11 = ({
                             {lastTransaction?.AdjustmentType === 'REFUND'
                               ? '-'
                               : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div
@@ -4290,7 +4292,8 @@ const PrintStyle11 = ({
                     <span>{'Adjustment Amount'}</span>
                     <span>
                       {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                      {(lastTransaction?.Amount || 0).toFixed(2)}
+                      {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                     </span>
                   </div>
                   <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
index fbfeaa2..0df35d5 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
@@ -1826,7 +1826,8 @@ const Printstyle12 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -2813,7 +2814,8 @@ const Printstyle12 = ({
                             {lastTransaction?.AdjustmentType === 'REFUND'
                               ? '-'
                               : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div
@@ -4379,7 +4381,8 @@ const Printstyle12 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
index c6180c8..6714490 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
@@ -1716,7 +1716,8 @@ const Printstyle2 = ({
                                   <span>{'Adjustment Amount'}</span>
                                   <span>
                                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                   </span>
                                 </div>
                                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2587,7 +2588,8 @@ const Printstyle2 = ({
                                 <span>{'Adjustment Amount'}</span>
                                 <span>
                                   {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                  {(lastTransaction?.Amount || 0).toFixed(2)}
+                                  {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                 </span>
                               </div>
                               <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -4144,7 +4146,8 @@ const Printstyle2 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
index b1a067d..f69c9c4 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
@@ -536,7 +536,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                           <span>{'Adjustment Amount'}</span>
                           <span>
                             {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -934,7 +935,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                           <span>{'Adjustment Amount'}</span>
                           <span>
                             {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -1451,7 +1453,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
index 994362e..6cf469f 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
@@ -1679,7 +1679,8 @@ const Printstyle4 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2640,7 +2641,8 @@ const Printstyle4 = ({
                           <span>{'Adjustment Amount'}</span>
                           <span>
                             {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -4391,7 +4393,8 @@ const Printstyle4 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
index 9ddf38c..6479693 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
@@ -1498,7 +1498,8 @@ const PrintStyle5 = ({
                                 <span>{'Adjustment Amount'}</span>
                                 <span>
                                   {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                  {(lastTransaction?.Amount || 0).toFixed(2)}
+                                  {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                 </span>
                               </div>
                               <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2238,7 +2239,8 @@ const PrintStyle5 = ({
                               <span>{'Adjustment Amount'}</span>
                               <span>
                                 {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                                {(lastTransaction?.Amount || 0).toFixed(2)}
+                                {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                               </span>
                             </div>
                             <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -3693,7 +3695,8 @@ const PrintStyle5 = ({
                         <span>{'Adjustment Amount'}</span>
                         <span>
                           {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                          {(lastTransaction?.Amount || 0).toFixed(2)}
+                          {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                         </span>
                       </div>
                       <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
index e05dd88..35b8030 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
@@ -1695,7 +1695,8 @@ const Printstyle6 = ({
                             <span>{'Adjustment Amount'}</span>
                             <span>
                               {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -2696,7 +2697,8 @@ const Printstyle6 = ({
                           <span>{'Adjustment Amount'}</span>
                           <span>
                             {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@@ -4372,7 +4374,8 @@ const Printstyle6 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
index 9cb2131..058358c 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
@@ -1464,7 +1464,8 @@ const PrintStyle7 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -2370,7 +2371,8 @@ const PrintStyle7 = ({
                             {lastTransaction?.AdjustmentType === 'REFUND'
                               ? '-'
                               : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div
@@ -3855,7 +3857,8 @@ const PrintStyle7 = ({
                   <span>{'Adjustment Amount'}</span>
                   <span>
                     {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                    {(lastTransaction?.Amount || 0).toFixed(2)}
+                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                   </span>
                 </div>
                 <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
index 42da6c2..d7b4430 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
@@ -1738,7 +1738,8 @@ const Printstyle8 = ({
                                 {lastTransaction?.AdjustmentType === 'REFUND'
                                   ? '-'
                                   : '+'}
-                                {(lastTransaction?.Amount || 0).toFixed(2)}
+                                {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                               </span>
                             </div>
                             <div
@@ -2734,7 +2735,8 @@ const Printstyle8 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -4322,7 +4324,8 @@ const Printstyle8 = ({
                     <span>{'Adjustment Amount'}</span>
                     <span>
                       {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                      {(lastTransaction?.Amount || 0).toFixed(2)}
+                      {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                     </span>
                   </div>
                   <div
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
index 22fc721..72fb44a 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
@@ -1887,7 +1887,8 @@ const PrintStyle9 = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {(lastTransaction?.Amount || 0).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -2869,7 +2870,8 @@ const PrintStyle9 = ({
                             {lastTransaction?.AdjustmentType === 'REFUND'
                               ? '-'
                               : '+'}
-                            {(lastTransaction?.Amount || 0).toFixed(2)}
+                            {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                           </span>
                         </div>
                         <div
@@ -4448,7 +4450,8 @@ const PrintStyle9 = ({
                     <span>{'Adjustment Amount'}</span>
                     <span>
                       {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                      {(lastTransaction?.Amount || 0).toFixed(2)}
+                      {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                     </span>
                   </div>
                   <div
diff --git a/src/Pages/Product/Printstyles.js b/src/Pages/Product/Printstyles.js
index a37962f..69072d4 100644
--- a/src/Pages/Product/Printstyles.js
+++ b/src/Pages/Product/Printstyles.js
@@ -600,7 +600,7 @@ height: 149mm;
   line-height: 1;
   white-space: nowrap;
   text-align: center;
-  max-width: 100%;
+ 
 }
 
 .productNameBQSmall {
@@ -826,6 +826,14 @@ height: 149mm;
   text-overflow: ellipsis;
 }
 
+.text-ellipsis2 {
+  width: 80%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-align: center;
+  text-overflow: ellipsis;
+}
+
 .text-clamp-2 {
   display: -webkit-box;
   -webkit-line-clamp: 2;
diff --git a/src/Pages/Product/StickerTemplates.jsx b/src/Pages/Product/StickerTemplates.jsx
index af64540..eff13d8 100644
--- a/src/Pages/Product/StickerTemplates.jsx
+++ b/src/Pages/Product/StickerTemplates.jsx
@@ -20,7 +20,7 @@ const StickerPrintTemplates = ({
     (find) => find.SessionName === dropdownValue
   );
   const templateAvailable = template === undefined ? false : true;
-
+  console.log(proName?.length > 12, "proNameproName")
   function choosenPrintStyle(dropdownValue, templateAvailable) {
     switch (dropdownValue) {
       case '15X15 6cross':
@@ -98,35 +98,35 @@ const StickerPrintTemplates = ({
           <div className="grid15x15_6cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCountcopyCountcopyCount');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="Sticker0"
-                        key={`sticker0-${recordIndex}-${copyIndex}`}
-                      >
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '52px', height: '52px' }}
-                        />
-                      </div>
-                    )
-                  );
-                })
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCountcopyCountcopyCount');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="Sticker0"
+                      key={`sticker0-${recordIndex}-${copyIndex}`}
+                    >
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '52px', height: '52px' }}
+                      />
+                    </div>
+                  )
+                );
+              })
               : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="Sticker0" key={`sticker0-${index}`}>
-                    <img
-                      src={base64Image}
-                      style={{ width: '13mm', height: '13mm' }}
-                    />
-                  </div>
-                ))}
+                <div className="Sticker0" key={`sticker0-${index}`}>
+                  <img
+                    src={base64Image}
+                    style={{ width: '13mm', height: '13mm' }}
+                  />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -135,50 +135,50 @@ const StickerPrintTemplates = ({
           <div className="grid22x35_3cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  return Array?.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="label-wrapper-22x35"
-                        key={`sticker1-${recordIndex}-${copyIndex}`}
-                      >
-                        <div style={{ width: '60%' }}>
-                          <p
-                            className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 8 ? 'text-clamp-2' : ''}`}
-                          >
-                            {record.ProdName} ({record.Size}
-                            {record.UomName})
-                          </p>
-                          <p>{record.QRCode}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                return Array?.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="label-wrapper-22x35"
+                      key={`sticker1-${recordIndex}-${copyIndex}`}
+                    >
+                      <div style={{ width: '60%' }}>
+                        <p
+                          className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 8 ? 'text-clamp-2' : ''}`}
+                        >
+                          {record.ProdName} ({record.Size}
+                          {record.UomName})
+                        </p>
+                        <p>{record.QRCode}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array?.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="label-wrapper-22x35"
-                    key={`sticker1-${index}`}
-                  >
-                    <div style={{ width: '19mm' }}>
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 8 ? 'text-ellipsis' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                      />
                     </div>
-                    <img src={base64Image} />
+                  )
+                );
+              })
+              : Array?.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="label-wrapper-22x35"
+                  key={`sticker1-${index}`}
+                >
+                  <div style={{ width: '19mm' }}>
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 8 ? 'text-ellipsis' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img src={base64Image} />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -187,112 +187,112 @@ const StickerPrintTemplates = ({
           <div className="grid25x25_4cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount2');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="sticker25x25"
-                        key={`sticker2-${recordIndex}-${copyIndex}`}
-                      >
-                        <p
-                          className={`sticker25x25-name ${nickName ? '' : (record?.ProdName + '(' + record?.Size + '' + record?.UomName + ')')?.length > 14 ? 'text-ellipsis' : ''}`}
-                        >
-                          <span
-                            class={
-                              (record?.NickName || record?.ProdName)?.length <=
-                              14
-                                ? 'product-name2'
-                                : 'product-nameSmall2'
-                            }
-                          >
-                            {record?.NickName || record?.ProdName}
-                          </span>
-                          <span
-                            class={
-                              (record?.NickName || record?.ProdName)?.length <=
-                              14
-                                ? 'product-size2'
-                                : 'product-sizeSmall2'
-                            }
-                          >
-                            ({record?.Size}
-                            {record?.UomName})
-                          </span>
-                        </p>
-                        <div
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            width: '100%',
-                            flexDirection: 'column',
-                            justifyContent: 'center',
-                          }}
-                        >
-                          <img
-                            src={
-                              generateCodeImage(
-                                record?.QRCode || record?.ProdId,
-                                templateOptions?.codeType
-                              ) || base64Image
-                            }
-                            className="sticker25-img"
-                            alt="barcode"
-                          />
-                          <p class="product-id2">
-                            {record?.QRCode || record?.ProdId}
-                          </p>
-                        </div>
-                      </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="sticker25x25" key={`sticker2-${index}`}>
-                    <p
-                      className={`sticker25x25-name ${nickName ? '' : (proName + '(' + size + ')')?.length > 14 ? 'text-ellipsis' : ''}`}
-                    >
-                      <span
-                        class={
-                          proName?.length <= 14
-                            ? 'product-name2'
-                            : 'product-nameSmall2'
-                        }
-                      >
-                        {nickName
-                          ? nickName
-                          : proName
-                            ? proName
-                            : 'Product Name'}
-                      </span>
-                      <span
-                        class={
-                          proName?.length <= 14
-                            ? 'product-size2'
-                            : 'product-sizeSmall2'
-                        }
-                      >
-                        ({size})
-                      </span>
-                    </p>
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount2');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
                     <div
-                      style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        width: '100%',
-                        flexDirection: 'column',
-                        justifyContent: 'center',
-                      }}
+                      className="sticker25x25"
+                      key={`sticker2-${recordIndex}-${copyIndex}`}
                     >
-                      <img
-                        src={base64Image}
-                        className="sticker25-img"
-                        alt="barcode"
-                      />
-                      <p class="product-id2">{ProdId}</p>
+                      <p
+                        className={`sticker25x25-name ${nickName ? '' : (record?.ProdName + '(' + record?.Size + '' + record?.UomName + ')')?.length > 14 ? 'text-ellipsis' : ''}`}
+                      >
+                        <span
+                          class={
+                            (record?.NickName || record?.ProdName)?.length <=
+                              14
+                              ? 'product-name2'
+                              : 'product-nameSmall2'
+                          }
+                        >
+                          {record?.NickName || record?.ProdName}
+                        </span>
+                        <span
+                          class={
+                            (record?.NickName || record?.ProdName)?.length <=
+                              14
+                              ? 'product-size2'
+                              : 'product-sizeSmall2'
+                          }
+                        >
+                          ({record?.Size}
+                          {record?.UomName})
+                        </span>
+                      </p>
+                      <div
+                        style={{
+                          display: 'flex',
+                          alignItems: 'center',
+                          width: '100%',
+                          flexDirection: 'column',
+                          justifyContent: 'center',
+                        }}
+                      >
+                        <img
+                          src={
+                            generateCodeImage(
+                              record?.QRCode || record?.ProdId,
+                              templateOptions?.codeType
+                            ) || base64Image
+                          }
+                          className="sticker25-img"
+                          alt="barcode"
+                        />
+                        <p class="product-id2">
+                          {record?.QRCode || record?.ProdId}
+                        </p>
+                      </div>
                     </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="sticker25x25" key={`sticker2-${index}`}>
+                  <p
+                    className={`sticker25x25-name ${nickName ? '' : (proName + '(' + size + ')')?.length > 14 ? 'text-ellipsis' : ''}`}
+                  >
+                    <span
+                      class={
+                        proName?.length <= 14
+                          ? 'product-name2'
+                          : 'product-nameSmall2'
+                      }
+                    >
+                      {nickName
+                        ? nickName
+                        : proName
+                          ? proName
+                          : 'Product Name'}
+                    </span>
+                    <span
+                      class={
+                        proName?.length <= 14
+                          ? 'product-size2'
+                          : 'product-sizeSmall2'
+                      }
+                    >
+                      ({size})
+                    </span>
+                  </p>
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      width: '100%',
+                      flexDirection: 'column',
+                      justifyContent: 'center',
+                    }}
+                  >
+                    <img
+                      src={base64Image}
+                      className="sticker25-img"
+                      alt="barcode"
+                    />
+                    <p class="product-id2">{ProdId}</p>
                   </div>
-                ))}
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -301,53 +301,53 @@ const StickerPrintTemplates = ({
           <div className="grid25x50_2cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount3');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="label-25x50-content"
-                        key={`sticker3-${recordIndex}-${copyIndex}`}
-                      >
-                        <div>
-                          <p
-                            className={`${nickName ? '' : ((record?.NickName || record?.ProdName) + ' (' + record?.Size + ')')?.length > 12 ? 'text-clamp-2' : ''}`}
-                          >
-                            {record?.NickName || record?.ProdName} (
-                            {record?.Size}
-                            {record?.UomName})
-                          </p>
-                          <p>{record?.QRCode || record?.ProdId}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '75px', height: '75px' }}
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount3');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="label-25x50-content"
+                      key={`sticker3-${recordIndex}-${copyIndex}`}
+                    >
+                      <div>
+                        <p
+                          className={`${nickName ? '' : ((record?.NickName || record?.ProdName) + ' (' + record?.Size + ')')?.length > 12 ? 'text-clamp-2' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName} (
+                          {record?.Size}
+                          {record?.UomName})
+                        </p>
+                        <p>{record?.QRCode || record?.ProdId}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="label-25x50-content"
-                    key={`sticker3-${index}`}
-                  >
-                    <div>
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-clamp-2' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '75px', height: '75px' }}
+                      />
                     </div>
-                    <img src={base64Image} />
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="label-25x50-content"
+                  key={`sticker3-${index}`}
+                >
+                  <div>
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-clamp-2' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img src={base64Image} />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -356,53 +356,53 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount4');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="Sticker4"
-                        key={`sticker4-${recordIndex}-${copyIndex}`}
-                      >
-                        <div>
-                          <p
-                            className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {record?.NickName || record?.ProdName} (
-                            {record?.Size}
-                            {record?.UomName})
-                          </p>
-                          <p>{record?.QRCode || record?.ProdId}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '75px', height: '75px' }}
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount4');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="Sticker4"
+                      key={`sticker4-${recordIndex}-${copyIndex}`}
+                    >
+                      <div>
+                        <p
+                          className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName} (
+                          {record?.Size}
+                          {record?.UomName})
+                        </p>
+                        <p>{record?.QRCode || record?.ProdId}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="Sticker4" key={`sticker4-${index}`}>
-                    <div>
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '75px', height: '75px' }}
+                      />
                     </div>
-                    <img
-                      src={base64Image}
-                      style={{ width: '75px', height: '75px' }}
-                    />
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="Sticker4" key={`sticker4-${index}`}>
+                  <div>
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img
+                    src={base64Image}
+                    style={{ width: '75px', height: '75px' }}
+                  />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -411,53 +411,53 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount5');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="Sticker5"
-                        key={`sticker5-${recordIndex}-${copyIndex}`}
-                      >
-                        <div>
-                          <p
-                            className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {record?.NickName || record?.ProdName} (
-                            {record?.Size}
-                            {record?.UomName})
-                          </p>
-                          <p>{record?.QRCode || record?.ProdId}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '72px', height: '72px' }}
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount5');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="Sticker5"
+                      key={`sticker5-${recordIndex}-${copyIndex}`}
+                    >
+                      <div>
+                        <p
+                          className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName} (
+                          {record?.Size}
+                          {record?.UomName})
+                        </p>
+                        <p>{record?.QRCode || record?.ProdId}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="Sticker5" key={`sticker5-${index}`}>
-                    <div>
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '72px', height: '72px' }}
+                      />
                     </div>
-                    <img
-                      src={base64Image}
-                      style={{ width: '72px', height: '72px' }}
-                    />
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="Sticker5" key={`sticker5-${index}`}>
+                  <div>
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img
+                    src={base64Image}
+                    style={{ width: '72px', height: '72px' }}
+                  />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -466,53 +466,53 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount6');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="Sticker6"
-                        key={`sticker6-${recordIndex}-${copyIndex}`}
-                      >
-                        <div className="text-section6">
-                          <p
-                            className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {record?.NickName || record?.ProdName} (
-                            {record?.Size}
-                            {record?.UomName})
-                          </p>
-                          <p>{record?.QRCode || record?.ProdId}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '11mm', height: '11mm' }}
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount6');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="Sticker6"
+                      key={`sticker6-${recordIndex}-${copyIndex}`}
+                    >
+                      <div className="text-section6">
+                        <p
+                          className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName} (
+                          {record?.Size}
+                          {record?.UomName})
+                        </p>
+                        <p>{record?.QRCode || record?.ProdId}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="Sticker6" key={`sticker6-${index}`}>
-                    <div className="text-section6">
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '11mm', height: '11mm' }}
+                      />
                     </div>
-                    <img
-                      src={base64Image}
-                      style={{ width: '11mm', height: '11mm' }}
-                    />
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="Sticker6" key={`sticker6-${index}`}>
+                  <div className="text-section6">
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img
+                    src={base64Image}
+                    style={{ width: '11mm', height: '11mm' }}
+                  />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -521,53 +521,53 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount7');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="Sticker7"
-                        key={`sticker7-${recordIndex}-${copyIndex}`}
-                      >
-                        <div className="text-section7">
-                          <p
-                            className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {record?.NickName || record?.ProdName} (
-                            {record?.Size}
-                            {record?.UomName})
-                          </p>
-                          <p>{record?.QRCode || record?.ProdId}</p>
-                        </div>
-                        <img
-                          src={
-                            generateCodeImage(
-                              record?.QRCode || record?.ProdId,
-                              templateOptions?.codeType
-                            ) || base64Image
-                          }
-                          style={{ width: '12mm', height: '12mm' }}
-                        />
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount7');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="Sticker7"
+                      key={`sticker7-${recordIndex}-${copyIndex}`}
+                    >
+                      <div className="text-section7">
+                        <p
+                          className={`${nickName ? '' : (record?.ProdName + ' (' + record?.Size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName} (
+                          {record?.Size}
+                          {record?.UomName})
+                        </p>
+                        <p>{record?.QRCode || record?.ProdId}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="Sticker7" key={`sticker7-${index}`}>
-                    <div className="text-section7">
-                      <p
-                        className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
-                      >
-                        {proName} ({size})
-                      </p>
-                      <p>{ProdId}</p>
+                      <img
+                        src={
+                          generateCodeImage(
+                            record?.QRCode || record?.ProdId,
+                            templateOptions?.codeType
+                          ) || base64Image
+                        }
+                        style={{ width: '12mm', height: '12mm' }}
+                      />
                     </div>
-                    <img
-                      src={base64Image}
-                      style={{ width: '12mm', height: '12mm' }}
-                    />
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="Sticker7" key={`sticker7-${index}`}>
+                  <div className="text-section7">
+                    <p
+                      className={`${nickName ? '' : (proName + ' (' + size + ')')?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {proName} ({size})
+                    </p>
+                    <p>{ProdId}</p>
                   </div>
-                ))}
+                  <img
+                    src={base64Image}
+                    style={{ width: '12mm', height: '12mm' }}
+                  />
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -576,108 +576,108 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  console.log(copyCount, 'copyCount8');
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="OverAllSticker8"
-                        key={`sticker8-${recordIndex}-${copyIndex}`}
-                      >
-                        <div className="StikerBr8">
-                          <p>{record?.BrName || detail?.BrName}</p>
-                        </div>
-                        <div className="Sticker8">
-                          <div className="text-section8">
-                            <p>
-                              Product Name:{' '}
-                              <p
-                                className={`field-value ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                              >
-                                {record?.NickName || record?.ProdName}
-                              </p>
-                            </p>
-                            <p>
-                              SIZE:{' '}
-                              <span className="field-value">
-                                {record?.Size}
-                                {record?.UomName}
-                              </span>
-                            </p>
-                            <p>
-                              Id:{' '}
-                              <span className="field-value">
-                                {record?.QRCode || record?.ProdId}
-                              </span>
-                            </p>
-                            <p>
-                              MRP:{' '}
-                              <span className="field-value">
-                                {'MRP : ' + record?.MRP}
-                              </span>
-                            </p>
-                            <p>
-                              Selling Price:{' '}
-                              <span className="field-value">
-                                {record?.SellPrice}
-                              </span>
-                            </p>
-                          </div>
-                          <img
-                            src={
-                              generateCodeImage(
-                                record?.QRCode || record?.ProdId,
-                                templateOptions?.codeType
-                              ) || base64Image
-                            }
-                            style={{ width: '50mm', height: '50mm' }}
-                          />
-                        </div>
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                console.log(copyCount, 'copyCount8');
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="OverAllSticker8"
+                      key={`sticker8-${recordIndex}-${copyIndex}`}
+                    >
+                      <div className="StikerBr8">
+                        <p>{record?.BrName || detail?.BrName}</p>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="OverAllSticker8">
-                    <div className="StikerBr8">
-                      <p>{detail?.BrName}</p>
-                    </div>
-                    <div className="Sticker8" key={`sticker8-${index}`}>
-                      <div className="text-section8">
-                        <p>
-                          Product Name:{' '}
-                          <p
-                            className={`field-value ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {proName}
+                      <div className="Sticker8">
+                        <div className="text-section8">
+                          <p>
+                            Product Name:{' '}
+                            <p
+                              className={`field-value ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                            >
+                              {record?.NickName || record?.ProdName}
+                            </p>
                           </p>
-                        </p>
-                        <p>
-                          SIZE: <span className="field-value">{size}</span>
-                        </p>
-                        <p>
-                          Id: <span className="field-value">{ProdId}</span>
-                        </p>
-                        <p>
-                          MRP:{' '}
-                          <span className="field-value">
-                            {'MRP : ' + detail?.MRP}
-                          </span>
-                        </p>
-                        <p>
-                          Selling Price:{' '}
-                          <span className="field-value">
-                            {detail?.SellPrice}
-                          </span>
-                        </p>
+                          <p>
+                            SIZE:{' '}
+                            <span className="field-value">
+                              {record?.Size}
+                              {record?.UomName}
+                            </span>
+                          </p>
+                          <p>
+                            Id:{' '}
+                            <span className="field-value">
+                              {record?.QRCode || record?.ProdId}
+                            </span>
+                          </p>
+                          <p>
+                            MRP:{' '}
+                            <span className="field-value">
+                              {'MRP : ' + record?.MRP}
+                            </span>
+                          </p>
+                          <p>
+                            Selling Price:{' '}
+                            <span className="field-value">
+                              {record?.SellPrice}
+                            </span>
+                          </p>
+                        </div>
+                        <img
+                          src={
+                            generateCodeImage(
+                              record?.QRCode || record?.ProdId,
+                              templateOptions?.codeType
+                            ) || base64Image
+                          }
+                          style={{ width: '50mm', height: '50mm' }}
+                        />
                       </div>
-                      <img
-                        src={base64Image}
-                        style={{ width: '50mm', height: '50mm' }}
-                      />
                     </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="OverAllSticker8">
+                  <div className="StikerBr8">
+                    <p>{detail?.BrName}</p>
                   </div>
-                ))}
+                  <div className="Sticker8" key={`sticker8-${index}`}>
+                    <div className="text-section8">
+                      <p>
+                        Product Name:{' '}
+                        <p
+                          className={`field-value ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {proName}
+                        </p>
+                      </p>
+                      <p>
+                        SIZE: <span className="field-value">{size}</span>
+                      </p>
+                      <p>
+                        Id: <span className="field-value">{ProdId}</span>
+                      </p>
+                      <p>
+                        MRP:{' '}
+                        <span className="field-value">
+                          {'MRP : ' + detail?.MRP}
+                        </span>
+                      </p>
+                      <p>
+                        Selling Price:{' '}
+                        <span className="field-value">
+                          {detail?.SellPrice}
+                        </span>
+                      </p>
+                    </div>
+                    <img
+                      src={base64Image}
+                      style={{ width: '50mm', height: '50mm' }}
+                    />
+                  </div>
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -686,349 +686,349 @@ const StickerPrintTemplates = ({
           <div className="grid25x25_4cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => {
-                      const hasProductName = !!templateOptions.productName;
-                      const hasMrp = !!templateOptions.mrp;
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => {
+                    const hasProductName = !!templateOptions.productName;
+                    const hasMrp = !!templateOptions.mrp;
 
-                      const hasMDate =
-                        templateOptions.mDate && record?.ManufDate;
+                    const hasMDate =
+                      templateOptions.mDate && record?.ManufDate;
 
-                      const hasEDate = templateOptions.eDate && record?.ExpDate;
+                    const hasEDate = templateOptions.eDate && record?.ExpDate;
 
-                      // IMAGE SIZE LOGIC
-                      let imageSize = 50;
-                      if (!hasMDate && !hasEDate) {
-                        imageSize = 52;
-                      }
-
-                      if (!hasProductName || !hasMrp) {
-                        imageSize = 60;
-                      }
-
-                      if (!hasProductName && !hasMrp) {
-                        imageSize = 80;
-                      }
-
-                      // FLEX DIRECTION LOGIC
-                      const forceColumnLayout =
-                        !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
-                      return (
-                        <div
-                          className="barcode-wrapper-25x25"
-                          key={`Barcode1-${recordIndex}-${copyIndex}`}
-                        >
-                          <div className="barcode-container-25x25">
-                            {templateOptions.value === 'T' && (
-                              <div
-                                style={{
-                                  width: '100%',
-                                  display: 'flex',
-                                  alignItems: 'center',
-                                  justifyContent: 'center',
-                                  flexDirection: forceColumnLayout
-                                    ? 'column'
-                                    : 'row',
-                                }}
-                              >
-                                {imageTagBarcodeAndQR(
-                                  templateOptions.codeType === 'B'
-                                    ? '90%'
-                                    : `${imageSize}%`,
-                                  '7px',
-                                  record?.QRCode || record?.ProdId
-                                )}
-                              </div>
-                            )}
-                            {hasProductName && (
-                              <div
-                                style={{
-                                  fontSize: '9px',
-                                  textAlign: 'center',
-                                  width: '100%',
-                                }}
-                                className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                              >
-                                {record?.NickName || record?.ProdName}
-                              </div>
-                            )}
-                            {hasMrp && (
-                              <div
-                                style={{
-                                  fontSize: '9px',
-                                  textAlign: 'center',
-                                  width: '100%',
-                                }}
-                                className="MRPBQ"
-                              >
-                                {'₹' + record?.MRP}
-                              </div>
-                            )}
-                            {templateOptions.value === 'C' && (
-                              <div
-                                style={{
-                                  width: '100%',
-                                  display: 'flex',
-                                  alignItems: 'center',
-                                  justifyContent: 'center',
-                                  flexDirection: forceColumnLayout
-                                    ? 'column'
-                                    : 'row',
-                                }}
-                              >
-                                {imageTagBarcodeAndQR(
-                                  templateOptions.codeType === 'B'
-                                    ? '90%'
-                                    : `${imageSize}%`,
-                                  '7px',
-                                  record?.QRCode || record?.ProdId
-                                )}
-                              </div>
-                            )}
-                            {(hasMDate || hasEDate) && (
-                              <div
-                                style={{
-                                  display: 'flex',
-                                  alignItems: 'center',
-                                  justifyContent: 'center',
-                                  gap: '3px',
-                                }}
-                              >
-                                {hasMDate && (
-                                  <div
-                                    style={{
-                                      fontSize: '8px',
-                                      whiteSpace: 'nowrap',
-                                      textAlign: 'center',
-                                      width: '100%',
-                                    }}
-                                    className="MandateBQ"
-                                  >
-                                    {hasMDate && !hasEDate ? 'MFG: ' : ''}
-                                    {formatDate(record?.ManufDate)}
-                                  </div>
-                                )}
-                                {hasMDate && hasEDate && (
-                                  <span style={{ fontSize: '8px' }}>|</span>
-                                )}
-                                {hasEDate && (
-                                  <div
-                                    style={{
-                                      fontSize: '8px',
-                                      whiteSpace: 'nowrap',
-                                      textAlign: 'center',
-                                      width: '100%',
-                                    }}
-                                    className="ExpdateBQ"
-                                  >
-                                    {!hasMDate && hasEDate ? 'EXP: ' : ''}
-                                    {formatDate(record?.ExpDate)}
-                                  </div>
-                                )}
-                              </div>
-                            )}
-                            {templateOptions.value === 'B' && (
-                              <div
-                                style={{
-                                  width: '100%',
-                                  display: 'flex',
-                                  alignItems: 'center',
-                                  justifyContent: 'center',
-                                  flexDirection: forceColumnLayout
-                                    ? 'column'
-                                    : 'row',
-                                }}
-                              >
-                                {imageTagBarcodeAndQR(
-                                  templateOptions.codeType === 'B'
-                                    ? '25mm'
-                                    : `${imageSize}%`,
-                                  '7px',
-                                  record?.QRCode || record?.ProdId
-                                )}
-                              </div>
-                            )}
-                          </div>
-                        </div>
-                      );
+                    // IMAGE SIZE LOGIC
+                    let imageSize = 50;
+                    if (!hasMDate && !hasEDate) {
+                      imageSize = 52;
                     }
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => {
-                  const hasProductName = !!templateOptions.productName;
-                  const hasMrp = !!templateOptions.mrp;
 
-                  const hasMDate =
-                    templateOptions.mDate &&
-                    detail?.ProdVariantPriceDetails?.[0]?.ManufDate;
+                    if (!hasProductName || !hasMrp) {
+                      imageSize = 60;
+                    }
 
-                  const hasEDate =
-                    templateOptions.eDate &&
-                    detail?.ProdVariantPriceDetails?.[0]?.ExpDate;
+                    if (!hasProductName && !hasMrp) {
+                      imageSize = 80;
+                    }
 
-                  // IMAGE SIZE LOGIC
-                  let imageSize = 50;
-                  if (!hasMDate && !hasEDate) {
-                    imageSize = 52;
-                  }
-
-                  if (!hasProductName || !hasMrp) {
-                    imageSize = 60;
-                  }
-
-                  if (!hasProductName && !hasMrp) {
-                    imageSize = 80;
-                  }
-
-                  // FLEX DIRECTION LOGIC
-                  const forceColumnLayout =
-                    !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
-                  return (
-                    <div
-                      className="barcode-wrapper-25x25"
-                      key={`Barcode1-${index}`}
-                    >
-                      <div className="barcode-container-25x25">
-                        {templateOptions.value === 'T' && (
-                          <div
-                            style={{
-                              width: '100%',
-                              display: 'flex',
-                              alignItems: 'center',
-                              justifyContent: 'center',
-                              flexDirection: forceColumnLayout
-                                ? 'column'
-                                : 'row',
-                            }}
-                          >
-                            {imageTagBarcodeAndQR(
-                              templateOptions.codeType === 'B'
-                                ? '90%'
-                                : `${imageSize}%`,
-                              '7px'
-                            )}
-                          </div>
-                        )}
-                        {hasProductName && (
-                          <div
-                            style={{
-                              fontSize: '9px',
-                              textAlign: 'center',
-                              width: '100%',
-                            }}
-                            className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {nickName
-                              ? nickName
-                              : proName
-                                ? proName
-                                : 'Product Name'}
-                          </div>
-                        )}
-                        {hasMrp && (
-                          <div
-                            style={{
-                              fontSize: '9px',
-                              textAlign: 'center',
-                              width: '100%',
-                            }}
-                            className="MRPBQ"
-                          >
-                            {'₹' + detail?.MRP}
-                          </div>
-                        )}
-                        {templateOptions.value === 'C' && (
-                          <div
-                            style={{
-                              width: '100%',
-                              display: 'flex',
-                              alignItems: 'center',
-                              justifyContent: 'center',
-                              flexDirection: forceColumnLayout
-                                ? 'column'
-                                : 'row',
-                            }}
-                          >
-                            {imageTagBarcodeAndQR(
-                              templateOptions.codeType === 'B'
-                                ? '90%'
-                                : `${imageSize}%`,
-                              '7px'
-                            )}
-                          </div>
-                        )}
-                        {(hasMDate || hasEDate) && (
-                          <div
-                            style={{
-                              display: 'flex',
-                              alignItems: 'center',
-                              justifyContent: 'center',
-                              gap: '3px',
-                            }}
-                          >
-                            {hasMDate && (
-                              <div
-                                style={{
-                                  fontSize: '8px',
-                                  whiteSpace: 'nowrap',
-                                  textAlign: 'center',
-                                  width: '100%',
-                                }}
-                                className="MandateBQ"
-                              >
-                                {hasMDate && !hasEDate ? 'MFG: ' : ''}
-                                {formatDate(
-                                  detail?.ProdVariantPriceDetails?.[0]
-                                    ?.ManufDate
-                                )}
-                              </div>
-                            )}
-                            {hasMDate && hasEDate && (
-                              <span style={{ fontSize: '8px' }}>|</span>
-                            )}
-                            {hasEDate && (
-                              <div
-                                style={{
-                                  fontSize: '8px',
-                                  whiteSpace: 'nowrap',
-                                  textAlign: 'center',
-                                  width: '100%',
-                                }}
-                                className="ExpdateBQ"
-                              >
-                                {!hasMDate && hasEDate ? 'EXP: ' : ''}
-                                {formatDate(
-                                  detail?.ProdVariantPriceDetails?.[0]?.ExpDate
-                                )}
-                              </div>
-                            )}
-                          </div>
-                        )}
-                        {templateOptions.value === 'B' && (
-                          <div
-                            style={{
-                              width: '100%',
-                              display: 'flex',
-                              alignItems: 'center',
-                              justifyContent: 'center',
-                              flexDirection: forceColumnLayout
-                                ? 'column'
-                                : 'row',
-                            }}
-                          >
-                            {imageTagBarcodeAndQR(
-                              templateOptions.codeType === 'B'
-                                ? '25mm'
-                                : `${imageSize}%`,
-                              '7px'
-                            )}
-                          </div>
-                        )}
+                    // FLEX DIRECTION LOGIC
+                    const forceColumnLayout =
+                      !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
+                    return (
+                      <div
+                        className="barcode-wrapper-25x25"
+                        key={`Barcode1-${recordIndex}-${copyIndex}`}
+                      >
+                        <div className="barcode-container-25x25">
+                          {templateOptions.value === 'T' && (
+                            <div
+                              style={{
+                                width: '100%',
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                                flexDirection: forceColumnLayout
+                                  ? 'column'
+                                  : 'row',
+                              }}
+                            >
+                              {imageTagBarcodeAndQR(
+                                templateOptions.codeType === 'B'
+                                  ? '90%'
+                                  : `${imageSize}%`,
+                                '7px',
+                                record?.QRCode || record?.ProdId
+                              )}
+                            </div>
+                          )}
+                          {hasProductName && (
+                            <div
+                              style={{
+                                fontSize: '9px',
+                                textAlign: 'center',
+                                width: '100%',
+                              }}
+                              className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                            >
+                              {record?.NickName || record?.ProdName}
+                            </div>
+                          )}
+                          {hasMrp && (
+                            <div
+                              style={{
+                                fontSize: '9px',
+                                textAlign: 'center',
+                                width: '100%',
+                              }}
+                              className="MRPBQ"
+                            >
+                              {'₹' + record?.MRP}
+                            </div>
+                          )}
+                          {templateOptions.value === 'C' && (
+                            <div
+                              style={{
+                                width: '100%',
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                                flexDirection: forceColumnLayout
+                                  ? 'column'
+                                  : 'row',
+                              }}
+                            >
+                              {imageTagBarcodeAndQR(
+                                templateOptions.codeType === 'B'
+                                  ? '90%'
+                                  : `${imageSize}%`,
+                                '7px',
+                                record?.QRCode || record?.ProdId
+                              )}
+                            </div>
+                          )}
+                          {(hasMDate || hasEDate) && (
+                            <div
+                              style={{
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                                gap: '3px',
+                              }}
+                            >
+                              {hasMDate && (
+                                <div
+                                  style={{
+                                    fontSize: '8px',
+                                    whiteSpace: 'nowrap',
+                                    textAlign: 'center',
+                                    width: '100%',
+                                  }}
+                                  className="MandateBQ"
+                                >
+                                  {hasMDate && !hasEDate ? 'MFG: ' : ''}
+                                  {formatDate(record?.ManufDate)}
+                                </div>
+                              )}
+                              {hasMDate && hasEDate && (
+                                <span style={{ fontSize: '8px' }}>|</span>
+                              )}
+                              {hasEDate && (
+                                <div
+                                  style={{
+                                    fontSize: '8px',
+                                    whiteSpace: 'nowrap',
+                                    textAlign: 'center',
+                                    width: '100%',
+                                  }}
+                                  className="ExpdateBQ"
+                                >
+                                  {!hasMDate && hasEDate ? 'EXP: ' : ''}
+                                  {formatDate(record?.ExpDate)}
+                                </div>
+                              )}
+                            </div>
+                          )}
+                          {templateOptions.value === 'B' && (
+                            <div
+                              style={{
+                                width: '100%',
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                                flexDirection: forceColumnLayout
+                                  ? 'column'
+                                  : 'row',
+                              }}
+                            >
+                              {imageTagBarcodeAndQR(
+                                templateOptions.codeType === 'B'
+                                  ? '25mm'
+                                  : `${imageSize}%`,
+                                '7px',
+                                record?.QRCode || record?.ProdId
+                              )}
+                            </div>
+                          )}
+                        </div>
                       </div>
+                    );
+                  }
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => {
+                const hasProductName = !!templateOptions.productName;
+                const hasMrp = !!templateOptions.mrp;
+
+                const hasMDate =
+                  templateOptions.mDate &&
+                  detail?.ProdVariantPriceDetails?.[0]?.ManufDate;
+
+                const hasEDate =
+                  templateOptions.eDate &&
+                  detail?.ProdVariantPriceDetails?.[0]?.ExpDate;
+
+                // IMAGE SIZE LOGIC
+                let imageSize = 50;
+                if (!hasMDate && !hasEDate) {
+                  imageSize = 52;
+                }
+
+                if (!hasProductName || !hasMrp) {
+                  imageSize = 60;
+                }
+
+                if (!hasProductName && !hasMrp) {
+                  imageSize = 80;
+                }
+
+                // FLEX DIRECTION LOGIC
+                const forceColumnLayout =
+                  !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
+                return (
+                  <div
+                    className="barcode-wrapper-25x25"
+                    key={`Barcode1-${index}`}
+                  >
+                    <div className="barcode-container-25x25">
+                      {templateOptions.value === 'T' && (
+                        <div
+                          style={{
+                            width: '100%',
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            flexDirection: forceColumnLayout
+                              ? 'column'
+                              : 'row',
+                          }}
+                        >
+                          {imageTagBarcodeAndQR(
+                            templateOptions.codeType === 'B'
+                              ? '90%'
+                              : `${imageSize}%`,
+                            '7px'
+                          )}
+                        </div>
+                      )}
+                      {hasProductName && (
+                        <div
+                          style={{
+                            fontSize: '9px',
+                            textAlign: 'center',
+                            width: '100%',
+                          }}
+                          className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {nickName
+                            ? nickName
+                            : proName
+                              ? proName
+                              : 'Product Name'}
+                        </div>
+                      )}
+                      {hasMrp && (
+                        <div
+                          style={{
+                            fontSize: '9px',
+                            textAlign: 'center',
+                            width: '100%',
+                          }}
+                          className="MRPBQ"
+                        >
+                          {'₹' + detail?.MRP}
+                        </div>
+                      )}
+                      {templateOptions.value === 'C' && (
+                        <div
+                          style={{
+                            width: '100%',
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            flexDirection: forceColumnLayout
+                              ? 'column'
+                              : 'row',
+                          }}
+                        >
+                          {imageTagBarcodeAndQR(
+                            templateOptions.codeType === 'B'
+                              ? '90%'
+                              : `${imageSize}%`,
+                            '7px'
+                          )}
+                        </div>
+                      )}
+                      {(hasMDate || hasEDate) && (
+                        <div
+                          style={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            gap: '3px',
+                          }}
+                        >
+                          {hasMDate && (
+                            <div
+                              style={{
+                                fontSize: '8px',
+                                whiteSpace: 'nowrap',
+                                textAlign: 'center',
+                                width: '100%',
+                              }}
+                              className="MandateBQ"
+                            >
+                              {hasMDate && !hasEDate ? 'MFG: ' : ''}
+                              {formatDate(
+                                detail?.ProdVariantPriceDetails?.[0]
+                                  ?.ManufDate
+                              )}
+                            </div>
+                          )}
+                          {hasMDate && hasEDate && (
+                            <span style={{ fontSize: '8px' }}>|</span>
+                          )}
+                          {hasEDate && (
+                            <div
+                              style={{
+                                fontSize: '8px',
+                                whiteSpace: 'nowrap',
+                                textAlign: 'center',
+                                width: '100%',
+                              }}
+                              className="ExpdateBQ"
+                            >
+                              {!hasMDate && hasEDate ? 'EXP: ' : ''}
+                              {formatDate(
+                                detail?.ProdVariantPriceDetails?.[0]?.ExpDate
+                              )}
+                            </div>
+                          )}
+                        </div>
+                      )}
+                      {templateOptions.value === 'B' && (
+                        <div
+                          style={{
+                            width: '100%',
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            flexDirection: forceColumnLayout
+                              ? 'column'
+                              : 'row',
+                          }}
+                        >
+                          {imageTagBarcodeAndQR(
+                            templateOptions.codeType === 'B'
+                              ? '25mm'
+                              : `${imageSize}%`,
+                            '7px'
+                          )}
+                        </div>
+                      )}
                     </div>
-                  );
-                })}
+                  </div>
+                );
+              })}
           </div>
         </div>
       )}
@@ -1038,63 +1038,63 @@ const StickerPrintTemplates = ({
           <div className="grid25x50_2cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="label25x50-wrapper"
-                        key={`Barcode2-${recordIndex}-${copyIndex}`}
-                      >
-                        <div
-                          className="label25x50-container"
-                          style={valueStyleColumn}
-                        >
-                          {imageTagBarcodeAndQR(
-                            templateOptions.codeType === 'B' ? '45mm' : '16mm',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                          {templateOptions.productName && (
-                            <div
-                              className={`label25x50-name ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                            >
-                              {record?.NickName || record?.ProdName}
-                            </div>
-                          )}
-                          {templateOptions.mrp && (
-                            <div className="label25x50-mrp">
-                              {'MRP : ' + record?.MRP}
-                            </div>
-                          )}
-                        </div>
-                      </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div className="label25x50-wrapper" key={`Barcode2-${index}`}>
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
                     <div
-                      className="label25x50-container"
-                      style={valueStyleColumn}
+                      className="label25x50-wrapper"
+                      key={`Barcode2-${recordIndex}-${copyIndex}`}
                     >
-                      {imageTagBarcodeAndQR(
-                        templateOptions.codeType === 'B' ? '45mm' : '16mm'
-                      )}
-                      {templateOptions.productName && (
-                        <div
-                          className={`label25x50-name ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                        >
-                          {proName}
-                        </div>
-                      )}
-                      {templateOptions.mrp && (
-                        <div className="label25x50-mrp">
-                          {'MRP : ' + detail?.MRP}
-                        </div>
-                      )}
+                      <div
+                        className="label25x50-container"
+                        style={valueStyleColumn}
+                      >
+                        {imageTagBarcodeAndQR(
+                          templateOptions.codeType === 'B' ? '45mm' : '16mm',
+                          '6px',
+                          record?.QRCode || record?.ProdId
+                        )}
+                        {templateOptions.productName && (
+                          <div
+                            className={`label25x50-name ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                          >
+                            {record?.NickName || record?.ProdName}
+                          </div>
+                        )}
+                        {templateOptions.mrp && (
+                          <div className="label25x50-mrp">
+                            {'MRP : ' + record?.MRP}
+                          </div>
+                        )}
+                      </div>
                     </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div className="label25x50-wrapper" key={`Barcode2-${index}`}>
+                  <div
+                    className="label25x50-container"
+                    style={valueStyleColumn}
+                  >
+                    {imageTagBarcodeAndQR(
+                      templateOptions.codeType === 'B' ? '45mm' : '16mm'
+                    )}
+                    {templateOptions.productName && (
+                      <div
+                        className={`label25x50-name ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                      >
+                        {proName}
+                      </div>
+                    )}
+                    {templateOptions.mrp && (
+                      <div className="label25x50-mrp">
+                        {'MRP : ' + detail?.MRP}
+                      </div>
+                    )}
                   </div>
-                ))}
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -1103,26 +1103,136 @@ const StickerPrintTemplates = ({
         <div id="50X30Single">
           {selectedRecords?.length > 0
             ? selectedRecords?.map((record, recordIndex) => {
+              const copyCount = generateQRCodeCopy(record?.QRCode);
+
+              return Array.from({ length: copyCount })?.map(
+                (_, copyIndex) => (
+                  <div
+                    className="BarQrprint6"
+                    style={secondValueStyle}
+                    key={`Barcode3-${recordIndex}-${copyIndex}`}
+                  >
+                    <div className="BarQrprint1details flexDirection">
+                      {templateOptions.productName && (
+                        <div
+                          className={`productNameBQ ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName || record?.ProdName}
+                        </div>
+                      )}
+                      {templateOptions.mDate && record?.ManufDate && (
+                        <div
+                          style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                          className="MandateBQ"
+                        >
+                          {record?.ManufDate}
+                        </div>
+                      )}
+                      {templateOptions.eDate && record?.ExpDate && (
+                        <div
+                          style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                          className="ExpdateBQ"
+                        >
+                          {record?.ExpDate}
+                        </div>
+                      )}
+                    </div>
+                    <div
+                      className="Barcodeimage flexDirection"
+                      style={valueStyleColumn}
+                    >
+                      {imageTagBarcodeAndQR(
+                        '70%',
+                        '6px',
+                        record?.QRCode || record?.ProdId
+                      )}
+                      {templateOptions.mrp && (
+                        <div className="MRPBQ">{'MRP : ' + record?.MRP}</div>
+                      )}
+                    </div>
+                  </div>
+                )
+              );
+            })
+            : Array.from({ length: copies })?.map((_, index) => (
+              <div
+                className="BarQrprint6"
+                style={secondValueStyle}
+                key={`Barcode3-${index}`}
+              >
+                <div className="BarQrprint1details flexDirection">
+                  {templateOptions.productName && (
+                    <div
+                      className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {nickName
+                        ? nickName
+                        : proName
+                          ? proName
+                          : 'Product Name'}
+                    </div>
+                  )}
+                  {templateOptions.mDate &&
+                    detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
+                      <div
+                        style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                        className="MandateBQ"
+                      >
+                        {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
+                      </div>
+                    )}
+                  {templateOptions.eDate &&
+                    detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
+                      <div
+                        style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                        className="ExpdateBQ"
+                      >
+                        {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
+                      </div>
+                    )}
+                </div>
+                <div
+                  className="Barcodeimage flexDirection"
+                  style={valueStyleColumn}
+                >
+                  {imageTagBarcodeAndQR('70%')}
+                  {templateOptions.mrp && (
+                    <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
+                  )}
+                </div>
+              </div>
+            ))}
+        </div>
+      )}
+
+      {selectStyle == '50X25Single' && (
+        <div id="50X25Single">
+          <div className="container">
+            {selectedRecords?.length > 0
+              ? selectedRecords?.map((record, recordIndex) => {
                 const copyCount = generateQRCodeCopy(record?.QRCode);
 
                 return Array.from({ length: copyCount })?.map(
                   (_, copyIndex) => (
                     <div
-                      className="BarQrprint6"
+                      className="BarQrprint2"
                       style={secondValueStyle}
-                      key={`Barcode3-${recordIndex}-${copyIndex}`}
+                      key={`Barcode4-${recordIndex}-${copyIndex}`}
                     >
-                      <div className="BarQrprint1details flexDirection">
+                      <div
+                        className="BarQrprint1details flexDirection"
+                        style={{ width: '80%' }}
+                      >
                         {templateOptions.productName && (
                           <div
-                            className={`productNameBQ ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                            className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
                           >
                             {record?.NickName || record?.ProdName}
                           </div>
                         )}
                         {templateOptions.mDate && record?.ManufDate && (
                           <div
-                            style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                            style={{ fontSize: '10px' }}
                             className="MandateBQ"
                           >
                             {record?.ManufDate}
@@ -1130,7 +1240,7 @@ const StickerPrintTemplates = ({
                         )}
                         {templateOptions.eDate && record?.ExpDate && (
                           <div
-                            style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                            style={{ fontSize: '10px' }}
                             className="ExpdateBQ"
                           >
                             {record?.ExpDate}
@@ -1138,29 +1248,38 @@ const StickerPrintTemplates = ({
                         )}
                       </div>
                       <div
-                        className="Barcodeimage flexDirection"
-                        style={valueStyleColumn}
+                        className="Barcodeimage"
+                        style={{
+                          valueStyleColumn,
+                          width: '60%',
+                          flexDirection: 'column',
+                        }}
                       >
                         {imageTagBarcodeAndQR(
-                          '70%',
+                          '90%',
                           '6px',
                           record?.QRCode || record?.ProdId
                         )}
                         {templateOptions.mrp && (
-                          <div className="MRPBQ">{'MRP : ' + record?.MRP}</div>
+                          <div className="MRPBQ">
+                            {'MRP : ' + record?.MRP}
+                          </div>
                         )}
                       </div>
                     </div>
                   )
                 );
               })
-            : Array.from({ length: copies })?.map((_, index) => (
+              : Array.from({ length: copies })?.map((_, index) => (
                 <div
-                  className="BarQrprint6"
+                  className="BarQrprint2"
                   style={secondValueStyle}
-                  key={`Barcode3-${index}`}
+                  key={`Barcode4-${index}`}
                 >
-                  <div className="BarQrprint1details flexDirection">
+                  <div
+                    className="BarQrprint1details flexDirection"
+                    style={{ width: '80%' }}
+                  >
                     {templateOptions.productName && (
                       <div
                         className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
@@ -1175,7 +1294,7 @@ const StickerPrintTemplates = ({
                     {templateOptions.mDate &&
                       detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
                         <div
-                          style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                          style={{ fontSize: '10px' }}
                           className="MandateBQ"
                         >
                           {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
@@ -1184,7 +1303,7 @@ const StickerPrintTemplates = ({
                     {templateOptions.eDate &&
                       detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
                         <div
-                          style={{ fontSize: '8px', whiteSpace: 'nowrap' }}
+                          style={{ fontSize: '10px' }}
                           className="ExpdateBQ"
                         >
                           {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
@@ -1192,139 +1311,20 @@ const StickerPrintTemplates = ({
                       )}
                   </div>
                   <div
-                    className="Barcodeimage flexDirection"
-                    style={valueStyleColumn}
+                    className="Barcodeimage"
+                    style={{
+                      valueStyleColumn,
+                      width: '60%',
+                      flexDirection: 'column',
+                    }}
                   >
-                    {imageTagBarcodeAndQR('70%')}
+                    {imageTagBarcodeAndQR('90%')}
                     {templateOptions.mrp && (
                       <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
                     )}
                   </div>
                 </div>
               ))}
-        </div>
-      )}
-
-      {selectStyle == '50X25Single' && (
-        <div id="50X25Single">
-          <div className="container">
-            {selectedRecords?.length > 0
-              ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="BarQrprint2"
-                        style={secondValueStyle}
-                        key={`Barcode4-${recordIndex}-${copyIndex}`}
-                      >
-                        <div
-                          className="BarQrprint1details flexDirection"
-                          style={{ width: '80%' }}
-                        >
-                          {templateOptions.productName && (
-                            <div
-                              className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                            >
-                              {record?.NickName || record?.ProdName}
-                            </div>
-                          )}
-                          {templateOptions.mDate && record?.ManufDate && (
-                            <div
-                              style={{ fontSize: '10px' }}
-                              className="MandateBQ"
-                            >
-                              {record?.ManufDate}
-                            </div>
-                          )}
-                          {templateOptions.eDate && record?.ExpDate && (
-                            <div
-                              style={{ fontSize: '10px' }}
-                              className="ExpdateBQ"
-                            >
-                              {record?.ExpDate}
-                            </div>
-                          )}
-                        </div>
-                        <div
-                          className="Barcodeimage"
-                          style={{
-                            valueStyleColumn,
-                            width: '60%',
-                            flexDirection: 'column',
-                          }}
-                        >
-                          {imageTagBarcodeAndQR(
-                            '90%',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                          {templateOptions.mrp && (
-                            <div className="MRPBQ">
-                              {'MRP : ' + record?.MRP}
-                            </div>
-                          )}
-                        </div>
-                      </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="BarQrprint2"
-                    style={secondValueStyle}
-                    key={`Barcode4-${index}`}
-                  >
-                    <div
-                      className="BarQrprint1details flexDirection"
-                      style={{ width: '80%' }}
-                    >
-                      {templateOptions.productName && (
-                        <div
-                          className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                        >
-                          {nickName
-                            ? nickName
-                            : proName
-                              ? proName
-                              : 'Product Name'}
-                        </div>
-                      )}
-                      {templateOptions.mDate &&
-                        detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
-                          <div
-                            style={{ fontSize: '10px' }}
-                            className="MandateBQ"
-                          >
-                            {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
-                          </div>
-                        )}
-                      {templateOptions.eDate &&
-                        detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
-                          <div
-                            style={{ fontSize: '10px' }}
-                            className="ExpdateBQ"
-                          >
-                            {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
-                          </div>
-                        )}
-                    </div>
-                    <div
-                      className="Barcodeimage"
-                      style={{
-                        valueStyleColumn,
-                        width: '60%',
-                        flexDirection: 'column',
-                      }}
-                    >
-                      {imageTagBarcodeAndQR('90%')}
-                      {templateOptions.mrp && (
-                        <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
-                      )}
-                    </div>
-                  </div>
-                ))}
           </div>
         </div>
       )}
@@ -1334,57 +1334,57 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="BarQrprint9"
-                        key={`Barcode5-${recordIndex}-${copyIndex}`}
-                        style={valueStyleRow}
-                      >
-                        {imageTagBarcodeAndQR(
-                          'auto',
-                          '6px',
-                          record?.QRCode || record?.ProdId
+                const copyCount = generateQRCodeCopy(record?.QRCode);
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="BarQrprint9"
+                      key={`Barcode5-${recordIndex}-${copyIndex}`}
+                      style={valueStyleRow}
+                    >
+                      {imageTagBarcodeAndQR(
+                        'auto',
+                        '6px',
+                        record?.QRCode || record?.ProdId
+                      )}
+                      <div className="BarQrprint1details1">
+                        {templateOptions.productName && (
+                          <div style={{ fontSize: '8px' }}>
+                            {'Product Name :' +
+                              (record?.NickName || record?.ProdName)}
+                          </div>
+                        )}
+                        {templateOptions.sellingPrice && (
+                          <div style={{ fontSize: '8px' }}>
+                            {'Selling Price :' + record?.SellPrice}
+                          </div>
                         )}
-                        <div className="BarQrprint1details1">
-                          {templateOptions.productName && (
-                            <div style={{ fontSize: '8px' }}>
-                              {'Product Name :' +
-                                (record?.NickName || record?.ProdName)}
-                            </div>
-                          )}
-                          {templateOptions.sellingPrice && (
-                            <div style={{ fontSize: '8px' }}>
-                              {'Selling Price :' + record?.SellPrice}
-                            </div>
-                          )}
-                        </div>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="BarQrprint9"
-                    key={`Barcode5-${index}`}
-                    style={valueStyleRow}
-                  >
-                    {imageTagBarcodeAndQR()}
-                    <div className="BarQrprint1details1">
-                      {templateOptions.productName && (
-                        <div style={{ fontSize: '8px' }}>
-                          {'Product Name :' + proName}
-                        </div>
-                      )}
-                      {templateOptions.sellingPrice && (
-                        <div style={{ fontSize: '8px' }}>
-                          {'Selling Price :' + detail?.SellPrice}
-                        </div>
-                      )}
                     </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="BarQrprint9"
+                  key={`Barcode5-${index}`}
+                  style={valueStyleRow}
+                >
+                  {imageTagBarcodeAndQR()}
+                  <div className="BarQrprint1details1">
+                    {templateOptions.productName && (
+                      <div style={{ fontSize: '8px' }}>
+                        {'Product Name :' + proName}
+                      </div>
+                    )}
+                    {templateOptions.sellingPrice && (
+                      <div style={{ fontSize: '8px' }}>
+                        {'Selling Price :' + detail?.SellPrice}
+                      </div>
+                    )}
                   </div>
-                ))}
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -1394,74 +1394,74 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
+                const copyCount = generateQRCodeCopy(record?.QRCode);
 
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="BarQrprint1"
-                        style={valueStyleRow}
-                        key={`Barcode6-${recordIndex}-${copyIndex}`}
-                      >
-                        <div className="BarQrprint1details flexDirection">
-                          {templateOptions.productName && (
-                            <div
-                              className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                            >
-                              {'Product Name: ' +
-                                (record?.NickName || record?.ProdName)}
-                            </div>
-                          )}
-                          {templateOptions.mrp && (
-                            <div className="MRPBQ">
-                              {'MRP : ' + record?.MRP}
-                            </div>
-                          )}
-                          {templateOptions.sellingPrice && (
-                            <div className="SellingpriceBQ">
-                              {'Selling Price :' + record?.SellPrice}
-                            </div>
-                          )}
-                        </div>
-                        <div className="Qrcodeimage" style={{ width: '50%' }}>
-                          {imageTagBarcodeAndQR(
-                            'auto',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                        </div>
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="BarQrprint1"
+                      style={valueStyleRow}
+                      key={`Barcode6-${recordIndex}-${copyIndex}`}
+                    >
+                      <div className="BarQrprint1details flexDirection">
+                        {templateOptions.productName && (
+                          <div
+                            className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                          >
+                            {'Product Name: ' +
+                              (record?.NickName || record?.ProdName)}
+                          </div>
+                        )}
+                        {templateOptions.mrp && (
+                          <div className="MRPBQ">
+                            {'MRP : ' + record?.MRP}
+                          </div>
+                        )}
+                        {templateOptions.sellingPrice && (
+                          <div className="SellingpriceBQ">
+                            {'Selling Price :' + record?.SellPrice}
+                          </div>
+                        )}
                       </div>
-                    )
-                  );
-                })
+                      <div className="Qrcodeimage" style={{ width: '50%' }}>
+                        {imageTagBarcodeAndQR(
+                          'auto',
+                          '6px',
+                          record?.QRCode || record?.ProdId
+                        )}
+                      </div>
+                    </div>
+                  )
+                );
+              })
               : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="BarQrprint1"
-                    style={valueStyleRow}
-                    key={`Barcode6-${index}`}
-                  >
-                    <div className="BarQrprint1details flexDirection">
-                      {templateOptions.productName && (
-                        <div
-                          className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                        >
-                          {'Product Name' + proName}
-                        </div>
-                      )}
-                      {templateOptions.mrp && (
-                        <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
-                      )}
-                      {templateOptions.sellingPrice && (
-                        <div className="SellingpriceBQ">
-                          {'Selling Price :' + detail?.SellPrice}
-                        </div>
-                      )}
-                    </div>
-                    <div className="Qrcodeimage" style={{ width: '50%' }}>
-                      {imageTagBarcodeAndQR()}
-                    </div>
+                <div
+                  className="BarQrprint1"
+                  style={valueStyleRow}
+                  key={`Barcode6-${index}`}
+                >
+                  <div className="BarQrprint1details flexDirection">
+                    {templateOptions.productName && (
+                      <div
+                        className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                      >
+                        {'Product Name' + proName}
+                      </div>
+                    )}
+                    {templateOptions.mrp && (
+                      <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
+                    )}
+                    {templateOptions.sellingPrice && (
+                      <div className="SellingpriceBQ">
+                        {'Selling Price :' + detail?.SellPrice}
+                      </div>
+                    )}
                   </div>
-                ))}
+                  <div className="Qrcodeimage" style={{ width: '50%' }}>
+                    {imageTagBarcodeAndQR()}
+                  </div>
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -1470,124 +1470,124 @@ const StickerPrintTemplates = ({
           <div className="container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
+                const copyCount = generateQRCodeCopy(record?.QRCode);
 
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="BarQrprint7"
+                      style={secondValueStyle}
+                      key={`Barcode7-${recordIndex}-${copyIndex}`}
+                    >
                       <div
-                        className="BarQrprint7"
-                        style={secondValueStyle}
-                        key={`Barcode7-${recordIndex}-${copyIndex}`}
+                        className="BarQrprint1details1"
+                        style={{ gap: '10px' }}
                       >
-                        <div
-                          className="BarQrprint1details1"
-                          style={{ gap: '10px' }}
-                        >
-                          {templateOptions.productName && (
-                            <div
-                              className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                            >
-                              {'Product Name: ' +
-                                (record?.NickName || record?.ProdName)}
-                            </div>
-                          )}
-                          {templateOptions.sellingPrice && (
-                            <div className="SellingpriceBQ">
-                              {'Selling Price :' + record?.SellPrice}
-                            </div>
-                          )}
-                          {templateOptions.mDate && record?.ManufDate && (
-                            <div className="MandateBQ">{record?.ManufDate}</div>
-                          )}
-                          {templateOptions.eDate && record?.ExpDate && (
-                            <div className="ExpdateBQ">{record?.ExpDate}</div>
-                          )}
-                          {templateOptions.color && (
-                            <div className="ColorBQ">
-                              {record?.Color || colorText}
-                            </div>
-                          )}
-                        </div>
-                        <div
-                          className="Barcodeimage"
-                          style={{
-                            valueStyleColumn,
-                            width: '50%',
-                            flexDirection: 'column',
-                          }}
-                        >
-                          {
-                            <div>
-                              {imageTagBarcodeAndQR(
-                                '70%',
-                                '6px',
-                                record?.QRCode || record?.ProdId
-                              )}
-                            </div>
-                          }
-                          {templateOptions.mrp && (
-                            <div className="MRPBQ">
-                              {'MRP : ' + record?.MRP}
-                            </div>
-                          )}
-                        </div>
+                        {templateOptions.productName && (
+                          <div
+                            className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                          >
+                            {'Product Name: ' +
+                              (record?.NickName || record?.ProdName)}
+                          </div>
+                        )}
+                        {templateOptions.sellingPrice && (
+                          <div className="SellingpriceBQ">
+                            {'Selling Price :' + record?.SellPrice}
+                          </div>
+                        )}
+                        {templateOptions.mDate && record?.ManufDate && (
+                          <div className="MandateBQ">{record?.ManufDate}</div>
+                        )}
+                        {templateOptions.eDate && record?.ExpDate && (
+                          <div className="ExpdateBQ">{record?.ExpDate}</div>
+                        )}
+                        {templateOptions.color && (
+                          <div className="ColorBQ">
+                            {record?.Color || colorText}
+                          </div>
+                        )}
                       </div>
-                    )
-                  );
-                })
+                      <div
+                        className="Barcodeimage"
+                        style={{
+                          valueStyleColumn,
+                          width: '50%',
+                          flexDirection: 'column',
+                        }}
+                      >
+                        {
+                          <div>
+                            {imageTagBarcodeAndQR(
+                              '70%',
+                              '6px',
+                              record?.QRCode || record?.ProdId
+                            )}
+                          </div>
+                        }
+                        {templateOptions.mrp && (
+                          <div className="MRPBQ">
+                            {'MRP : ' + record?.MRP}
+                          </div>
+                        )}
+                      </div>
+                    </div>
+                  )
+                );
+              })
               : Array.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="BarQrprint7"
+                  style={secondValueStyle}
+                  key={`Barcode7-${index}`}
+                >
                   <div
-                    className="BarQrprint7"
-                    style={secondValueStyle}
-                    key={`Barcode7-${index}`}
+                    className="BarQrprint1details1"
+                    style={{ gap: '10px' }}
                   >
-                    <div
-                      className="BarQrprint1details1"
-                      style={{ gap: '10px' }}
-                    >
-                      {templateOptions.productName && (
-                        <div
-                          className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                        >
-                          {'Product Name' + (nickName ? nickName : proName)}
+                    {templateOptions.productName && (
+                      <div
+                        className={`productNameBQ ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                      >
+                        {'Product Name' + (nickName ? nickName : proName)}
+                      </div>
+                    )}
+                    {templateOptions.sellingPrice && (
+                      <div className="SellingpriceBQ">
+                        {'Selling Price :' + detail?.SellPrice}
+                      </div>
+                    )}
+                    {templateOptions.mDate &&
+                      detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
+                        <div className="MandateBQ">
+                          {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
                         </div>
                       )}
-                      {templateOptions.sellingPrice && (
-                        <div className="SellingpriceBQ">
-                          {'Selling Price :' + detail?.SellPrice}
+                    {templateOptions.eDate &&
+                      detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
+                        <div className="ExpdateBQ">
+                          {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
                         </div>
                       )}
-                      {templateOptions.mDate &&
-                        detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
-                          <div className="MandateBQ">
-                            {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
-                          </div>
-                        )}
-                      {templateOptions.eDate &&
-                        detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
-                          <div className="ExpdateBQ">
-                            {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
-                          </div>
-                        )}
-                      {templateOptions.color && (
-                        <div className="ColorBQ">{colorText}</div>
-                      )}
-                    </div>
-                    <div
-                      className="Barcodeimage"
-                      style={{
-                        valueStyleColumn,
-                        width: '50%',
-                        flexDirection: 'column',
-                      }}
-                    >
-                      {<div>{imageTagBarcodeAndQR('70%')}</div>}
-                      {templateOptions.mrp && (
-                        <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
-                      )}
-                    </div>
+                    {templateOptions.color && (
+                      <div className="ColorBQ">{colorText}</div>
+                    )}
                   </div>
-                ))}
+                  <div
+                    className="Barcodeimage"
+                    style={{
+                      valueStyleColumn,
+                      width: '50%',
+                      flexDirection: 'column',
+                    }}
+                  >
+                    {<div>{imageTagBarcodeAndQR('70%')}</div>}
+                    {templateOptions.mrp && (
+                      <div className="MRPBQ">{'MRP : ' + detail?.MRP}</div>
+                    )}
+                  </div>
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -1596,102 +1596,102 @@ const StickerPrintTemplates = ({
           <div className="label-15x15-container">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
+                const copyCount = generateQRCodeCopy(record?.QRCode);
 
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
-                      <div
-                        className="label-15x15-content"
-                        key={`Barcode8-${recordIndex}-${copyIndex}`}
-                      >
-                        {templateOptions.value === 'T' &&
-                          imageTagBarcodeAndQR(
-                            templateOptions.codeType === 'B' ? '100%' : '6mm',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                        {templateOptions.productName && (
-                          <div
-                            className={`label-15x15-name ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
-                          >
-                            {record?.NickName
-                              ? record?.NickName
-                              : record?.ProdName}
-                          </div>
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="label-15x15-content"
+                      key={`Barcode8-${recordIndex}-${copyIndex}`}
+                    >
+                      {templateOptions.value === 'T' &&
+                        imageTagBarcodeAndQR(
+                          templateOptions.codeType === 'B' ? '100%' : '6mm',
+                          '6px',
+                          record?.QRCode || record?.ProdId
                         )}
-                        {templateOptions.value === 'C' &&
-                          imageTagBarcodeAndQR(
-                            templateOptions.codeType === 'B'
-                              ? '80%'
-                              : !templateOptions.productName &&
-                                  !templateOptions.mrp
-                                ? '80%'
-                                : '35%',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                        {templateOptions.mrp && (
-                          <div
-                            style={{
-                              width: '100%',
-                              textAlign: 'center',
-                              fontSize: '6px',
-                            }}
-                            className="MRPBQ"
-                          >
-                            {'₹:' + record?.MRP}
-                          </div>
-                        )}
-                        {templateOptions.value === 'B' &&
-                          imageTagBarcodeAndQR(
-                            templateOptions.codeType === 'B' ? '100%' : '50%',
-                            '6px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                      </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="label-15x15-content"
-                    key={`Barcode8-${index}`}
-                  >
-                    {templateOptions.value === 'T' &&
-                      imageTagBarcodeAndQR(
-                        templateOptions.codeType === 'B' ? '100%' : '6mm'
+                      {templateOptions.productName && (
+                        <div
+                          className={`label-15x15-name ${record?.NickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
+                        >
+                          {record?.NickName
+                            ? record?.NickName
+                            : record?.ProdName}
+                        </div>
                       )}
-                    {templateOptions.productName && (
-                      <div
-                        className={`label-15x15-name ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                      >
-                        {nickName
-                          ? nickName
-                          : proName
-                            ? proName
-                            : 'Product Name'}
-                      </div>
-                    )}
-                    {templateOptions.value === 'C' &&
-                      imageTagBarcodeAndQR(
-                        templateOptions.codeType === 'B'
-                          ? '80%'
-                          : !templateOptions.productName && !templateOptions.mrp
+                      {templateOptions.value === 'C' &&
+                        imageTagBarcodeAndQR(
+                          templateOptions.codeType === 'B'
                             ? '80%'
-                            : '7.5mm',
-                        '5px'
+                            : !templateOptions.productName &&
+                              !templateOptions.mrp
+                              ? '80%'
+                              : '35%',
+                          '6px',
+                          record?.QRCode || record?.ProdId
+                        )}
+                      {templateOptions.mrp && (
+                        <div
+                          style={{
+                            width: '100%',
+                            textAlign: 'center',
+                            fontSize: '6px',
+                          }}
+                          className="MRPBQ"
+                        >
+                          {'₹:' + record?.MRP}
+                        </div>
                       )}
-                    {templateOptions.mrp && (
-                      <div className="label-15x15-mrp">
-                        {'₹:' + (detail?.MRP ? detail?.MRP : 10.0)}
-                      </div>
+                      {templateOptions.value === 'B' &&
+                        imageTagBarcodeAndQR(
+                          templateOptions.codeType === 'B' ? '100%' : '50%',
+                          '6px',
+                          record?.QRCode || record?.ProdId
+                        )}
+                    </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="label-15x15-content"
+                  key={`Barcode8-${index}`}
+                >
+                  {templateOptions.value === 'T' &&
+                    imageTagBarcodeAndQR(
+                      templateOptions.codeType === 'B' ? '100%' : '6mm'
                     )}
-                    {templateOptions.value === 'B' &&
-                      imageTagBarcodeAndQR(
-                        templateOptions.codeType === 'B' ? '100%' : '7.5mm'
-                      )}
-                  </div>
-                ))}
+                  {templateOptions.productName && (
+                    <div
+                      className={`label-15x15-name ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
+                    >
+                      {nickName
+                        ? nickName
+                        : proName
+                          ? proName
+                          : 'Product Name'}
+                    </div>
+                  )}
+                  {templateOptions.value === 'C' &&
+                    imageTagBarcodeAndQR(
+                      templateOptions.codeType === 'B'
+                        ? '80%'
+                        : !templateOptions.productName && !templateOptions.mrp
+                          ? '80%'
+                          : '7.5mm',
+                      '5px'
+                    )}
+                  {templateOptions.mrp && (
+                    <div className="label-15x15-mrp">
+                      {'₹:' + (detail?.MRP ? detail?.MRP : 10.0)}
+                    </div>
+                  )}
+                  {templateOptions.value === 'B' &&
+                    imageTagBarcodeAndQR(
+                      templateOptions.codeType === 'B' ? '100%' : '7.5mm'
+                    )}
+                </div>
+              ))}
           </div>
         </div>
       )}
@@ -1701,36 +1701,36 @@ const StickerPrintTemplates = ({
           <div className="grid22x35_3cross">
             {selectedRecords?.length > 0
               ? selectedRecords?.map((record, recordIndex) => {
-                  const copyCount = generateQRCodeCopy(record?.QRCode);
+                const copyCount = generateQRCodeCopy(record?.QRCode);
 
-                  return Array.from({ length: copyCount })?.map(
-                    (_, copyIndex) => (
+                return Array.from({ length: copyCount })?.map(
+                  (_, copyIndex) => (
+                    <div
+                      className="barcode-wrapper-22x35"
+                      key={`Barcode9-${recordIndex}-${copyIndex}`}
+                    >
                       <div
-                        className="barcode-wrapper-22x35"
-                        key={`Barcode9-${recordIndex}-${copyIndex}`}
+                        className="barcode-container-22x35"
+                        style={{
+                          alignItems: 'center',
+                          flexDirection:
+                            templateOptions.value === 'T'
+                              ? 'column'
+                              : 'column-reverse',
+                        }}
                       >
-                        <div
-                          className="barcode-container-22x35"
-                          style={{
-                            alignItems: 'center',
-                            flexDirection:
-                              templateOptions.value === 'T'
-                                ? 'column'
-                                : 'column-reverse',
-                          }}
-                        >
-                          {imageTagBarcodeAndQR(
-                            templateOptions.codeType === 'B'
-                              ? '100%'
-                              : !templateOptions.mrp &&
-                                  !templateOptions.productName
-                                ? '60%'
-                                : '40%',
-                            '8px',
-                            record?.QRCode || record?.ProdId
-                          )}
-                          {(templateOptions.productName ||
-                            templateOptions.mrp) && (
+                        {imageTagBarcodeAndQR(
+                          templateOptions.codeType === 'B'
+                            ? '100%'
+                            : !templateOptions.mrp &&
+                              !templateOptions.productName
+                              ? '60%'
+                              : '40%',
+                          '8px',
+                          record?.QRCode || record?.ProdId
+                        )}
+                        {(templateOptions.productName ||
+                          templateOptions.mrp) && (
                             <div
                               style={{
                                 display: 'flex',
@@ -1757,66 +1757,67 @@ const StickerPrintTemplates = ({
                               )}
                             </div>
                           )}
-                        </div>
                       </div>
-                    )
-                  );
-                })
-              : Array.from({ length: copies })?.map((_, index) => (
-                  <div
-                    className="barcode-wrapper-22x35"
-                    key={`Barcode9-${index}`}
-                  >
-                    <div
-                      className="barcode-container-22x35"
-                      style={{
-                        alignItems: 'center',
-                        flexDirection:
-                          templateOptions.value === 'T'
-                            ? 'column'
-                            : 'column-reverse',
-                      }}
-                    >
-                      {imageTagBarcodeAndQR(
-                        templateOptions.codeType === 'B'
-                          ? '100%'
-                          : !templateOptions.mrp && !templateOptions.productName
-                            ? '60%'
-                            : '40%',
-                        '8px'
-                      )}
-                      {(templateOptions.productName || templateOptions.mrp) && (
-                        <div
-                          style={{
-                            display: 'flex',
-                            flexDirection: 'column',
-                            alignItems: 'center',
-                            justifyContent: 'center',
-                          }}
-                        >
-                          {templateOptions.productName && (
-                            <div
-                              className={`productNameBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'} ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
-                            >
-                              {nickName
-                                ? nickName
-                                : proName
-                                  ? proName
-                                  : 'Product Name'}
-                            </div>
-                          )}
-                          {templateOptions.mrp && (
-                            <div
-                              className={`MRPBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'}`}
-                            >
-                              {'MRP : ' + detail?.MRP}
-                            </div>
-                          )}
-                        </div>
-                      )}
                     </div>
+                  )
+                );
+              })
+              : Array.from({ length: copies })?.map((_, index) => (
+                <div
+                  className="barcode-wrapper-22x35"
+                  key={`Barcode9-${index}`}
+                >
+                  <div
+                    className="barcode-container-22x35"
+                    style={{
+                      alignItems: 'center',
+                      flexDirection:
+                        templateOptions.value === 'T'
+                          ? 'column'
+                          : 'column-reverse',
+                    }}
+                  >
+                    {imageTagBarcodeAndQR(
+                      templateOptions.codeType === 'B'
+                        ? '100%'
+                        : !templateOptions.mrp && !templateOptions.productName
+                          ? '60%'
+                          : '40%',
+                      '8px'
+                    )}
+                    {(templateOptions.productName || templateOptions.mrp) && (
+                      <div
+                        style={{
+                          display: 'flex',
+                          flexDirection: 'column',
+                          alignItems: 'center',
+                          justifyContent: 'center',
+                          width: '100%',
+                        }}
+                      >
+                        {templateOptions.productName && (
+                          <div
+                            className={`productNameBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'} ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis2' : ''}`}
+                          >
+                            {nickName
+                              ? nickName
+                              : proName
+                                ? proName
+                                : 'Product Name'}
+                          </div>
+                        )}
+                        {templateOptions.mrp && (
+                          <div
+                            className={`MRPBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'}`}
+                          >
+                            {'MRP : ' + detail?.MRP}
+                          </div>
+                        )}
+                      </div>
+                    )}
                   </div>
-                ))}
+                </div>
+              ))}
           </div>
         </div>
       )}
diff --git a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
index a787009..1712d21 100644
--- a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
+++ b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
@@ -1182,7 +1182,8 @@ const PaymentPdfBooking = ({
                 <span>{'Adjustment Amount'}</span>
                 <span>
                   {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
-                  {(lastTransaction?.Amount || 0).toFixed(2)}
+                  {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+  (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                 </span>
               </div>
               <div style={{ display: 'flex', justifyContent: 'space-between' }}>