diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
index 90b40ab..a1c225b 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
@@ -57,6 +57,7 @@ const InvoiceTemplate = ({
   isPdf,
   sportsAppPreference,
   MembershipApplied = null,
+  SalesModePref,
 }) => {
   const dispatch = useDispatch();
   const GlobalUpiID = useSelector(GlobalUpiIDprint);
@@ -104,7 +105,8 @@ const InvoiceTemplate = ({
     )?.SettingValue === 'Y';
   const estimateTitle =
     SettingData?.[0]?.SettingDtlDetails?.find(
-      (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
+      (setting) =>
+        setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
     )?.SettingValue === 'Y';
   const keysLength = Object.keys(table2Data ?? {}).length;
   console.log(GlobalDiscount, Discount, 'Discount');
@@ -156,7 +158,7 @@ const InvoiceTemplate = ({
   let PaymentStatusSuccess = PaymentStatus?.filter(
     (ps) => ps.PaymentStatus === 'S'
   );
-  const isEditedBill = PaymentStatus?.some((payment) => {
+  const isEditedBill = PaymentStatus?.some(payment => {
     const type = payment?.AdjustmentType?.toLowerCase();
     return (
       (type === 'extra' || type === 'refund') &&
@@ -166,15 +168,15 @@ const InvoiceTemplate = ({
   });
   const lastTransaction = PaymentStatus?.find(
     (ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
-  );
+  )
   const TakeawayTotal = TakeawayData?.reduce(
     (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
-    0
+    0,
   );
   const PackageDetails = table2Data?.PackageDtl;
   const DineInTotal = DineInData?.reduce(
     (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
-    0
+    0,
   );
   const aggregatedPayments = PaymentStatusSuccess?.reduce(
     (acc, paymentdata) => {
@@ -189,7 +191,7 @@ const InvoiceTemplate = ({
 
       return acc;
     },
-    {}
+    {},
   );
   const productsData = table2Data?.productDetails || [];
   const offers = table2Data?.OrderOfferDetails || [];
@@ -353,7 +355,7 @@ const InvoiceTemplate = ({
   const companyName = table2Data?.CompName;
   const companyAddress =
     table2Data?.AddressDetails?.[0]?.Address1 +
-      (table2Data?.AddressDetails?.[0]?.Address2 || '') ||
+    (table2Data?.AddressDetails?.[0]?.Address2 || '') ||
     '#589, 2nd floor, VP Chambers, 1st cross, 3rd block, Koramangala, Bengaluru- 560034.';
   const companyPhone =
     table2Data?.BrMobile + ',' + table2Data?.BrMobile2 !== null
@@ -844,8 +846,8 @@ const InvoiceTemplate = ({
                     flexDirection: 'column',
                     justifyContent:
                       chunkIndex === paginatedChunks.length - 1 &&
-                      !shouldFooterBeOnNewPage &&
-                      FormatTheme
+                        !shouldFooterBeOnNewPage &&
+                        FormatTheme
                         ? 'space-between'
                         : '',
                     height: FormatTheme
@@ -900,7 +902,7 @@ const InvoiceTemplate = ({
                               </div>
                             )}
                             {base64Image &&
-                            (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
+                              (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
                               <img
                                 src={base64Image}
                                 alt="Brand Logo"
@@ -941,11 +943,15 @@ const InvoiceTemplate = ({
                           {GlobaldummyData
                             ? '121'
                             : table2Data?.OrderId &&
-                              extractLastNumberOrderId(
-                                table2Data?.OrderId,
-                                table2Data?.FYStatus
-                              )}
+                            extractLastNumberOrderId(
+                              table2Data?.OrderId,
+                              table2Data?.FYStatus
+                            )}
                         </div>
+                        {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', margin: '0rem 0rem', fontWeight: '600' }}>
+                          {' '}
+                          Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+                        </div>}
                       </div>
                     )}
 
@@ -982,7 +988,7 @@ const InvoiceTemplate = ({
                               ? BillName
                               : PaymentStatusSuccess?.length === 1
                                 ? PaymentStatusSuccess?.[0]?.PaymentTypeName +
-                                  ' Bill'
+                                ' Bill'
                                 : ''}
                         </div>
                       )}
@@ -1087,146 +1093,146 @@ const InvoiceTemplate = ({
                           <tr className="table-header">
                             {GlobaldummyData
                               ? GlobalSlNo && (
-                                  <th className="table-header-cell">S.No</th>
-                                )
+                                <th className="table-header-cell">S.No</th>
+                              )
                               : SLNO == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'center',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    S.No
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'center',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  S.No
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalItem && (
-                                  <th className="table-header-cell">Item</th>
-                                )
+                                <th className="table-header-cell">Item</th>
+                              )
                               : Item == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{ fontFamily: 'sans-serif' }}
-                                  >
-                                    Item
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{ fontFamily: 'sans-serif' }}
+                                >
+                                  Item
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalHsnCode && (
-                                  <th className="table-header-cell">HSN </th>
-                                )
+                                <th className="table-header-cell">HSN </th>
+                              )
                               : HsnCode == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{ fontFamily: 'sans-serif' }}
-                                  >
-                                    HSN{' '}
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{ fontFamily: 'sans-serif' }}
+                                >
+                                  HSN{' '}
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalQuantity && (
-                                  <th className="table-header-cell">Qty</th>
-                                )
+                                <th className="table-header-cell">Qty</th>
+                              )
                               : Quantity == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'center',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    {' '}
-                                    {WeightasKg ? 'Qty/Kg' : 'Qty'}
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'center',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  {' '}
+                                  {WeightasKg ? 'Qty/Kg' : 'Qty'}
+                                </th>
+                              )}
 
                             {/* <th className="table-header-cell">UOM</th>
                   <th className="table-header-cell">UOM</th> */}
 
                             {GlobaldummyData
                               ? GlobalMRP && (
-                                  <th className="table-header-cell">MRP</th>
-                                )
+                                <th className="table-header-cell">MRP</th>
+                              )
                               : MRP == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'right',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    MRP
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'right',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  MRP
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalRate && (
-                                  <th className="table-header-cell">Rate</th>
-                                )
+                                <th className="table-header-cell">Rate</th>
+                              )
                               : Rate == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'right',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    Rate
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'right',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  Rate
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalDiscount && (
-                                  <th className="table-header-cell">Dis</th>
-                                )
+                                <th className="table-header-cell">Dis</th>
+                              )
                               : Discount == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'right',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    Dis
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'right',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  Dis
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalTax && (
-                                  <th className="table-header-cell">Tax %</th>
-                                )
+                                <th className="table-header-cell">Tax %</th>
+                              )
                               : Tax &&
-                                table2Data?.OrderType !== 'E' && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'right',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    Tax %
-                                  </th>
-                                )}
+                              table2Data?.OrderType !== 'E' && (
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'right',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  Tax %
+                                </th>
+                              )}
 
                             {GlobaldummyData
                               ? GlobalAmount && (
-                                  <th className="table-header-cell">Amount</th>
-                                )
+                                <th className="table-header-cell">Amount</th>
+                              )
                               : Amount == true && (
-                                  <th
-                                    className="table-header-cell"
-                                    style={{
-                                      textAlign: 'right',
-                                      fontFamily: 'sans-serif',
-                                    }}
-                                  >
-                                    Amount
-                                  </th>
-                                )}
+                                <th
+                                  className="table-header-cell"
+                                  style={{
+                                    textAlign: 'right',
+                                    fontFamily: 'sans-serif',
+                                  }}
+                                >
+                                  Amount
+                                </th>
+                              )}
                           </tr>
                         </thead>
                         <tbody>
@@ -1235,251 +1241,241 @@ const InvoiceTemplate = ({
                               <tr key={idx} className="table-row">
                                 {GlobaldummyData
                                   ? GlobalSlNo && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'center' }}
-                                      >
-                                        {chunkIndex * chunkSize + idx + 1}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'center' }}
+                                    >
+                                      {chunkIndex * chunkSize + idx + 1}
+                                    </td>
+                                  )
                                   : SLNO == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'center',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {chunkIndex * chunkSize + idx + 1}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'center',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {chunkIndex * chunkSize + idx + 1}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalItem && (
-                                      <td className="table-header-cell">
-                                        {item?.ProdName}
-                                      </td>
-                                    )
+                                    <td className="table-header-cell">
+                                      {item?.ProdName}
+                                    </td>
+                                  )
                                   : Item == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          display: 'flex',
