diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
index e2d3a10..b2a4850 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
@@ -59,6 +59,7 @@ import {
   changePreviousOrderPayment,
   changePreviousOrderOfferDetail,
   GlobalSalesBillEdit,
+  changeCombofocus,
 } from '../../../../../Features/BookingScreen/BookingData/BookingData';
 import {
   ChangeFullFreeProductList,
@@ -93,6 +94,9 @@ const ComboSalesBillTable = () => {
   const removeProducts = useRemoveProducts();
   const applyOffer = useApplyOfferto_CardDetail();
   const preferenceDatas = useSelector(PreferenceData);
+    const UomPrint = preferenceDatas?.[0]?.SettingDtlDetails?.filter(
+      (i) => i.SettingIdName === 'PrintUom'
+    )?.[0];
   const preferenceDetails = preferenceDatas?.[0]?.SettingDtlDetails;
   const preferenceOffer =
     preferenceDetails?.find((item) => item.SettingIdName === 'Offer')
@@ -1354,7 +1358,7 @@ const ComboSalesBillTable = () => {
               InwardDtlId: isPaidproduct?.InwardDtlId,
               BuyInwardDtlId: null,
               Offer: 0,
-              OrderRate: isPaidproduct?.OrderRate
+              OrderRate: isPaidproduct?.OrderRate,
             });
           } else if (isPaidproduct?.OrderQty > item?.OrderQty) {
             // Just Decrease Paid Qty
@@ -1526,7 +1530,7 @@ const ComboSalesBillTable = () => {
                 InwardDtlId: item?.InwardDtlId,
                 BuyInwardDtlId: null,
                 Offer: item?.Offer,
-                OrderRate: item?.OrderRate
+                OrderRate: item?.OrderRate,
               });
               await ChangeFreeprodlistFn({
                 OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@@ -1605,7 +1609,7 @@ const ComboSalesBillTable = () => {
                 InwardDtlId: item?.InwardDtlId,
                 BuyInwardDtlId: null,
                 Offer: item?.Offer,
-                OrderRate: item?.OrderRate
+                OrderRate: item?.OrderRate,
               });
               await ChangeFreeprodlistFn({
                 OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@@ -1639,7 +1643,7 @@ const ComboSalesBillTable = () => {
             InwardDtlId: item?.InwardDtlId,
             BuyInwardDtlId: null,
             Offer: item?.Offer,
-            OrderRate: item?.OrderRate
+            OrderRate: item?.OrderRate,
           });
           await ChangeOfferAppliedProdsFn({
             inwardDtlId: item?.InwardDtlId,
@@ -1671,7 +1675,7 @@ const ComboSalesBillTable = () => {
                 InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
                 BuyInwardDtlId: null,
                 Offer: 0,
-                OrderRate: isPaidProductAvailableInCart?.OrderRate
+                OrderRate: isPaidProductAvailableInCart?.OrderRate,
               });
             } else if (
               isPaidProductAvailableInCart?.OrderQty > item?.OrderQty
@@ -1755,7 +1759,7 @@ const ComboSalesBillTable = () => {
                 InwardDtlId: item?.InwardDtlId,
                 BuyInwardDtlId: null,
                 Offer: item?.Offer,
-                OrderRate: item?.OrderRate
+                OrderRate: item?.OrderRate,
               });
               await ChangeFreeprodlistFn({
                 OverAllFreeQty: freeProdList?.OverAllFreeQty,
@@ -1782,7 +1786,7 @@ const ComboSalesBillTable = () => {
                 InwardDtlId: item?.InwardDtlId,
                 BuyInwardDtlId: null,
                 Offer: item?.Offer,
-                OrderRate: item?.OrderRate
+                OrderRate: item?.OrderRate,
               });
               await ChangeFreeprodlistFn({
                 OverAllFreeQty: freeProdList?.OverAllFreeQty,
@@ -2119,7 +2123,7 @@ const ComboSalesBillTable = () => {
               InwardDtlId: item?.InwardDtlId,
               BuyInwardDtlId: item?.InwardDtlId,
               Offer: item?.Offer,
-              OrderRate: item?.OrderRate
+              OrderRate: item?.OrderRate,
             });
             await ChangeFreeprodlistFn({
               OverAllFreeQty: FreeProd?.OverAllFreeQty - item?.OrderQty,
@@ -2138,7 +2142,7 @@ const ComboSalesBillTable = () => {
               InwardDtlId: item?.InwardDtlId,
               BuyInwardDtlId: item?.InwardDtlId,
               Offer: item?.Offer,
-              OrderRate: item?.OrderRate
+              OrderRate: item?.OrderRate,
             });
             await ChangeFreeprodlistFn({
               OverAllFreeQty: item?.OrderQty,
@@ -2544,13 +2548,13 @@ const ComboSalesBillTable = () => {
                           <td
                             key={`prod-${index}`}
                             className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
-                            onClick={() =>
-                              (row.FullProductIdentifierDtls?.length > 0 ||
-                                row.ProductIdentifierDtls?.length > 0 || imeiModal)
-
+                          onClick={() => {
+                            dispatch(changeCombofocus(true));
+                            row.FullProductIdentifierDtls?.length > 0 ||
+                            row.ProductIdentifierDtls?.length > 0
                                 ? handleImeiDetails(row)
-                                : editField && handleEditQuantity(row)
-                            }
+                              : editField && handleEditQuantity(row);
+                          }}
                           >
                             {row?.Type !== 'OS' ? row.ProdName : row.ServiceName}
                             {row?.BrandName ? ` ${row.BrandName}` : ''}
@@ -2606,13 +2610,15 @@ const ComboSalesBillTable = () => {
                           }}
                           key={`qty-${index}`}
                           tabIndex={0}
-                          className={`${EditQtyCombo && row?.localId === Index
+                          className={`${
+                            EditQtyCombo && row?.localId === Index
                             ? 'EditQTYcomboTD'
                             : 'qtyTd'
                             } ${isActiveCell ? 'active-cell' : ''}`}
-                          onClick={() =>
-                            editField && handleEditQuantityCombo(row)
-                          }
+                          onClick={() => {
+                            dispatch(changeCombofocus(true));
+                            editField && handleEditQuantityCombo(row);
+                          }}
                         >
                           {(!EditQtyCombo || row?.localId !== Index) && (
                             <>{row.OrderQty}</>
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
index 058aa16..a1c225b 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
@@ -95,6 +95,9 @@ const InvoiceTemplate = ({
   const GlobalBilltext = useSelector(GlobalBillName);
   const GlobalLogo = useSelector(GlobalprintLogo);
   const SettingData = useSelector(PreferenceData);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -1292,15 +1295,17 @@ const InvoiceTemplate = ({
                                                 ))}
                                               </div>
                                             ) : (
-                                              <div>
-                                                ({item?.Size || "1"}{" "}
-                                                {item?.SinglePc === "Y"
-                                                  ? "PCS"
-                                                  : item?.Type !== "C"
-                                                    ? item?.UomName
-                                                    : "COMBO"}
-                                                )
-                                              </div>
+                                              UomPrint?.SettingValue === 'Y' && (
+                                                <div>
+                                                  ({item?.Size || "1"}{" "}
+                                                  {item?.SinglePc === "Y"
+                                                    ? "PCS"
+                                                    : item?.Type !== "C"
+                                                      ? item?.UomName
+                                                      : "COMBO"}
+                                                  )
+                                                </div>
+                                              )
                                             )}
 
                                             {/* Brand */}
@@ -2995,15 +3000,17 @@ const InvoiceTemplate = ({
                                 <div>{item?.ProdName}</div>
 
                                 {/* Size + UOM */}
-                                <div>
-                                  ({item?.Size || "1"}{" "}
-                                  {item?.SinglePc === "Y"
-                                    ? "PCS"
-                                    : item?.Type !== "C"
-                                      ? item?.UomName
-                                      : "COMBO"}
-                                  )
-                                </div>
+                                {UomPrint?.SettingValue === 'Y' && (
+                                  <div>
+                                    ({item?.Size || "1"}{" "}
+                                    {item?.SinglePc === "Y"
+                                      ? "PCS"
+                                      : item?.Type !== "C"
+                                        ? item?.UomName
+                                        : "COMBO"}
+                                    )
+                                  </div>
+                                )}
 
                                 {/* Brand */}
                                 {item?.BrandName && <div>{item.BrandName}</div>}
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
index e88680c..074d7ae 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
@@ -102,6 +102,9 @@ const PrintA4Style11 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -725,15 +728,17 @@ const PrintA4Style11 = ({
                                                 ))}
                                             </div>
                                           ) : (
-                                            <div>
-                                              ({item?.Size || "1"}{" "}
-                                              {item?.SinglePc === "Y"
-                                                ? "PCS"
-                                                : item?.Type !== "C"
-                                                  ? item?.UomName
-                                                  : "COMBO"}
-                                              )
-                                            </div>
+                                            UomPrint?.SettingValue === 'Y' && (
+                                              <div>
+                                                ({item?.Size || "1"}{" "}
+                                                {item?.SinglePc === "Y"
+                                                  ? "PCS"
+                                                  : item?.Type !== "C"
+                                                    ? item?.UomName
+                                                    : "COMBO"}
+                                                )
+                                              </div>
+                                            )
                                           )}
 
                                           {item?.BrandName && <div>{item.BrandName}</div>}
@@ -1770,15 +1775,17 @@ const PrintA4Style11 = ({
                                           <div>{item?.ProdName}</div>
 
                                           {/* Size + UOM */}
-                                          <div>
-                                            ({item?.Size || "1"}{" "}
-                                            {item?.SinglePc === "Y"
-                                              ? "PCS"
-                                              : item?.Type !== "C"
-                                                ? item?.UomName
-                                                : "COMBO"}
-                                            )
-                                          </div>
+                                          {UomPrint?.SettingValue === 'Y' && (
+                                            <div>
+                                              ({item?.Size || "1"}{" "}
+                                              {item?.SinglePc === "Y"
+                                                ? "PCS"
+                                                : item?.Type !== "C"
+                                                  ? item?.UomName
+                                                  : "COMBO"}
+                                              )
+                                            </div>
+                                          )}
 
                                           {/* Brand */}
                                           {item?.BrandName && <div>{item.BrandName}</div>}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
index fb7d6e4..68e36ad 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
@@ -128,6 +128,10 @@ const PrintStyle1 = ({
       (setting) =>
         setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
     )?.SettingValue === 'Y';
+    const UomPrint =  SettingData?.[0]?.SettingDtlDetails?.filter(
+        (i) => i.SettingIdName === 'PrintUom'
+      )?.[0]; 
+    
 
   const keysLength = Object.keys(table2Data ?? {}).length;
   const paymentTypeUPI = PaymentStatus?.find(
@@ -775,6 +779,7 @@ const PrintStyle1 = ({
                                         ))}
                                       </div>
                                     ) : (
+                                      UomPrint?.SettingValue === 'Y' &&
                                       <div>
                                         ({item?.Size ? item?.Size : '1'}{' '}
                                         {item?.SinglePc == 'Y'
@@ -792,7 +797,7 @@ const PrintStyle1 = ({
                                       } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
                                     &nbsp;{' '}
                                     {item?.BrandName !== null
-                                  ? <div> {item?.BrandName}</div>
+                                      ? <div>{item?.BrandName}</div>
                                   : ''}
                                     &nbsp;
                                     <div style={{ display: "flex", gap: "2px", flexDirection: "column" }}>
@@ -829,7 +834,7 @@ const PrintStyle1 = ({
                                           (items) =>
                                             items.SerialNumber || items.IMEI1 || items.IMEI2
                                         )?.map((a, i) => (
-                                          <span key={i}>{a.Description}</span>
+                                          <div key={i}>{a.Description}</div>
                                         ))
 
                                         : ''}
@@ -1044,6 +1049,7 @@ const PrintStyle1 = ({
                                     
                                   >
                                     <div>{item?.ProdName}</div>
+                                    {UomPrint?.SettingValue === 'Y' &&
                                     <div>
                                       ({item?.Size ? item?.Size : '1'}{' '}
                                       {item?.SinglePc == 'Y'
@@ -1053,6 +1059,7 @@ const PrintStyle1 = ({
                                           : 'COMBO'}
                                       )
                                     </div>
+}
                                     {sportsAppPreference &&
                                       `${item?.BookingDate?.trim()
                                         ? `(${dateFormatChange(item.BookingDate)})`
@@ -3991,6 +3998,7 @@ const PrintStyle1 = ({
                                     ))}
                                   </div>
                                 ) : (
+                                  UomPrint?.SettingValue === 'Y' && 
                                   <div>
                                     ({item?.Size ? item?.Size : '1'}{' '}
                                     {item?.SinglePc == 'Y'
@@ -4008,38 +4016,9 @@ const PrintStyle1 = ({
                                   } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
                                 &nbsp;{' '}
                                 {item?.BrandName !== null
-                                  ? <div> {item?.BrandName}</div>
+                                  ? 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>
-                                    );
-                                  })
-                                  : ''} */}
+                                &nbsp;                              
                                 <div style={{ display: 'flex', gap: "3px", flexDirection: "column" }}>
                                   {item?.ProductIdentifierDtls?.length > 0
                                     ? item?.ProductIdentifierDtls.filter(
@@ -4070,7 +4049,7 @@ const PrintStyle1 = ({
                                       (items) =>
                                         items.SerialNumber || items.IMEI1 || items.IMEI2
                                     )?.map((a, i) => (
-                                      <span key={i}>{a.Description}    </span>
+                                      <div key={i}>{a.Description}    </div>
                                     ))
                                     : ''}
                                 </div>
@@ -4264,6 +4243,7 @@ const PrintStyle1 = ({
                               
                               >
                                 <div>{item?.ProdName}</div>
+                                {UomPrint?.SettingValue === 'Y' &&
                                 <div>
                                   ({item?.Size ? item?.Size : '1'}{' '}
                                   {item?.SinglePc == 'Y'
@@ -4273,6 +4253,7 @@ const PrintStyle1 = ({
                                       : 'COMBO'}
                                   )
                                 </div>
+                  }
                                 {sportsAppPreference &&
                                   `${item?.BookingDate?.trim()
                                     ? `(${dateFormatChange(item.BookingDate)})`
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
index c8ff9ef..1d5a721 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
@@ -105,6 +105,9 @@ const PrintStyle11 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -3275,8 +3278,7 @@ const PrintStyle11 = ({
                                         </span>
                                       ))}
 
-                                      {/* Brand Name */}
-                                      {item?.BrandName && <span>{item.BrandName}</span>}
+                                      {item?.BrandName && <div>{item.BrandName}</div>}
 
                                       {/* Product Identifiers */}
                                       {item?.ProductIdentifierDtls?.map((detail, idx) => {
@@ -3304,17 +3306,17 @@ const PrintStyle11 = ({
                                     </div>
                                   ) : (
                                     <div>
-                                      ({item?.Size ? item?.Size : '1'}{' '}
-                                      {item?.SinglePc == 'Y'
-                                        ? 'PCS'
-                                        : item?.Type != 'C'
-                                          ? item?.UomName
-                                          : 'COMBO'}
-                                      )
-                                      {item?.BrandName !== null
-                                        ? item?.BrandName
-                                        : ''}
-                                      &nbsp;
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <div>
+                                          ({item?.Size ? item?.Size : '1'}{' '}
+                                          {item?.SinglePc == 'Y'
+                                            ? 'PCS'
+                                            : item?.Type != 'C'
+                                              ? item?.UomName
+                                              : 'COMBO'})
+                                        </div>
+                                      )}
+                                      {item?.BrandName && <div>{item.BrandName}</div>}
                                       {/* {item?.ProductIdentifierDtls?.length > 0
                                         ? item?.ProductIdentifierDtls?.filter(
                                           (items) =>
@@ -3588,15 +3590,17 @@ const PrintStyle11 = ({
                                   }}
                                 >
                                   <div>{item?.ProdName}</div>
-                                  <div>
-                                    ({item?.Size ? item?.Size : '1'}{' '}
-                                    {item?.SinglePc == 'Y'
-                                      ? 'PCS'
-                                      : item?.Type != 'C'
-                                        ? item?.UomName
-                                        : 'COMBO'}
-                                    )
-                                  </div>
+                                  {UomPrint?.SettingValue === 'Y' && (
+                                    <div>
+                                      ({item?.Size ? item?.Size : '1'}{' '}
+                                      {item?.SinglePc == 'Y'
+                                        ? 'PCS'
+                                        : item?.Type != 'C'
+                                          ? item?.UomName
+                                          : 'COMBO'})
+                                    </div>
+                                  )}
+                                  {item?.BrandName && <div>{item.BrandName}</div>}
                                 </td>
                               )}
                             {GlobaldummyData
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
index 235bebc..70edad0 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
@@ -838,10 +838,7 @@ const Printstyle12 = ({
                                               {item.ParcelType})
                                             </span>
                                           ))}
-                                          {item?.BrandName !== null
-                                            ? item?.BrandName
-                                            : ''}
-                                          &nbsp;
+                                          {item?.BrandName && <div>{item.BrandName}</div>}
                                           <div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
                                             {item?.ProductIdentifierDtls?.map((detail, index) => {
                                               const serial = detail.SerialNumber?.trim();
@@ -870,17 +867,17 @@ const Printstyle12 = ({
                                         </div>
                                       ) : (
                                         <div>
-                                          ({item?.Size ? item?.Size : '1'}{' '}
-                                          {item?.SinglePc == 'Y'
-                                            ? 'PCS'
-                                            : item?.Type != 'C'
-                                              ? item?.UomName
-                                              : 'COMBO'}
-                                          )
-                                          {item?.BrandName !== null
-                                            ? item?.BrandName
-                                            : ''}
-                                          &nbsp;
+                                          {UomPrint?.SettingValue === 'Y' && (
+                                            <div>
+                                              ({item?.Size || '1'}){' '}
+                                              {item?.SinglePc === 'Y'
+                                                ? 'PCS'
+                                                : item?.Type !== 'C'
+                                                  ? item?.UomName
+                                                  : 'COMBO'}
+                                            </div>
+                                          )}
+                                          {item?.BrandName && <div>{item.BrandName}</div>}
                                           {item?.ProductIdentifierDtls
                                             ?.length > 0
                                             ? item?.ProductIdentifierDtls?.filter(
@@ -1117,15 +1114,16 @@ const Printstyle12 = ({
                                       }}
                                     >
                                       <div>{item?.ProdName}</div>
-                                      <div>
-                                        ({item?.Size ? item?.Size : '1'}{' '}
-                                        {item?.SinglePc == 'Y'
-                                          ? 'PCS'
-                                          : item?.Type != 'C'
-                                            ? item?.UomName
-                                            : 'COMBO'}
-                                        )
-                                      </div>
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <div>
+                                          ({item?.Size || '1'}){' '}
+                                          {item?.SinglePc === 'Y'
+                                            ? 'PCS'
+                                            : item?.Type !== 'C'
+                                              ? item?.UomName
+                                              : 'COMBO'}
+                                        </div>
+                                      )}
                                     </td>
                                   )}
                                 {GlobaldummyData
@@ -3463,10 +3461,7 @@ const Printstyle12 = ({
                                           {item.ParcelType})
                                         </span>
                                       ))}
-                                      {item?.BrandName !== null
-                                        ? item?.BrandName
-                                        : ''}
-                                      &nbsp;
+                                      {item?.BrandName && <div>{item.BrandName}</div>}
                                       {item?.ProductIdentifierDtls?.length > 0
                                         ? item?.ProductIdentifierDtls?.filter(
                                           (items) =>
@@ -3500,17 +3495,17 @@ const Printstyle12 = ({
                                     </div>
                                   ) : (
                                     <div>
-                                      ({item?.Size ? item?.Size : '1'}{' '}
-                                      {item?.SinglePc == 'Y'
-                                        ? 'PCS'
-                                        : item?.Type != 'C'
-                                          ? item?.UomName
-                                          : 'COMBO'}
-                                      )
-                                      {item?.BrandName !== null
-                                        ? item?.BrandName
-                                        : ''}
-                                      &nbsp;
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <div>
+                                          ({item?.Size || '1'}){' '}
+                                          {item?.SinglePc === 'Y'
+                                            ? 'PCS'
+                                            : item?.Type !== 'C'
+                                              ? item?.UomName
+                                              : 'COMBO'}
+                                        </div>
+                                      )}
+                                      {item?.BrandName && <div>{item.BrandName}</div>}
                                       {/* {item?.ProductIdentifierDtls?.length > 0
                                         ? item?.ProductIdentifierDtls?.filter(
                                           (items) =>
@@ -3754,15 +3749,16 @@ const Printstyle12 = ({
                                   }}
                                 >
                                   <div>{item?.ProdName}</div>
-                                  <div>
-                                    ({item?.Size ? item?.Size : '1'}{' '}
-                                    {item?.SinglePc == 'Y'
-                                      ? 'PCS'
-                                      : item?.Type != 'C'
-                                        ? item?.UomName
-                                        : 'COMBO'}
-                                    )
-                                  </div>
+                                  {UomPrint?.SettingValue === 'Y' && (
+                                    <div>
+                                      ({item?.Size || '1'}){' '}
+                                      {item?.SinglePc === 'Y'
+                                        ? 'PCS'
+                                        : item?.Type !== 'C'
+                                          ? item?.UomName
+                                          : 'COMBO'}
+                                    </div>
+                                  )}
                                 </td>
                               )}
                             {GlobaldummyData
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
index 1ae85a3..9d65fc1 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
@@ -107,6 +107,9 @@ const Printstyle2 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const UomPrint =  SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0]; 
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -712,7 +715,8 @@ const Printstyle2 = ({
                                               </span>
                                             ))}
                                           </div>
-                                        ) : (
+                                        ) :  UomPrint?.SettingValue === 'Y' && (
+                                          
                                           <div>
                                             ({item?.Size ? item?.Size : '1'}{' '}
                                             {item?.SinglePc == 'Y'
@@ -766,7 +770,7 @@ const Printstyle2 = ({
                                               (items) =>
                                                 items.SerialNumber || items.IMEI1 || items.IMEI2
                                             )?.map((a, i) => (
-                                              <span key={i}>{a.Description}</span>
+                                              <div key={i}>{a.Description}</div>
                                             ))
 
                                             : ''}
@@ -1063,6 +1067,7 @@ const Printstyle2 = ({
                                       }}
                                     >
                                       <div>{item?.ProdName}</div>
+                                       {UomPrint?.SettingValue === 'Y' &&
                                       <div>
                                         ({item?.Size ? item?.Size : '1'}{' '}
                                         {item?.SinglePc == 'Y'
@@ -1072,6 +1077,7 @@ const Printstyle2 = ({
                                             : 'COMBO'}
                                         )
                                       </div>
+                               }
                                     </td>
                                   )}
                                 {GlobaldummyData
@@ -3356,7 +3362,7 @@ const Printstyle2 = ({
                                           (items) =>
                                             items.SerialNumber || items.IMEI1 || items.IMEI2
                                         )?.map((a, i) => (
-                                          <span key={i}>{a.Description}</span>
+                                          <div key={i}>{a.Description}</div>
                                         ))
 
                                         : ''}
@@ -3617,6 +3623,7 @@ const Printstyle2 = ({
                                   }}
                                 >
                                   <div>{item?.ProdName}</div>
+                                   {UomPrint?.SettingValue === 'Y' &&
                                   <div>
                                     ({item?.Size ? item?.Size : '1'}{' '}
                                     {item?.SinglePc == 'Y'
@@ -3626,6 +3633,7 @@ const Printstyle2 = ({
                                         : 'COMBO'}
                                     )
                                   </div>
+                            }
                                 </td>
                               )}
                             {GlobaldummyData
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
index acba1e3..6d4f91d 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
@@ -80,6 +80,9 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+   const UomPrint =  SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0]; 
   const estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y';
   const estimateTitle =
     SettingData?.[0]?.SettingDtlDetails?.find(
@@ -289,7 +292,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                                       </span>
                                     ))}
                                   </div>
-                                    : <div>
+                                    :  UomPrint?.SettingValue === 'Y' &&<div>
                                       ({item?.Size ? item?.Size : "1"}{" "}
                                       {item?.SinglePc == "Y"
                                         ? "PCS"
@@ -329,7 +332,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                                         (items) =>
                                           items.SerialNumber || items.IMEI1 || items.IMEI2
                                       )?.map((a, i) => (
-                                        <span key={i}>{a.Description}  </span>
+                                        <div key={i}>{a.Description}  </div>
                                       ))
 
                                       : ''}
@@ -370,7 +373,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                             {GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item &&
                               <div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
                                 <div>{item?.ProdName}</div>
-                                <div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>
+                               {UomPrint?.SettingValue === 'Y' && <div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>}
                               </div>}
                             {GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>}
                             {GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
@@ -1248,7 +1251,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                                 </span>
                               ))}
                             </div>
-                              : <div>
+                              : UomPrint?.SettingValue === 'Y' && <div>
                                 ({item?.Size ? item?.Size : "1"}{" "}
                                 {item?.SinglePc == "Y"
                                   ? "PCS"
@@ -1329,7 +1332,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
                       {GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item &&
                         <div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
                           <div>{item?.ProdName}</div>
-                          <div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>
+                         { UomPrint?.SettingValue === 'Y' &&<div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>}
                         </div>}
                       {GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>}
                       {GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
index 4f302dd..8f98179 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
@@ -114,7 +114,10 @@ const Printstyle4 = ({
       {}
     ),
   ];
-  console.log(table2Data, 'eeeeeeeeeeeeeeee');
+  console.log(table2Data, 'table2Data');
+  const UomPrint =  SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -759,12 +762,14 @@ const Printstyle4 = ({
                                         </div>
                                       ) : (
                                         <div>
-                                          {(item?.Size || "1")}{" "}
-                                          {item?.SinglePc === "Y"
-                                            ? "PCS"
-                                            : item?.Type !== "C"
-                                              ? item?.UomName
-                                              : "COMBO"}{" "}
+                                          {(UomPrint?.SettingValue === 'Y'
+                                            ? (item?.Size || '1') +
+                                              (item?.SinglePc === 'Y'
+                                                ? ' PCS'
+                                                : item?.Type !== 'C'
+                                                ? ` ${item?.UomName}`
+                                                : ' COMBO')
+                                            : '')} 
                                           {item?.BrandName || ""}
                                         </div>
                                       )}
@@ -1016,6 +1021,7 @@ const Printstyle4 = ({
                                       }}
                                     >
                                       <div>{item?.ProdName}</div>
+                                      {UomPrint?.SettingValue === 'Y' &&
                                       <div>
                                         ({item?.Size ? item?.Size : '1'}{' '}
                                         {item?.SinglePc == 'Y'
@@ -1025,6 +1031,7 @@ const Printstyle4 = ({
                                             : 'COMBO'}
                                         )
                                       </div>
+                                    }
                                     </td>
                                   )}
                                 {GlobaldummyData
@@ -3408,12 +3415,9 @@ const Printstyle4 = ({
                                       </div>
                                     ) : (
                                       <div>
-                                        {(item?.Size || '1')}{" "}
-                                        {item?.SinglePc === 'Y'
-                                          ? 'PCS'
-                                          : item?.Type !== 'C'
-                                            ? item?.UomName
-                                            : 'COMBO'}{" "}
+                                        {UomPrint?.SettingValue === 'Y' && (
+                                          <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
+                                        )}
                                         {item?.BrandName || ""}
                                       </div>
                                     )}
@@ -3737,6 +3741,7 @@ const Printstyle4 = ({
                               : Quantity && (
                                 <td style={{ textAlign: 'right' }}>
                                   {item?.SalesQty}
+                                    {UomPrint?.SettingValue === 'Y' &&
                                   <div>
                                     ({item?.Size ? item?.Size : '1'}{' '}
                                     {item?.SinglePc == 'Y'
@@ -3746,6 +3751,7 @@ const Printstyle4 = ({
                                         : 'COMBO'}
                                     )
                                   </div>
+                                    }
                                 </td>
                               )}
                             {GlobaldummyData
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
index 23f9ed6..352007d 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
@@ -103,6 +103,9 @@ const PrintStyle5 = ({
   const GlobalCashierName = useSelector(GlobalprintCashierName);
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -679,14 +682,15 @@ const PrintStyle5 = ({
                               ) : (
                                 <>
                                   <div>{item?.ProdName}</div>
-                                  <div>
-                                    {item?.Size +
-                                      item?.UomName +
-                                      '-' +
-                                      (GlobaldummyData
-                                        ? GlobalQuantity && item?.SalesQty
-                                        : item?.SalesQty)}
-                                  </div>
+                                  {UomPrint?.SettingValue === 'Y' &&
+                                    <div>
+                                      {item?.Size +
+                                        item?.UomName +
+                                        '-' +
+                                        (GlobaldummyData
+                                          ? GlobalQuantity && item?.SalesQty
+                                          : item?.SalesQty)}
+                                    </div>}
                                 </>
                               )}
                             </div>
@@ -756,12 +760,16 @@ const PrintStyle5 = ({
 
                                           {/* 📏 Size + UOM */}
                                           <div>
-                                            {(item?.Size || "1")}{" "}
-                                            {item?.SinglePc === "Y"
-                                              ? "PCS"
-                                              : item?.Type !== "C"
-                                                ? item?.UomName
-                                                : "COMBO"}
+                                            {UomPrint?.SettingValue === 'Y' && (
+                                              <>
+                                                {(item?.Size || "1")}{" "}
+                                                {item?.SinglePc === "Y"
+                                                  ? "PCS"
+                                                  : item?.Type !== "C"
+                                                    ? item?.UomName
+                                                    : "COMBO"}
+                                              </>
+                                            )}
                                           </div>
 
                                           {/* 🏷 Brand */}
@@ -1076,14 +1084,16 @@ const PrintStyle5 = ({
                               ) : (
                                 <>
                                   <div>{item?.ProdName}</div>
-                                  <div>
-                                    {item?.Size +
-                                      item?.UomName +
-                                      '-' +
-                                      (GlobaldummyData
-                                        ? GlobalQuantity && item?.SalesQty
-                                        : item?.SalesQty)}
-                                  </div>
+                                  {UomPrint?.SettingValue === 'Y' &&
+                                    <div>
+                                      {item?.Size +
+                                        item?.UomName +
+                                        '-' +
+                                        (GlobaldummyData
+                                          ? GlobalQuantity && item?.SalesQty
+                                          : item?.SalesQty)}
+                                    </div>
+                                  }
                                 </>
                               )}
                             </div>
@@ -1100,18 +1110,20 @@ const PrintStyle5 = ({
                             ) : (
                               <>
                                 <div>{item?.ProdName}</div>
-                                <div>
-                                  {(item?.Size ? item?.Size : '1') +
-                                    (item?.SinglePc == 'Y'
-                                      ? 'PCS'
-                                      : item?.Type != 'C'
-                                        ? item?.UomName
-                                        : 'COMBO') +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
+                                {UomPrint?.SettingValue === 'Y' &&
+                                  <div>
+                                    {(item?.Size ? item?.Size : '1') +
+                                      (item?.SinglePc == 'Y'
+                                        ? 'PCS'
+                                        : item?.Type != 'C'
+                                          ? item?.UomName
+                                          : 'COMBO') +
+                                      '-' +
+                                      (GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty)}
+                                  </div>
+                                }
                               </>
                             )}
                           </div>
@@ -2984,14 +2996,16 @@ const PrintStyle5 = ({
                             ) : (
                               <>
                                 <div>{item?.ProdName}</div>
-                                <div>
-                                  {item?.Size +
-                                    item?.UomName +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
+                                {UomPrint?.SettingValue === 'Y' && (
+                                  <div>
+                                    {item?.Size +
+                                      item?.UomName +
+                                      '-' +
+                                      (GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty)}
+                                  </div>
+                                )}
                               </>
                             )}
                           </div>
@@ -3063,13 +3077,19 @@ const PrintStyle5 = ({
                                   <div>
                                     {/* 📏 Size + UOM */}
                                     <div>
-                                      {(item?.Size || "1")}
-                                      {item?.SinglePc === "Y"
-                                        ? "PCS"
-                                        : item?.Type !== "C"
-                                          ? item?.UomName
-                                          : "COMBO"}
-                                    </div>
+                                     
+                                        {UomPrint?.SettingValue === 'Y' && (
+                                          <>
+                                            {item?.Size || "1"}{" "}
+                                            {item?.SinglePc === "Y"
+                                              ? "PCS"
+                                              : item?.Type !== "C"
+                                                ? item?.UomName
+                                                : "COMBO"}
+                                          </>
+                                        )}
+                                      </div>
+                                   
 
                                     {/* 🏷 Brand */}
                                     {item?.BrandName && <div>{item.BrandName}</div>}
@@ -3352,14 +3372,16 @@ const PrintStyle5 = ({
                             ) : (
                               <>
                                 <div>{item?.ProdName}</div>
-                                <div>
-                                  {item?.Size +
-                                    item?.UomName +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
+                                {UomPrint?.SettingValue === 'Y' &&
+                                  <div>
+                                    {item?.Size +
+                                      item?.UomName +
+                                      '-' +
+                                      (GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty)}
+                                  </div>
+                                }
                               </>
                             )}
                           </div>
@@ -3377,16 +3399,16 @@ const PrintStyle5 = ({
                             <>
                               <div>{item?.ProdName}</div>
                               <div>
-                                {(item?.Size ? item?.Size : '1') +
+                                {UomPrint?.SettingValue === 'Y' ? ((item?.Size ? item?.Size : '1') +
                                   (item?.SinglePc == 'Y'
                                     ? 'PCS'
                                     : item?.Type != 'C'
                                       ? item?.UomName
-                                      : 'COMBO') +
-                                  '-' +
-                                  (GlobaldummyData
-                                    ? GlobalQuantity && item?.SalesQty
-                                    : item?.SalesQty)}
+                                      : 'COMBO')) : "" +
+                                      '-' +
+                                (GlobaldummyData
+                                  ? GlobalQuantity && item?.SalesQty
+                                  : item?.SalesQty)}
                               </div>
                             </>
                           )}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
index 16d0ed3..987a176 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
@@ -105,6 +105,9 @@ const Printstyle6 = ({
   const SettingData = useSelector(PreferenceData);
   const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   console.log(CashierNameField, "GlobaldummyData")
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -734,14 +737,16 @@ const Printstyle6 = ({
                                       ) : (
                                         <>
                                           <div> {item?.ProdName} </div>
-                                          <div>
-                                            {item?.Size +
-                                              item?.UomName +
-                                              '-' +
-                                              GlobaldummyData
-                                              ? GlobalQuantity && item?.SalesQty
-                                              : item?.SalesQty}
-                                          </div>
+                                          {UomPrint?.SettingValue === 'Y' &&
+                                            <div>
+                                              {item?.Size +
+                                                item?.UomName +
+                                                '-' +
+                                                GlobaldummyData
+                                                ? GlobalQuantity && item?.SalesQty
+                                                : item?.SalesQty}
+                                            </div>
+                                          }
                                         </>
                                       )}
                                     </td>
@@ -785,15 +790,11 @@ const Printstyle6 = ({
                                               }
 
                                               return (
-                                                <div>
-                                                  ({item?.Size || "1"}
-                                                  {item?.SinglePc === "Y"
-                                                    ? "PCS"
-                                                    : item?.Type !== "C"
-                                                      ? item?.UomName
-                                                      : "COMBO"}
-                                                  )
-                                                </div>
+                                                UomPrint?.SettingValue === 'Y' && (
+                                                  <div>
+                                                    ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
+                                                  </div>
+                                                )
                                               );
                                             })()}
 
@@ -1133,14 +1134,16 @@ const Printstyle6 = ({
                                       ) : (
                                         <>
                                           <div> {item?.ProdName} </div>
-                                          <div>
-                                            {item?.Size +
-                                              item?.UomName +
-                                              '-' +
-                                              GlobaldummyData
-                                              ? GlobalQuantity && item?.SalesQty
-                                              : item?.SalesQty}
-                                          </div>
+                                          {UomPrint?.SettingValue === 'Y' &&
+                                            <div>
+                                              {item?.Size +
+                                                item?.UomName +
+                                                '-' +
+                                                GlobaldummyData
+                                                ? GlobalQuantity && item?.SalesQty
+                                                : item?.SalesQty}
+                                            </div>
+                                          }
                                         </>
                                       )}
                                     </td>
@@ -1153,16 +1156,15 @@ const Printstyle6 = ({
                                     {/* 🏷 Product Name + Size */}
                                     <div>
                                       {GlobaldummyData
-                                        ? GlobalItem &&
-                                        `${item?.ProdName} (${item?.Size}${item?.UomName})`
-                                        : Item &&
-                                        `${item?.ProdName} (${item?.Size ? item.Size : "1"}${item?.SinglePc === "Y"
-                                          ? "PCS"
-                                          : item?.Type !== "C"
-                                            ? item?.UomName
-                                            : "COMBO"
-                                        })`}
+                                        ? GlobalItem && item?.ProdName
+                                        : Item && item?.ProdName
+                                      }
                                     </div>
+                                    {UomPrint?.SettingValue === 'Y' && (
+                                      <div>
+                                        ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
+                                      </div>
+                                    )}
 
                                     {/* 🏷 Brand */}
                                     {item?.BrandName && <div>{item.BrandName}</div>}
@@ -3553,14 +3555,16 @@ const Printstyle6 = ({
                                   ) : (
                                     <>
                                       <div> {item?.ProdName} </div>
-                                      <div>
-                                        {item?.Size +
-                                          item?.UomName +
-                                          '-' +
-                                          GlobaldummyData
-                                          ? GlobalQuantity && item?.SalesQty
-                                          : item?.SalesQty}
-                                      </div>
+                                      {UomPrint?.SettingValue === 'Y' &&
+                                        <div>
+                                          {item?.Size +
+                                            item?.UomName +
+                                            '-' +
+                                            GlobaldummyData
+                                            ? GlobalQuantity && item?.SalesQty
+                                            : item?.SalesQty}
+                                        </div>
+                                      }
                                     </>
                                   )}
                                 </td>
@@ -3598,15 +3602,11 @@ const Printstyle6 = ({
                                             </div>
                                           ))
                                         ) : (
-                                          <span>
-                                            ({item?.Size ? item?.Size : '1'}
-                                            {item?.SinglePc === 'Y'
-                                              ? 'PCS'
-                                              : item?.Type !== 'C'
-                                                ? item?.UomName
-                                                : 'COMBO'}
-                                            )
-                                          </span>
+                                          UomPrint?.SettingValue === 'Y' && (
+                                            <span>
+                                              ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
+                                            </span>
+                                          )
                                         )}
                                         {' - '}
                                         {Quantity && item?.SalesQty}
@@ -3846,14 +3846,16 @@ const Printstyle6 = ({
                                   ) : (
                                     <>
                                       <div> {item?.ProdName} </div>
-                                      <div>
-                                        {item?.Size +
-                                          item?.UomName +
-                                          '-' +
-                                          GlobaldummyData
-                                          ? GlobalQuantity && item?.SalesQty
-                                          : item?.SalesQty}
-                                      </div>
+                                      {UomPrint?.SettingValue === 'Y' &&
+                                        <div>
+                                          {item?.Size +
+                                            item?.UomName +
+                                            '-' +
+                                            GlobaldummyData
+                                            ? GlobalQuantity && item?.SalesQty
+                                            : item?.SalesQty}
+                                        </div>
+                                      }
                                     </>
                                   )}
                                 </td>
@@ -3867,21 +3869,21 @@ const Printstyle6 = ({
                                   const identifiers = item?.ProductIdentifierDtls ?? [];
 
                                   const sizeText = GlobaldummyData
-                                    ? GlobalItem &&
-                                    `${item?.ProdName} (${item?.Size}${item?.UomName})`
-                                    : Item &&
-                                    `${item?.ProdName} (${item?.Size || "1"}${item?.SinglePc === "Y"
-                                      ? "PCS"
-                                      : item?.Type !== "C"
-                                        ? item?.UomName
-                                        : "COMBO"
-                                    })`;
+                                    ? GlobalItem && item?.ProdName
+                                    : Item && item?.ProdName;
 
                                   return (
                                     <>
-                                      {/* 🏷 Product Name + Size */}
+                                      {/* 🏷 Product Name */}
                                       <div>{sizeText}</div>
 
+                                      {/* 📦 Size + UOM */}
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <div>
+                                          ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
+                                        </div>
+                                      )}
+
                                       {/* 🏷 Brand */}
                                       {item?.BrandName && <div>{item.BrandName}</div>}
 
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
index 73bb4a4..3afc539 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
@@ -100,6 +100,9 @@ const PrintStyle7 = ({
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
   const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -692,13 +695,9 @@ const PrintStyle7 = ({
                                         </div>
                                       ) : (
                                         <div>
-                                          ({item?.Size ? item?.Size : '1'}{' '}
-                                          {item?.SinglePc == 'Y'
-                                            ? 'PCS'
-                                            : item?.Type != 'C'
-                                              ? item?.UomName
-                                              : 'COMBO'}
-                                          )
+                                          {UomPrint?.SettingValue === 'Y' && (
+                                            <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
+                                          )}
                                         </div>
                                       )}
                                       <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
@@ -944,13 +943,9 @@ const PrintStyle7 = ({
 
                                       {/* 📦 Size + Brand */}
                                       <div>
-                                        ({item?.Size || "1"}{" "}
-                                        {item?.SinglePc === "Y"
-                                          ? "PCS"
-                                          : item?.Type !== "C"
-                                            ? item?.UomName
-                                            : "COMBO"}
-                                        )
+                                        {UomPrint?.SettingValue === 'Y' && (
+                                          <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
+                                        )}
                                         {item?.BrandName ? ` ${item.BrandName}` : ""}
                                       </div>
 
@@ -3155,13 +3150,9 @@ const PrintStyle7 = ({
                                     </div>
                                   ) : (
                                     <div>
-                                      ({item?.Size ? item?.Size : '1'}{' '}
-                                      {item?.SinglePc == 'Y'
-                                        ? 'PCS'
-                                        : item?.Type != 'C'
-                                          ? item?.UomName
-                                          : 'COMBO'}
-                                      )
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
+                                      )}
                                     </div>
                                   )}
                                   <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
@@ -3388,13 +3379,9 @@ const PrintStyle7 = ({
                                 >
                                   <div>{item?.ProdName}</div>
                                   <div>
-                                    ({item?.Size ? item?.Size : '1'}{' '}
-                                    {item?.SinglePc == 'Y'
-                                      ? 'PCS'
-                                      : item?.Type != 'C'
-                                        ? item?.UomName
-                                        : 'COMBO'}
-                                    )
+                                    {UomPrint?.SettingValue === 'Y' && (
+                                      <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
+                                    )}
                                     {item?.BrandName !== null
                                       ? item?.BrandName
                                       : ''}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
index 408daaa..0d62bd5 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
@@ -105,6 +105,9 @@ const Printstyle8 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -773,15 +776,11 @@ const Printstyle8 = ({
                                           ))}
                                         </div>
                                       ) : (
-                                        <div>
-                                          ({item?.Size ? item?.Size : '1'}{' '}
-                                          {item?.SinglePc == 'Y'
-                                            ? 'PCS'
-                                            : item?.Type != 'C'
-                                              ? item?.UomName
-                                              : 'COMBO'}
-                                          )
-                                        </div>
+                                        UomPrint?.SettingValue === 'Y' && (
+                                          <div>
+                                            ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
+                                          </div>
+                                        )
                                       )}
                                       <div style={{ display: 'flex', gap: "3px" }}>
                                         {item?.ProductIdentifierDtls?.length > 0
@@ -1133,45 +1132,38 @@ const Printstyle8 = ({
                                       }}
                                     >
                                       <div>{item?.ProdName}</div>
-                                      <div>
-                                        ({item?.Size ? item?.Size : '1'}{' '}
-                                        {item?.SinglePc == 'Y'
-                                          ? 'PCS'
-                                          : item?.Type != 'C'
-                                            ? item?.UomName
-                                            : 'COMBO'}
-                                        )
-                                        {item?.BrandName !== null
-                                          ? item?.BrandName
-                                          : ''}
-                                        &nbsp;
-                                        <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
-                                          {(item?.ProductIdentifierDtls ?? [])
-                                            .filter(items => items.SerialNumber)
-                                            .map((a, i) => (
-                                              <div key={`serial-${i}`}>
-                                                {a.SerialNumber}
-                                              </div>
-                                            ))}
-
-                                          {(item?.ProductIdentifierDtls ?? [])
-                                            .filter(id => id.IMEI1 || id.IMEI2)
-                                            .map((id, i) => (
-                                              <div key={`imei-${i}`}>
-                                                {[id.IMEI1, id.IMEI2].filter(Boolean).join(",")}
-                                              </div>
-                                            ))}
-
-                                          {(item?.ProductIdentifierDtls ?? [])
-                                            .filter(items => items.SerialNumber || items.IMEI1 || items.IMEI2)
-                                            .map((a, i) =>
-                                              a.Description ? (
-                                                <div key={`desc-${i}`}>
-                                                  {a.Description}
-                                                </div>
-                                              ) : null
-                                            )}
+                                      {UomPrint?.SettingValue === 'Y' && (
+                                        <div>
+                                          ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
                                         </div>
+                                      )}
+                                      {item?.BrandName !== null && <div>{item?.BrandName}</div>}
+                                      <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
+                                        {(item?.ProductIdentifierDtls ?? [])
+                                          .filter(items => items.SerialNumber)
+                                          .map((a, i) => (
+                                            <div key={`serial-${i}`}>
+                                              {a.SerialNumber}
+                                            </div>
+                                          ))}
+
+                                        {(item?.ProductIdentifierDtls ?? [])
+                                          .filter(id => id.IMEI1 || id.IMEI2)
+                                          .map((id, i) => (
+                                            <div key={`imei-${i}`}>
+                                              {[id.IMEI1, id.IMEI2].filter(Boolean).join(",")}
+                                            </div>
+                                          ))}
+
+                                        {(item?.ProductIdentifierDtls ?? [])
+                                          .filter(items => items.SerialNumber || items.IMEI1 || items.IMEI2)
+                                          .map((a, i) =>
+                                            a.Description ? (
+                                              <div key={`desc-${i}`}>
+                                                {a.Description}
+                                              </div>
+                                            ) : null
+                                          )}
                                       </div>
                                     </td>
                                   )}
@@ -3529,15 +3521,11 @@ const Printstyle8 = ({
                                       ))}
                                     </div>
                                   ) : (
-                                    <div>
-                                      ({item?.Size ? item?.Size : '1'}{' '}
-                                      {item?.SinglePc == 'Y'
-                                        ? 'PCS'
-                                        : item?.Type != 'C'
-                                          ? item?.UomName
-                                          : 'COMBO'}
-                                      )
-                                    </div>
+                                    UomPrint?.SettingValue === 'Y' && (
+                                      <div>
+                                        ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
+                                      </div>
+                                    )
                                   )}
                                 </td>
                               )}
@@ -3779,15 +3767,11 @@ const Printstyle8 = ({
                                   <div>{item?.ProdName}</div>
 
                                   {/* 📦 Size */}
-                                  <div>
-                                    ({item?.Size || "1"}{" "}
-                                    {item?.SinglePc === "Y"
-                                      ? "PCS"
-                                      : item?.Type !== "C"
-                                        ? item?.UomName
-                                        : "COMBO"}
-                                    )
-                                  </div>
+                                  {UomPrint?.SettingValue === 'Y' && (
+                                    <div>
+                                      ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
+                                    </div>
+                                  )}
 
                                   {/* 🏷 Brand */}
                                   {item?.BrandName && (
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
index d0c58bf..9b88c16 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
@@ -102,6 +102,9 @@ const PrintStyle9 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
+    (i) => i.SettingIdName === 'PrintUom'
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -728,7 +731,7 @@ const PrintStyle9 = ({
                                             </span>
                                           ))}
 
-                                          {item?.BrandName || ""}
+                                          {item?.BrandName && <div>{item.BrandName}</div>}
 
                                           {/* Identifiers */}
                                           <div style={{ display: "flex", gap: "3px", flexWrap: "wrap", flexDirection: "column" }}>
@@ -748,15 +751,18 @@ const PrintStyle9 = ({
                                       ) : (
                                         <div>
                                           {/* Size + UOM */}
-                                          ({item?.Size || "1"}{" "}
-                                          {item?.SinglePc === "Y"
-                                            ? "PCS"
-                                            : item?.Type !== "C"
-                                              ? item?.UomName
-                                              : "COMBO"}
-                                          )
+                                          {UomPrint?.SettingValue === 'Y' && (
+                                            <div>
+                                              ({item?.Size || "1"}{" "}
+                                              {item?.SinglePc === "Y"
+                                                ? "PCS"
+                                                : item?.Type !== "C"
+                                                  ? item?.UomName
+                                                  : "COMBO"})
+                                            </div>
+                                          )}
 
-                                          {item?.BrandName || ""}
+                                          {item?.BrandName && <div>{item.BrandName}</div>}
 
                                           {/* Identifiers */}
                                           {identifiers.map((id, i) => (
@@ -1028,15 +1034,17 @@ const PrintStyle9 = ({
                                     }}
                                   >
                                     <div>{item?.ProdName}</div>
-                                    <div>
-                                      ({item?.Size ? item?.Size : '1'}{' '}
-                                      {item?.SinglePc == 'Y'
-                                        ? 'PCS'
-                                        : item?.Type != 'C'
-                                          ? item?.UomName
-                                          : 'COMBO'}
-                                      )
-                                    </div>
+                                    {UomPrint?.SettingValue === 'Y' && (
+                                      <div>
+                                        ({item?.Size ? item?.Size : '1'}{' '}
+                                        {item?.SinglePc == 'Y'
+                                          ? 'PCS'
+                                          : item?.Type != 'C'
+                                            ? item?.UomName
+                                            : 'COMBO'})
+                                      </div>
+                                    )}
+                                    {item?.BrandName && <div>{item.BrandName}</div>}
                                   </td>
                                 )}
                               {GlobaldummyData
@@ -3396,45 +3404,43 @@ const PrintStyle9 = ({
                                   }}
                                 >
                                   <div>{item?.ProdName}</div>
-                                  <div>
-                                    ({item?.Size ? item?.Size : '1'}{' '}
-                                    {item?.SinglePc == 'Y'
-                                      ? 'PCS'
-                                      : item?.Type != 'C'
-                                        ? item?.UomName
-                                        : 'COMBO'}
-                                    )
-                                    {item?.BrandName !== null
-                                      ? item?.BrandName
-                                      : ''}
-                                    &nbsp;
-                                    <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
-                                      {(item?.ProductIdentifierDtls ?? [])
-                                        .filter(items => items.SerialNumber)
-                                        .map((a, i) => (
-                                          <div key={`serial-${i}`}>
-                                            {a.SerialNumber}
-                                          </div>
-                                        ))}
-
-                                      {(item?.ProductIdentifierDtls ?? [])
-                                        .filter(id => id.IMEI1 || id.IMEI2)
-                                        .map((id, i) => (
-                                          <div key={`imei-${i}`}>
-                                            {[id.IMEI1, id.IMEI2].filter(Boolean).join(",")}
-                                          </div>
-                                        ))}
-
-                                      {(item?.ProductIdentifierDtls ?? [])
-                                        .filter(items => items.SerialNumber || items.IMEI1 || items.IMEI2)
-                                        .map((a, i) =>
-                                          a.Description ? (
-                                            <div key={`desc-${i}`}>
-                                              {a.Description}
-                                            </div>
-                                          ) : null
-                                        )}
+                                  {UomPrint?.SettingValue === 'Y' && (
+                                    <div>
+                                      ({item?.Size ? item?.Size : '1'}{' '}
+                                      {item?.SinglePc == 'Y'
+                                        ? 'PCS'
+                                        : item?.Type != 'C'
+                                          ? item?.UomName
+                                          : 'COMBO'})
                                     </div>
+                                  )}
+                                  {item?.BrandName && <div>{item.BrandName}</div>}
+                                  <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(items => items.SerialNumber)
+                                      .map((a, i) => (
+                                        <div key={`serial-${i}`}>
+                                          {a.SerialNumber}
+                                        </div>
+                                      ))}
+
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(id => id.IMEI1 || id.IMEI2)
+                                      .map((id, i) => (
+                                        <div key={`imei-${i}`}>
+                                          {[id.IMEI1, id.IMEI2].filter(Boolean).join(",")}
+                                        </div>
+                                      ))}
+
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(items => items.SerialNumber || items.IMEI1 || items.IMEI2)
+                                      .map((a, i) =>
+                                        a.Description ? (
+                                          <div key={`desc-${i}`}>
+                                            {a.Description}
+                                          </div>
+                                        ) : null
+                                      )}
                                   </div>
                                 </td>
                               )}
diff --git a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
index 02c3ce5..f686a0b 100644
--- a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
+++ b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
@@ -456,7 +456,7 @@ const PaymentPdfBooking = ({
               >
                 Estimate
               </p>
-              <p
+              {/* <p
                 style={{
                   display: 'flex',
                   fontSize: '14px',
@@ -468,7 +468,7 @@ const PaymentPdfBooking = ({
               >
                 {SalesModePref?.SettingValue == 'Y' &&
                   `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
-              </p>
+              </p> */}
             </div>
           ) : (
             <div
@@ -490,7 +490,7 @@ const PaymentPdfBooking = ({
                   ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill'
                   : 'Bill'}
               </p>
-              <p
+              {/* <p
                 style={{
                   display: 'flex',
                   fontSize: '14px',
@@ -502,7 +502,7 @@ const PaymentPdfBooking = ({
               >
                 {SalesModePref?.SettingValue == 'Y' &&
                   `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
-              </p>
+              </p> */}
             </div>
           )}
         </div>
@@ -516,6 +516,11 @@ const PaymentPdfBooking = ({
                 table2Data?.FYStatus
               )}
           </div>
+          {SalesModePref?.SettingValue == 'Y' &&
+            <div style={{ fontSize: '12px', fontWeight: '600' }}>
+              {' '}
+              Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+            </div>}
           <div className="Re-print-bold1">Date:{Date1}</div>
         </div>
         {TakeawayData?.length > 0 && (