-                                          flexDirection: 'column',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        <div>{item?.ProdName}</div>
-                                        {PackageDetails?.filter(
-                                          (pkg) => pkg.ProdId === item.ProdId
-                                        ).length > 0 ? (
-                                          <div>
-                                            {PackageDetails?.filter(
-                                              (pkg) =>
-                                                pkg.ProdId === item.ProdId
-                                            )?.map((item, index) => (
-                                              <span
-                                                key={index}
-                                                style={{ display: 'block' }}
-                                              >
-                                                {item.ParcelCount} PCS{' '}
-                                                {item.ParcelQty} PACK (
-                                                {item.ParcelType})
-                                              </span>
-                                            ))}
-                                          </div>
-                                        ) : (
-                                          UomPrint?.SettingValue === 'Y' && (
-                                            <div>
-                                              ({item?.Size ? item?.Size : '1'}{' '}
-                                              {item?.SinglePc == 'Y'
-                                                ? 'PCS'
-                                                : item?.Type != 'C'
-                                                  ? item?.UomName
-                                                  : 'COMBO'}
-                                              )
-                                            </div>
-                                          )
-                                        )}
-                                        &nbsp;{' '}
-                                        {item?.BrandName !== null
-                                          ? item?.BrandName
-                                          : ''}
-                                        &nbsp;
-                                        {item?.ProductIdentifierDtls?.length > 0
-                                          ? item?.ProductIdentifierDtls?.filter(
-                                              (items) =>
-                                                !(
-                                                  items.SerialNumber == '' ||
-                                                  items.SerialNumber == null
-                                                )
-                                            )?.map((a) => {
-                                              return (
-                                                <div>{a.SerialNumber}</div>
-                                              );
-                                            })
-                                          : ''}{' '}
-                                        {item?.ProductIdentifierDtls?.length > 0
-                                          ? item?.ProductIdentifierDtls.filter(
-                                              (item1) =>
-                                                item1.IMEI1 !== '' ||
-                                                item1.IMEI2 !== ''
-                                            )?.map((item2) => {
-                                              const imei1 = item2.IMEI1 || '';
-                                              const imei2 = item2.IMEI2 || '';
-                                              return (
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        display: "flex",
+                                        flexDirection: "column",
+                                        fontFamily: "sans-serif",
+                                      }}
+                                    >
+                                      {/* Product Name */}
+                                      <div>{item?.ProdName}</div>
+
+                                      {(() => {
+                                        const packages =
+                                          PackageDetails?.filter(pkg => pkg.ProdId === item.ProdId) || [];
+
+                                        const identifiers = item?.ProductIdentifierDtls || [];
+
+                                        return (
+                                          <>
+                                            {/* Package OR Size */}
+                                            {packages.length > 0 ? (
+                                              <div>
+                                                {packages.map((pkg, index) => (
+                                                  <span key={index} style={{ display: "block" }}>
+                                                    {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+                                                  </span>
+                                                ))}
+                                              </div>
+                                            ) : (
+                                              UomPrint?.SettingValue === 'Y' && (
                                                 <div>
-                                                  {[imei1, imei2]
-                                                    .filter(Boolean)
-                                                    .join(',')}
+                                                  ({item?.Size || "1"}{" "}
+                                                  {item?.SinglePc === "Y"
+                                                    ? "PCS"
+                                                    : item?.Type !== "C"
+                                                      ? item?.UomName
+                                                      : "COMBO"}
+                                                  )
                                                 </div>
-                                              );
-                                            })
-                                          : ''}
-                                      </td>
-                                    )}
+                                              )
+                                            )}
+
+                                            {/* Brand */}
+                                            {item?.BrandName && <div>{item.BrandName}</div>}
+
+                                            {/* Identifiers */}
+                                            {identifiers.map((id, i) => (
+                                              <div key={i} style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
+                                                {/* Serial + IMEIs in one line */}
+                                                {(id?.SerialNumber || id?.IMEI1 || id?.IMEI2) && (
+                                                  <div style={{ display: 'flex', gap: '3px' }}>
+                                                    {id?.SerialNumber && <div>{id.SerialNumber}</div>}
+                                                    {(id?.IMEI1 || id?.IMEI2) && (
+                                                      <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(", ")}</div>
+                                                    )}
+                                                  </div>
+                                                )}
+
+                                                {/* Description on new line */}
+                                                {id?.Description && <div>{id.Description}</div>}
+                                              </div>
+                                            ))}
+                                          </>
+                                        );
+                                      })()}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalHsnCode && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'center' }}
-                                      >
-                                        {item?.HSN}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'center' }}
+                                    >
+                                      {item?.HSN}
+                                    </td>
+                                  )
                                   : HsnCode == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'center',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.HSN}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'center',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.HSN}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalQuantity && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'center' }}
-                                      >
-                                        {item?.SalesQty}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'center' }}
+                                    >
+                                      {item?.SalesQty}
+                                    </td>
+                                  )
                                   : Quantity == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'center',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.SalesQty}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'center',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.SalesQty}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalMRP && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'right' }}
-                                      >
-                                        {item?.MRP}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'right' }}
+                                    >
+                                      {item?.MRP}
+                                    </td>
+                                  )
                                   : MRP == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'right',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.SinglePc === 'Y'
-                                          ? item?.Rate
-                                          : item?.MRP}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'right',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.SinglePc === 'Y'
+                                        ? item?.Rate
+                                        : item?.MRP}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalRate && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'right' }}
-                                      >
-                                        {item?.Rate}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'right' }}
+                                    >
+                                      {item?.Rate}
+                                    </td>
+                                  )
                                   : Rate == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'right',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {' '}
-                                        {item?.Rate}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'right',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {' '}
+                                      {item?.Rate}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalDiscount && (
-                                      <td className="table-header-cell">
-                                        {item.discount}
-                                      </td>
-                                    )
+                                    <td className="table-header-cell">
+                                      {item.discount}
+                                    </td>
+                                  )
                                   : Discount == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'right',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.Type != 'C'
-                                          ? item?.OfferAmt || 0
-                                          : item?.OfferValue || 0}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'right',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.Type != 'C'
+                                        ? item?.OfferAmt || 0
+                                        : item?.OfferValue || 0}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalTax && (
-                                      <td className="table-header-cell">
-                                        {item?.ProdTaxPercentage}
-                                      </td>
-                                    )
+                                    <td className="table-header-cell">
+                                      {item?.ProdTaxPercentage}
+                                    </td>
+                                  )
                                   : Tax &&
-                                    table2Data?.OrderType !== 'E' && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'right',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.ProdTaxPercentage || 0}
-                                      </td>
-                                    )}
+                                  table2Data?.OrderType !== 'E' && (
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'right',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.ProdTaxPercentage || 0}
+                                    </td>
+                                  )}
                                 {GlobaldummyData
                                   ? GlobalAmount && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{ textAlign: 'right' }}
-                                      >
-                                        {item?.TotalAmt}
-                                      </td>
-                                    )
+                                    <td
+                                      className="table-header-cell"
+                                      style={{ textAlign: 'right' }}
+                                    >
+                                      {item?.TotalAmt}
+                                    </td>
+                                  )
                                   : Amount == true && (
-                                      <td
-                                        className="table-header-cell"
-                                        style={{
-                                          textAlign: 'right',
-                                          fontFamily: 'sans-serif',
-                                        }}
-                                      >
-                                        {item?.Type != 'C'
-                                          ? item?.TotalAmt - item?.OfferAmt || 0
-                                          : item?.TotalAmt - item?.OfferValue ||
-                                            0}
-                                      </td>
-                                    )}
+                                    <td
+                                      className="table-header-cell"
+                                      style={{
+                                        textAlign: 'right',
+                                        fontFamily: 'sans-serif',
+                                      }}
+                                    >
+                                      {item?.Type != 'C'
+                                        ? item?.TotalAmt - item?.OfferAmt || 0
+                                        : item?.TotalAmt - item?.OfferValue ||
+                                        0}
+                                    </td>
+                                  )}
                               </tr>
                             )
                           )}
@@ -1808,7 +1804,7 @@ const InvoiceTemplate = ({
                                     {Number(
                                       GlobaldummyData
                                         ? 736
-                                        : table2Data?.NetAmount
+                                        : table2Data?.NetAmount,
                                     )?.toFixed(2)}
                                   </div>
                                 </div>
@@ -1859,7 +1855,7 @@ const InvoiceTemplate = ({
                                           fontWeight: 600,
                                           color:
                                             lastTransaction?.AdjustmentType ===
-                                            'REFUND'
+                                              'REFUND'
                                               ? '#000'
                                               : '#000',
                                         }}
@@ -1867,7 +1863,7 @@ const InvoiceTemplate = ({
                                         <span>{'Adjustment Amount'}</span>
                                         <span>
                                           {lastTransaction?.AdjustmentType ===
-                                          'REFUND'
+                                            'REFUND'
                                             ? '-'
                                             : '+'}
                                           {(
@@ -1924,28 +1920,28 @@ const InvoiceTemplate = ({
                                     <div className="bank-detail-item">
                                       <strong>Bank Name:</strong>{' '}
                                       {!estimatePrintHeader &&
-                                      table2Data?.OrderType === 'E'
+                                        table2Data?.OrderType === 'E'
                                         ? ''
                                         : BankDetails?.[0]?.BankName}
                                     </div>
                                     <div className="bank-detail-item">
                                       <strong>Account No.:</strong>{' '}
                                       {!estimatePrintHeader &&
-                                      table2Data?.OrderType === 'E'
+                                        table2Data?.OrderType === 'E'
                                         ? ''
                                         : BankDetails?.[0]?.AccountNo}
                                     </div>
                                     <div className="bank-detail-item">
                                       <strong>IFSC Code:</strong>{' '}
                                       {!estimatePrintHeader &&
-                                      table2Data?.OrderType === 'E'
+                                        table2Data?.OrderType === 'E'
                                         ? ''
                                         : BankDetails?.[0]?.IFSCCode}
                                     </div>
                                     <div className="bank-detail-item">
                                       <strong>Branch Name:</strong>{' '}
                                       {!estimatePrintHeader &&
-                                      table2Data?.OrderType === 'E'
+                                        table2Data?.OrderType === 'E'
                                         ? ''
                                         : BankDetails?.[0]?.BankBranch}
                                     </div>
@@ -1957,80 +1953,80 @@ const InvoiceTemplate = ({
                               <div className="terms-title">
                                 {GlobaldummyData
                                   ? GlobaltermsAndConditions && (
-                                      <div
+                                    <div
+                                      style={{
+                                        margin: '8px 0',
+                                        padding: '8px',
+                                        fontFamily: 'sans-serif',
+                                        width: '100%',
+                                      }}
+                                    >
+                                      <p
                                         style={{
-                                          margin: '8px 0',
-                                          padding: '8px',
-                                          fontFamily: 'sans-serif',
-                                          width: '100%',
+                                          fontSize: '13px',
+                                          fontWeight: 'bold',
+                                          marginBottom: '6px',
                                         }}
                                       >
-                                        <p
-                                          style={{
-                                            fontSize: '13px',
-                                            fontWeight: 'bold',
-                                            marginBottom: '6px',
-                                          }}
-                                        >
-                                          Terms & Conditions
-                                        </p>
-                                        <ol
-                                          style={{
-                                            fontSize: '12px',
-                                            paddingLeft: '18px',
-                                            margin: 0,
-                                            lineHeight: '1',
-                                          }}
-                                        >
-                                          <li>
-                                            Once goods are sold, they are not
-                                            exchangeable or refundable.
-                                          </li>
-                                          <li>
-                                            Please check the product before
-                                            leaving the counter.
-                                          </li>
-                                        </ol>
-                                      </div>
-                                    )
+                                        Terms & Conditions
+                                      </p>
+                                      <ol
+                                        style={{
+                                          fontSize: '12px',
+                                          paddingLeft: '18px',
+                                          margin: 0,
+                                          lineHeight: '1',
+                                        }}
+                                      >
+                                        <li>
+                                          Once goods are sold, they are not
+                                          exchangeable or refundable.
+                                        </li>
+                                        <li>
+                                          Please check the product before
+                                          leaving the counter.
+                                        </li>
+                                      </ol>
+                                    </div>
+                                  )
                                   : TermsnAdCondition == true &&
-                                    TermsAndConditions?.length > 0 && (
-                                      <div
+                                  TermsAndConditions?.length > 0 && (
+                                    <div
+                                      style={{
+                                        margin: '8px 0',
+                                        fontFamily: 'sans-serif',
+                                        width: '100%',
+                                        display: 'flex',
+                                        flexDirection: 'column',
+                                        alignItems: 'flex-start',
+                                      }}
+                                    >
+                                      <p
                                         style={{
-                                          margin: '8px 0',
-                                          fontFamily: 'sans-serif',
-                                          width: '100%',
-                                          display: 'flex',
-                                          flexDirection: 'column',
-                                          alignItems: 'flex-start',
+                                          fontSize: '13px',
+                                          fontWeight: 'bold',
+                                          marginBottom: '6px',
                                         }}
                                       >
-                                        <p
-                                          style={{
-                                            fontSize: '13px',
-                                            fontWeight: 'bold',
-                                            marginBottom: '6px',
-                                          }}
-                                        >
-                                          Terms & Conditions
-                                        </p>
-                                        <ol
-                                          style={{
-                                            fontSize: '12px',
-                                            paddingLeft: '18px',
-                                            margin: 0,
-                                            lineHeight: '1',
-                                          }}
-                                        >
-                                          {TermsAndConditions?.map((item) => (
-                                            <li style={{ textAlign: 'start' }}>
-                                              {item?.TermsandConditions}
-                                            </li>
-                                          ))}
-                                          {/* <li>Please check the product before leaving the counter.</li> */}
-                                        </ol>
-                                      </div>
-                                    )}
+                                        Terms & Conditions
+                                      </p>
+                                      <ol
+                                        style={{
+                                          fontSize: '12px',
+                                          paddingLeft: '18px',
+                                          margin: 0,
+                                          lineHeight: '1',
+                                        }}
+                                      >
+                                        {TermsAndConditions?.map((item) => (
+                                          <li style={{ textAlign: 'start' }}>
+                                            {item?.TermsandConditions}
+                                          </li>
+                                        ))}
+                                        {/* <li>Please check the product before leaving the counter.</li> */}
+                                      </ol>
+                                    </div>
+                                  )}
                               </div>
                             </div>
                             <div
@@ -2064,38 +2060,38 @@ const InvoiceTemplate = ({
 
                                 {GlobaldummyData
                                   ? GlobalSignature && (
-                                      <div style={{ paddingBottom: '1rem' }}>
+                                    <div style={{ paddingBottom: '1rem' }}>
+                                      <img
+                                        style={{
+                                          width: '70px',
+                                          height: '40px',
+                                        }}
+                                        src={
+                                          GlobalSignatureImages
+                                            ? GlobalSignatureImages
+                                            : signature
+                                        }
+                                        alt=""
+                                      />
+                                    </div>
+                                  )
+                                  : Signature == true && (
+                                    <div style={{}}>
+                                      {!estimatePrintHeader &&
+                                        table2Data?.OrderType === 'E' ? (
+                                        ''
+                                      ) : (
                                         <img
                                           style={{
-                                            width: '70px',
-                                            height: '40px',
+                                            width: '100px',
+                                            height: '60px',
                                           }}
-                                          src={
-                                            GlobalSignatureImages
-                                              ? GlobalSignatureImages
-                                              : signature
-                                          }
+                                          src={SignatureImg}
                                           alt=""
                                         />
-                                      </div>
-                                    )
-                                  : Signature == true && (
-                                      <div style={{}}>
-                                        {!estimatePrintHeader &&
-                                        table2Data?.OrderType === 'E' ? (
-                                          ''
-                                        ) : (
-                                          <img
-                                            style={{
-                                              width: '100px',
-                                              height: '60px',
-                                            }}
-                                            src={SignatureImg}
-                                            alt=""
-                                          />
-                                        )}
-                                      </div>
-                                    )}
+                                      )}
+                                    </div>
+                                  )}
                                 <p className="signature-text">(Common Seal)</p>
                               </div>
                             </div>
@@ -2106,28 +2102,28 @@ const InvoiceTemplate = ({
                           <div className="copy-labels">
                             {GlobaldummyData
                               ? GlobalIsnotes && (
-                                  <div>
-                                    <p style={{ padding: '0rem 1rem' }}>
-                                      Notes : 10 days Return policy
-                                    </p>
+                                <div>
+                                  <p style={{ padding: '0rem 1rem' }}>
+                                    Notes : 10 days Return policy
+                                  </p>
 
-                                    <hr className="PrintA4Style11-print-dottline" />
-                                  </div>
-                                )
+                                  <hr className="PrintA4Style11-print-dottline" />
+                                </div>
+                              )
                               : Notestext && (
-                                  <div>
-                                    <p
-                                      style={{
-                                        padding: '0rem 1rem',
-                                        textAlign: 'center',
-                                      }}
-                                    >
-                                      {Notestext}
-                                    </p>
+                                <div>
+                                  <p
+                                    style={{
+                                      padding: '0rem 1rem',
+                                      textAlign: 'center',
+                                    }}
+                                  >
+                                    {Notestext}
+                                  </p>
 
-                                    {/* <hr className="PrintA4Style11-print-dottline" /> */}
-                                  </div>
-                                )}
+                                  {/* <hr className="PrintA4Style11-print-dottline" /> */}
+                                </div>
+                              )}
                           </div>
                         </div>
                       </>
@@ -2386,7 +2382,7 @@ const InvoiceTemplate = ({
                           </div>
                           <div className="total-amount">
                             {Number(
-                              GlobaldummyData ? 736 : table2Data?.NetAmount
+                              GlobaldummyData ? 736 : table2Data?.NetAmount,
                             )?.toFixed(2)}
                           </div>
                           {isEditedBill && lastTransaction && (
@@ -2432,7 +2428,7 @@ const InvoiceTemplate = ({
                                     fontWeight: 600,
                                     color:
                                       lastTransaction?.AdjustmentType ===
-                                      'REFUND'
+                                        'REFUND'
                                         ? '#000'
                                         : '#000',
                                   }}
@@ -2440,13 +2436,11 @@ const InvoiceTemplate = ({
                                   <span>{'Adjustment Amount'}</span>
                                   <span>
                                     {lastTransaction?.AdjustmentType ===
-                                    'REFUND'
+                                      'REFUND'
                                       ? '-'
                                       : '+'}
-                                    {Math.abs(
-                                      (lastTransaction?.BeforeAdjustment ?? 0) -
-                                        (lastTransaction?.AfterAdjustment ?? 0)
-                                    ).toFixed(2)}
+                                    {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+                                      (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                                   </span>
                                 </div>
                                 <div
@@ -2486,28 +2480,28 @@ const InvoiceTemplate = ({
                               <div className="bank-detail-item">
                                 <strong>Bank Name:</strong>{' '}
                                 {!estimatePrintHeader &&
-                                table2Data?.OrderType === 'E'
+                                  table2Data?.OrderType === 'E'
                                   ? ''
                                   : BankDetails?.[0]?.BankName}
                               </div>
                               <div className="bank-detail-item">
                                 <strong>Account No.:</strong>{' '}
                                 {!estimatePrintHeader &&
-                                table2Data?.OrderType === 'E'
+                                  table2Data?.OrderType === 'E'
                                   ? ''
                                   : BankDetails?.[0]?.AccountNo}
                               </div>
                               <div className="bank-detail-item">
                                 <strong>IFSC Code:</strong>{' '}
                                 {!estimatePrintHeader &&
-                                table2Data?.OrderType === 'E'
+                                  table2Data?.OrderType === 'E'
                                   ? ''
                                   : BankDetails?.[0]?.IFSCCode}
                               </div>
                               <div className="bank-detail-item">
                                 <strong>Branch Name:</strong>{' '}
                                 {!estimatePrintHeader &&
-                                table2Data?.OrderType === 'E'
+                                  table2Data?.OrderType === 'E'
                                   ? ''
                                   : BankDetails?.[0]?.BankBranch}
                               </div>
@@ -2518,80 +2512,80 @@ const InvoiceTemplate = ({
                         <div className="terms-title">
                           {GlobaldummyData
                             ? GlobaltermsAndConditions && (
-                                <div
+                              <div
+                                style={{
+                                  margin: '8px 0',
+                                  padding: '8px',
+                                  fontFamily: 'sans-serif',
+                                  width: '100%',
+                                }}
+                              >
+                                <p
                                   style={{
-                                    margin: '8px 0',
-                                    padding: '8px',
-                                    fontFamily: 'sans-serif',
-                                    width: '100%',
+                                    fontSize: '13px',
+                                    fontWeight: 'bold',
+                                    marginBottom: '6px',
                                   }}
                                 >
-                                  <p
-                                    style={{
-                                      fontSize: '13px',
-                                      fontWeight: 'bold',
-                                      marginBottom: '6px',
-                                    }}
-                                  >
-                                    Terms & Conditions
-                                  </p>
-                                  <ol
-                                    style={{
-                                      fontSize: '12px',
-                                      paddingLeft: '18px',
-                                      margin: 0,
-                                      lineHeight: '1',
-                                    }}
-                                  >
-                                    <li>
-                                      Once goods are sold, they are not
-                                      exchangeable or refundable.
-                                    </li>
-                                    <li>
-                                      Please check the product before leaving
-                                      the counter.
-                                    </li>
-                                  </ol>
-                                </div>
-                              )
+                                  Terms & Conditions
+                                </p>
+                                <ol
+                                  style={{
+                                    fontSize: '12px',
+                                    paddingLeft: '18px',
+                                    margin: 0,
+                                    lineHeight: '1',
+                                  }}
+                                >
+                                  <li>
+                                    Once goods are sold, they are not
+                                    exchangeable or refundable.
+                                  </li>
+                                  <li>
+                                    Please check the product before leaving
+                                    the counter.
+                                  </li>
+                                </ol>
+                              </div>
+                            )
                             : TermsnAdCondition == true &&
-                              TermsAndConditions?.length > 0 && (
-                                <div
+                            TermsAndConditions?.length > 0 && (
+                              <div
+                                style={{
+                                  margin: '8px 0',
+                                  fontFamily: 'sans-serif',
+                                  width: '100%',
+                                  display: 'flex',
+                                  flexDirection: 'column',
+                                  alignItems: 'flex-start',
+                                }}
+                              >
+                                <p
                                   style={{
-                                    margin: '8px 0',
-                                    fontFamily: 'sans-serif',
-                                    width: '100%',
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                    alignItems: 'flex-start',
+                                    fontSize: '13px',
+                                    fontWeight: 'bold',
+                                    marginBottom: '6px',
                                   }}
                                 >
-                                  <p
-                                    style={{
-                                      fontSize: '13px',
-                                      fontWeight: 'bold',
-                                      marginBottom: '6px',
-                                    }}
-                                  >
-                                    Terms & Conditions
-                                  </p>
-                                  <ol
-                                    style={{
-                                      fontSize: '12px',
-                                      paddingLeft: '18px',
-                                      margin: 0,
-                                      lineHeight: '1',
-                                    }}
-                                  >
-                                    {TermsAndConditions?.map((item) => (
-                                      <li style={{ textAlign: 'start' }}>
-                                        {item?.TermsandConditions}
-                                      </li>
-                                    ))}
-                                    {/* <li>Please check the product before leaving the counter.</li> */}
-                                  </ol>
-                                </div>
-                              )}
+                                  Terms & Conditions
+                                </p>
+                                <ol
+                                  style={{
+                                    fontSize: '12px',
+                                    paddingLeft: '18px',
+                                    margin: 0,
+                                    lineHeight: '1',
+                                  }}
+                                >
+                                  {TermsAndConditions?.map((item) => (
+                                    <li style={{ textAlign: 'start' }}>
+                                      {item?.TermsandConditions}
+                                    </li>
+                                  ))}
+                                  {/* <li>Please check the product before leaving the counter.</li> */}
+                                </ol>
+                              </div>
+                            )}
                         </div>
                       </div>
                       <div
@@ -2616,42 +2610,42 @@ const InvoiceTemplate = ({
                           <p className="signature-text">Authorised Signatory</p>
                           {GlobaldummyData
                             ? GlobalSignature && (
-                                <div
-                                  style={{
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                    alignItems: 'flex-end',
-                                    paddingBottom: '1rem',
-                                  }}
-                                >
-                                  <img
-                                    style={{ width: '70px', height: '40px' }}
-                                    src={
-                                      GlobalSignatureImages
-                                        ? GlobalSignatureImages
-                                        : signature
-                                    }
-                                    alt=""
-                                  />
-                                </div>
-                              )
+                              <div
+                                style={{
+                                  display: 'flex',
+                                  flexDirection: 'column',
+                                  alignItems: 'flex-end',
+                                  paddingBottom: '1rem',
+                                }}
+                              >
+                                <img
+                                  style={{ width: '70px', height: '40px' }}
+                                  src={
+                                    GlobalSignatureImages
+                                      ? GlobalSignatureImages
+                                      : signature
+                                  }
+                                  alt=""
+                                />
+                              </div>
+                            )
                             : Signature == true && (
-                                <div
-                                  style={{
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                    alignItems: 'center',
-                                    marginTop: '1rem',
-                                    paddingBottom: '1rem',
-                                  }}
-                                >
-                                  <img
-                                    style={{ width: '100px', height: '60px' }}
-                                    src={SignatureImg}
-                                    alt=""
-                                  />
-                                </div>
-                              )}
+                              <div
+                                style={{
+                                  display: 'flex',
+                                  flexDirection: 'column',
+                                  alignItems: 'center',
+                                  marginTop: '1rem',
+                                  paddingBottom: '1rem',
+                                }}
+                              >
+                                <img
+                                  style={{ width: '100px', height: '60px' }}
+                                  src={SignatureImg}
+                                  alt=""
+                                />
+                              </div>
+                            )}
                           <p className="signature-text">(Common Seal)</p>
                         </div>
                       </div>
@@ -2662,28 +2656,28 @@ const InvoiceTemplate = ({
                     <div className="copy-labels">
                       {GlobaldummyData
                         ? GlobalIsnotes && (
-                            <div>
-                              <p style={{ padding: '0rem 1rem' }}>
-                                Notes : 10 days Return policy
-                              </p>
+                          <div>
+                            <p style={{ padding: '0rem 1rem' }}>
+                              Notes : 10 days Return policy
+                            </p>
 
-                              <hr className="PrintA4Style11-print-dottline" />
-                            </div>
-                          )
+                            <hr className="PrintA4Style11-print-dottline" />
+                          </div>
+                        )
                         : Notestext && (
-                            <div>
-                              <p
-                                style={{
-                                  padding: '0rem 1rem',
-                                  textAlign: 'center',
-                                }}
-                              >
-                                {Notestext}
-                              </p>
+                          <div>
+                            <p
+                              style={{
+                                padding: '0rem 1rem',
+                                textAlign: 'center',
+                              }}
+                            >
+                              {Notestext}
+                            </p>
 
-                              {/* <hr className="PrintA4Style11-print-dottline" /> */}
-                            </div>
-                          )}
+                            {/* <hr className="PrintA4Style11-print-dottline" /> */}
+                          </div>
+                        )}
                     </div>
                   </>
                 </div>
@@ -2715,7 +2709,7 @@ const InvoiceTemplate = ({
                         </div>
                       )}
                       {base64Image &&
-                      (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
+                        (PrintLogo?.SettingValue === 'Y' || LogoField) ? (
                         <img
                           src={base64Image}
                           alt="Brand Logo"
@@ -2866,90 +2860,90 @@ const InvoiceTemplate = ({
                     <tr className="table-header">
                       {GlobaldummyData
                         ? GlobalSlNo && (
-                            <th className="table-header-cell">S.No</th>
-                          )
+                          <th className="table-header-cell">S.No</th>
+                        )
                         : SLNO == true && (
-                            <th className="table-header-cell">S.No</th>
-                          )}
+                          <th className="table-header-cell">S.No</th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalItem && (
-                            <th className="table-header-cell">Item</th>
-                          )
+                          <th className="table-header-cell">Item</th>
+                        )
                         : Item == true && (
-                            <th className="table-header-cell">Item</th>
-                          )}
+                          <th className="table-header-cell">Item</th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalHsnCode && (
-                            <th className="table-header-cell">HSN </th>
-                          )
+                          <th className="table-header-cell">HSN </th>
+                        )
                         : HsnCode == true && (
-                            <th className="table-header-cell">HSN </th>
-                          )}
+                          <th className="table-header-cell">HSN </th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalQuantity && (
-                            <th className="table-header-cell">Qty</th>
-                          )
+                          <th className="table-header-cell">Qty</th>
+                        )
                         : Quantity == true && (
-                            <th className="table-header-cell">
-                              {' '}
-                              {WeightasKg ? 'Qty/Kg' : 'Qty'}
-                            </th>
-                          )}
+                          <th className="table-header-cell">
+                            {' '}
+                            {WeightasKg ? 'Qty/Kg' : 'Qty'}
+                          </th>
+                        )}
 
                       {/* <th className="table-header-cell">UOM</th>
                   <th className="table-header-cell">UOM</th> */}
 
                       {GlobaldummyData
                         ? GlobalMRP && (
-                            <th className="table-header-cell">MRP</th>
-                          )
+                          <th className="table-header-cell">MRP</th>
+                        )
                         : MRP == true && (
-                            <th className="table-header-cell">MRP</th>
-                          )}
+                          <th className="table-header-cell">MRP</th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalRate && (
-                            <th className="table-header-cell">Rate</th>
-                          )
+                          <th className="table-header-cell">Rate</th>
+                        )
                         : Rate == true && (
-                            <th className="table-header-cell">Rate</th>
-                          )}
+                          <th className="table-header-cell">Rate</th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalDiscount && (
-                            <th className="table-header-cell">Dis</th>
-                          )
+                          <th className="table-header-cell">Dis</th>
+                        )
                         : Discount == true && (
-                            <th className="table-header-cell">Dis</th>
-                          )}
+                          <th className="table-header-cell">Dis</th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalTax && (
-                            <th className="table-header-cell">Tax %</th>
-                          )
+                          <th className="table-header-cell">Tax %</th>
+                        )
                         : Tax &&
-                          table2Data?.OrderType !== 'E' && (
-                            <th
-                              className="table-header-cell"
-                              style={{
-                                textAlign: 'right',
-                                fontFamily: 'sans-serif',
-                              }}
-                            >
-                              Tax %
-                            </th>
-                          )}
+                        table2Data?.OrderType !== 'E' && (
+                          <th
+                            className="table-header-cell"
+                            style={{
+                              textAlign: 'right',
+                              fontFamily: 'sans-serif',
+                            }}
+                          >
+                            Tax %
+                          </th>
+                        )}
 
                       {GlobaldummyData
                         ? GlobalAmount && (
-                            <th className="table-header-cell">Amount</th>
-                          )
+                          <th className="table-header-cell">Amount</th>
+                        )
                         : Amount == true && (
-                            <th className="table-header-cell">Amount</th>
-                          )}
+                          <th className="table-header-cell">Amount</th>
+                        )}
 
                       {/* <th className="table-header-cell">Taxable</th>
                   <th className="table-header-cell-center" colSpan="2">IGST</th>
@@ -2976,208 +2970,198 @@ const InvoiceTemplate = ({
                         <tr key={idx} className="table-row">
                           {GlobaldummyData
                             ? GlobalSlNo && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {idx + 1}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {idx + 1}
+                              </td>
+                            )
                             : SLNO == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {idx + 1}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {idx + 1}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalItem && (
-                                <td className="table-header-cell">
-                                  {item?.ProdName}
-                                </td>
-                              )
+                              <td className="table-header-cell">
+                                {item?.ProdName}
+                              </td>
+                            )
                             : Item == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                  }}
-                                >
-                                  <div>{item?.ProdName}</div>
+                              <td
+                                className="table-header-cell"
+                                style={{ display: "flex", flexDirection: "column" }}
+                              >
+                                {/* Product Name */}
+                                <div>{item?.ProdName}</div>
+
+                                {/* Size + UOM */}
+                                {UomPrint?.SettingValue === 'Y' && (
                                   <div>
-                                    {UomPrint?.SettingValue === 'Y'
-                                      ? `${item?.Size || '1'} ${
-                                          item?.SinglePc === 'Y'
-                                            ? 'PCS'
-                                            : item?.Type !== 'C'
-                                              ? item?.UomName
-                                              : 'COMBO'
-                                        }`
-                                      : ''}{' '}
+                                    ({item?.Size || "1"}{" "}
+                                    {item?.SinglePc === "Y"
+                                      ? "PCS"
+                                      : item?.Type !== "C"
+                                        ? item?.UomName
+                                        : "COMBO"}
+                                    )
                                   </div>
-                                  &nbsp;{' '}
-                                  {item?.BrandName !== null
-                                    ? item?.BrandName
-                                    : ''}
-                                  &nbsp;
-                                  {item?.ProductIdentifierDtls?.length > 0
-                                    ? item?.ProductIdentifierDtls?.filter(
-                                        (items) =>
-                                          !(
-                                            items.SerialNumber == '' ||
-                                            items.SerialNumber == null
-                                          )
-                                      )?.map((a) => {
-                                        return <div>{a.SerialNumber}</div>;
-                                      })
-                                    : ''}{' '}
-                                  {item?.ProductIdentifierDtls?.length > 0
-                                    ? item?.ProductIdentifierDtls.filter(
-                                        (item1) =>
-                                          item1.IMEI1 !== '' ||
-                                          item1.IMEI2 !== ''
-                                      )?.map((item2) => {
-                                        const imei1 = item2.IMEI1 || '';
-                                        const imei2 = item2.IMEI2 || '';
-                                        return (
-                                          <div>
-                                            {[imei1, imei2]
-                                              .filter(Boolean)
-                                              .join(',')}
-                                          </div>
-                                        );
-                                      })
-                                    : ''}
-                                </td>
-                              )}
+                                )}
+
+                                {/* Brand */}
+                                {item?.BrandName && <div>{item.BrandName}</div>}
+
+                                {/* Identifiers */}
+                                {item?.ProductIdentifierDtls?.map((id, index) => (
+                                  <div key={index} style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
+
+                                    {/* Serial + IMEIs in one row */}
+                                    {(id?.SerialNumber || id?.IMEI1 || id?.IMEI2) && (
+                                      <div style={{ display: 'flex', gap: '4px' }}>
+                                        {id?.SerialNumber && <div>{id.SerialNumber}</div>}
+                                        {(id?.IMEI1 || id?.IMEI2) && (
+                                          <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(", ")}</div>
+                                        )}
+                                      </div>
+                                    )}
+
+                                    {/* Description on new line */}
+                                    {id?.Description && <div>{id.Description}</div>}
+
+                                  </div>
+                                ))}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalHsnCode && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {item?.HSN}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {item?.HSN}
+                              </td>
+                            )
                             : HsnCode == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {item?.HSN}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {item?.HSN}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalQuantity && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {item?.SalesQty}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {item?.SalesQty}
+                              </td>
+                            )
                             : Quantity == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'center' }}
-                                >
-                                  {item?.SalesQty}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'center' }}
+                              >
+                                {item?.SalesQty}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalMRP && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.MRP}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.MRP}
+                              </td>
+                            )
                             : MRP == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.SinglePc === 'Y'
-                                    ? item?.Rate
-                                    : item?.MRP}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.SinglePc === 'Y'
+                                  ? item?.Rate
+                                  : item?.MRP}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalRate && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.Rate}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.Rate}
+                              </td>
+                            )
                             : Rate == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {' '}
-                                  {item?.Rate}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {' '}
+                                {item?.Rate}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalDiscount && (
-                                <td className="table-header-cell">
-                                  {item.discount}
-                                </td>
-                              )
+                              <td className="table-header-cell">
+                                {item.discount}
+                              </td>
+                            )
                             : Discount == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.Type != 'C'
-                                    ? item?.OfferAmt || 0
-                                    : item?.OfferValue || 0}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.Type != 'C'
+                                  ? item?.OfferAmt || 0
+                                  : item?.OfferValue || 0}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalTax && (
-                                <td className="table-header-cell">
-                                  {item?.ProdTaxPercentage}
-                                </td>
-                              )
+                              <td className="table-header-cell">
+                                {item?.ProdTaxPercentage}
+                              </td>
+                            )
                             : Tax &&
-                              table2Data?.OrderType !== 'E' && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{
-                                    textAlign: 'right',
-                                    fontFamily: 'sans-serif',
-                                  }}
-                                >
-                                  {item?.ProdTaxPercentage || 0}
-                                </td>
-                              )}
+                            table2Data?.OrderType !== 'E' && (
+                              <td
+                                className="table-header-cell"
+                                style={{
+                                  textAlign: 'right',
+                                  fontFamily: 'sans-serif',
+                                }}
+                              >
+                                {item?.ProdTaxPercentage || 0}
+                              </td>
+                            )}
                           {GlobaldummyData
                             ? GlobalAmount && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.TotalAmt}
-                                </td>
-                              )
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.TotalAmt}
+                              </td>
+                            )
                             : Amount == true && (
-                                <td
-                                  className="table-header-cell"
-                                  style={{ textAlign: 'right' }}
-                                >
-                                  {item?.Type != 'C'
-                                    ? item?.TotalAmt - item?.OfferAmt || 0
-                                    : item?.TotalAmt - item?.OfferValue || 0}
-                                </td>
-                              )}
+                              <td
+                                className="table-header-cell"
+                                style={{ textAlign: 'right' }}
+                              >
+                                {item?.Type != 'C'
+                                  ? item?.TotalAmt - item?.OfferAmt || 0
+                                  : item?.TotalAmt - item?.OfferValue || 0}
+                              </td>
+                            )}
                         </tr>
-                      )
+                      ),
                     )}
                   </tbody>
                 </table>
@@ -3360,13 +3344,13 @@ const InvoiceTemplate = ({
                       <span>Total Amount Payable</span>
                       <span>
                         {Number(
-                          GlobaldummyData ? 736 : table2Data?.NetAmount
+                          GlobaldummyData ? 736 : table2Data?.NetAmount,
                         )?.toFixed(2)}
                       </span>
                     </div>
                     <div className="total-amount">
                       {Number(
-                        GlobaldummyData ? 736 : table2Data?.NetAmount
+                        GlobaldummyData ? 736 : table2Data?.NetAmount,
                       )?.toFixed(2)}
                     </div>
                     {isEditedBill && lastTransaction && (
@@ -3399,7 +3383,7 @@ const InvoiceTemplate = ({
                             </span>
                             <strong>
                               {(lastTransaction?.BeforeAdjustment || 0).toFixed(
-                                2
+                                2,
                               )}
                             </strong>
                           </div>
@@ -3419,10 +3403,8 @@ const InvoiceTemplate = ({
                               {lastTransaction?.AdjustmentType === 'REFUND'
                                 ? '-'
                                 : '+'}
-                              {Math.abs(
-                                (lastTransaction?.BeforeAdjustment ?? 0) -
-                                  (lastTransaction?.AfterAdjustment ?? 0)
-                              ).toFixed(2)}
+                              {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+                                (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
                             </span>
                           </div>
                           <div
@@ -3437,7 +3419,7 @@ const InvoiceTemplate = ({
                             </span>
                             <strong>
                               {(lastTransaction?.AfterAdjustment || 0).toFixed(
-                                2
+                                2,
                               )}
                             </strong>
                           </div>
@@ -3486,80 +3468,80 @@ const InvoiceTemplate = ({
                   <div className="terms-title">
                     {GlobaldummyData
                       ? GlobaltermsAndConditions && (
-                          <div
+                        <div
+                          style={{
+                            margin: '8px 0',
+                            padding: '8px',
+                            fontFamily: 'sans-serif',
+                            width: '100%',
+                          }}
+                        >
+                          <p
                             style={{
-                              margin: '8px 0',
-                              padding: '8px',
-                              fontFamily: 'sans-serif',
-                              width: '100%',
+                              fontSize: '13px',
+                              fontWeight: 'bold',
+                              marginBottom: '6px',
                             }}
                           >
-                            <p
-                              style={{
-                                fontSize: '13px',
-                                fontWeight: 'bold',
-                                marginBottom: '6px',
-                              }}
-                            >
-                              Terms & Conditions
-                            </p>
-                            <ol
-                              style={{
-                                fontSize: '12px',
-                                paddingLeft: '18px',
-                                margin: 0,
-                                lineHeight: '1',
-                              }}
-                            >
-                              <li>
-                                Once goods are sold, they are not exchangeable
-                                or refundable.
-                              </li>
-                              <li>
-                                Please check the product before leaving the
-                                counter.
-                              </li>
-                            </ol>
-                          </div>
-                        )
+                            Terms & Conditions
+                          </p>
+                          <ol
+                            style={{
+                              fontSize: '12px',
+                              paddingLeft: '18px',
+                              margin: 0,
+                              lineHeight: '1',
+                            }}
+                          >
+                            <li>
+                              Once goods are sold, they are not exchangeable
+                              or refundable.
+                            </li>
+                            <li>
+                              Please check the product before leaving the
+                              counter.
+                            </li>
+                          </ol>
+                        </div>
+                      )
                       : TermsnAdCondition == true &&
-                        TermsAndConditions?.length > 0 && (
-                          <div
+                      TermsAndConditions?.length > 0 && (
+                        <div
+                          style={{
+                            margin: '8px 0',
+                            fontFamily: 'sans-serif',
+                            width: '100%',
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'flex-start',
+                          }}
+                        >
+                          <p
                             style={{
-                              margin: '8px 0',
-                              fontFamily: 'sans-serif',
-                              width: '100%',
-                              display: 'flex',
-                              flexDirection: 'column',
-                              alignItems: 'flex-start',
+                              fontSize: '13px',
+                              fontWeight: 'bold',
+                              marginBottom: '6px',
                             }}
                           >
-                            <p
-                              style={{
-                                fontSize: '13px',
-                                fontWeight: 'bold',
-                                marginBottom: '6px',
-                              }}
-                            >
-                              Terms & Conditions
-                            </p>
-                            <ol
-                              style={{
-                                fontSize: '12px',
-                                paddingLeft: '18px',
-                                margin: 0,
-                                lineHeight: '1',
-                              }}
-                            >
-                              {TermsAndConditions?.map((item) => (
-                                <li style={{ textAlign: 'start' }}>
-                                  {item?.TermsandConditions}
-                                </li>
-                              ))}
-                              {/* <li>Please check the product before leaving the counter.</li> */}
-                            </ol>
-                          </div>
-                        )}
+                            Terms & Conditions
+                          </p>
+                          <ol
+                            style={{
+                              fontSize: '12px',
+                              paddingLeft: '18px',
+                              margin: 0,
+                              lineHeight: '1',
+                            }}
+                          >
+                            {TermsAndConditions?.map((item) => (
+                              <li style={{ textAlign: 'start' }}>
+                                {item?.TermsandConditions}
+                              </li>
+                            ))}
+                            {/* <li>Please check the product before leaving the counter.</li> */}
+                          </ol>
+                        </div>
+                      )}
                   </div>
                 </div>
                 <div
@@ -3581,42 +3563,42 @@ const InvoiceTemplate = ({
                     <p className="signature-text">Authorised Signatory</p>
                     {GlobaldummyData
                       ? GlobalSignature && (
-                          <div
-                            style={{
-                              display: 'flex',
-                              flexDirection: 'column',
-                              alignItems: 'flex-end',
-                              paddingBottom: '1rem',
-                            }}
-                          >
-                            <img
-                              style={{ width: '70px', height: '40px' }}
-                              src={
-                                GlobalSignatureImages
-                                  ? GlobalSignatureImages
-                                  : signature
-                              }
-                              alt=""
-                            />
-                          </div>
-                        )
+                        <div
+                          style={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'flex-end',
+                            paddingBottom: '1rem',
+                          }}
+                        >
+                          <img
+                            style={{ width: '70px', height: '40px' }}
+                            src={
+                              GlobalSignatureImages
+                                ? GlobalSignatureImages
+                                : signature
+                            }
+                            alt=""
+                          />
+                        </div>
+                      )
                       : Signature == true && (
-                          <div
-                            style={{
-                              display: 'flex',
-                              flexDirection: 'column',
-                              alignItems: 'center',
-                              marginTop: '1rem',
-                              paddingBottom: '1rem',
-                            }}
-                          >
-                            <img
-                              style={{ width: '100px', height: '60px' }}
-                              src={SignatureImg}
-                              alt=""
-                            />
-                          </div>
-                        )}
+                        <div
+                          style={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'center',
+                            marginTop: '1rem',
+                            paddingBottom: '1rem',
+                          }}
+                        >
+                          <img
+                            style={{ width: '100px', height: '60px' }}
+                            src={SignatureImg}
+                            alt=""
+                          />
+                        </div>
+                      )}
                     <p className="signature-text">(Common Seal)</p>
                   </div>
                 </div>
@@ -3627,23 +3609,23 @@ const InvoiceTemplate = ({
             <div className="copy-labels">
               {GlobaldummyData
                 ? GlobalIsnotes && (
-                    <div>
-                      <p style={{ padding: '0rem 1rem' }}>
-                        Notes : 10 days Return policy
-                      </p>
+                  <div>
+                    <p style={{ padding: '0rem 1rem' }}>
+                      Notes : 10 days Return policy
+                    </p>
 
-                      <hr className="PrintA4Style11-print-dottline" />
-                    </div>
-                  )
+                    <hr className="PrintA4Style11-print-dottline" />
+                  </div>
+                )
                 : Notestext && (
-                    <div>
-                      <p style={{ padding: '0rem 1rem', textAlign: 'center' }}>
-                        {Notestext}
-                      </p>
+                  <div>
+                    <p style={{ padding: '0rem 1rem', textAlign: 'center' }}>
+                      {Notestext}
+                    </p>
 
-                      {/* <hr className="PrintA4Style11-print-dottline" /> */}
-                    </div>
-                  )}
+                    {/* <hr className="PrintA4Style11-print-dottline" /> */}
+                  </div>
+                )}
             </div>
           </div>
         )}