diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
index fb3da9a..352007d 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
@@ -103,9 +103,9 @@ const PrintStyle5 = ({
   const GlobalCashierName = useSelector(GlobalprintCashierName);
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
-   const UomPrint =  SettingData?.[0]?.SettingDtlDetails?.filter(
+  const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
     (i) => i.SettingIdName === 'PrintUom'
-  )?.[0]; 
+  )?.[0];
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>
@@ -440,8 +440,8 @@ const PrintStyle5 = ({
                     {table2Data?.OrderType === 'E' && estimateTitle && (
                       <div style={{ textTransform: 'uppercase' }}>
                         Estimate{' '}
-                        {SalesModePref?.SettingValue == 'Y' &&
-                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                        {/* {SalesModePref?.SettingValue == 'Y' &&
+                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                       </div>
                     )}
                     {table2Data?.OrderType === 'E' ? (
@@ -455,8 +455,8 @@ const PrintStyle5 = ({
                             : PaymentStatusSuccess?.length === 1
                               ? PaymentStatusSuccess?.[0]?.PaymentTypeName
                               : ''}{' '}
-                        {SalesModePref?.SettingValue == 'Y' &&
-                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                        {/* {SalesModePref?.SettingValue == 'Y' &&
+                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                       </div>
                     )}
 
@@ -468,8 +468,8 @@ const PrintStyle5 = ({
                     style={{ textTransform: 'uppercase', textAlign: 'center' }}
                   >
                     Estimate{' '}
-                    {SalesModePref?.SettingValue == 'Y' &&
-                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                    {/* {SalesModePref?.SettingValue == 'Y' &&
+                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                   </div>
                 )}
 
@@ -482,7 +482,13 @@ const PrintStyle5 = ({
                   }}
                 >
                   {' '}
-                  <div> {GlobaldummyData ? formattedDate : Date1} </div>{' '}
+                  <div> {GlobaldummyData ? formattedDate : Date1}
+                    {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
+                      {' '}
+                      Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+                    </div>}
+
+                  </div>{' '}
                   <div>
                     {' '}
                     Bill No :
@@ -676,15 +682,15 @@ const PrintStyle5 = ({
                               ) : (
                                 <>
                                   <div>{item?.ProdName}</div>
-                                 { UomPrint?.SettingValue === 'Y' &&
-                                  <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>
@@ -700,85 +706,107 @@ const PrintStyle5 = ({
                               )
                             ) : (
                               <>
-                                <div>{item?.ProdName}</div>
-                                {PackageDetails?.filter(
-                                  (pkg) => pkg.ProdId === item.ProdId
-                                ).length > 0 ? (
-                                  <div>
-                                    {PackageDetails?.filter(
-                                      (pkg) => pkg.ProdId === item.ProdId
-                                    )?.map((item, index) => (
-                                      <span
-                                        key={index}
-                                        style={{ display: 'block' }}
-                                      >
-                                        {item.ParcelCount} PCS {item.ParcelQty}{' '}
-                                        PACK ({item.ParcelType})
-                                      </span>
-                                    ))}
-                                    {(item?.ProductIdentifierDtls?.filter(
-                                      (items) =>
-                                        items.SerialNumber &&
-                                        items.SerialNumber !== ''
-                                    )?.map((a, index) => (
-                                      <div key={`serial-${index}`}>
-                                        {a.SerialNumber}
-                                      </div>
-                                    )) || '') +
-                                      (item?.ProductIdentifierDtls?.filter(
-                                        (item1) => item1.IMEI1 || item1.IMEI2
-                                      )?.map((item2, index) => {
-                                        const imei1 = item2.IMEI1 || '';
-                                        const imei2 = item2.IMEI2 || '';
-                                        return (
-                                          <div key={`imei-${index}`}>
-                                            {[imei1, imei2]
-                                              .filter(Boolean)
-                                              .join(',')}
+                                {(() => {
+                                  const identifiers = item?.ProductIdentifierDtls ?? [];
+
+                                  const packageList = (PackageDetails ?? []).filter(
+                                    pkg => pkg.ProdId === item.ProdId
+                                  );
+
+                                  return (
+                                    <>
+                                      {/* 🏷 Product Name */}
+                                      <div>{item?.ProdName}</div>
+
+                                      {packageList.length > 0 ? (
+                                        // ================= PACKAGE EXISTS =================
+                                        <div>
+
+                                          {/* 📦 Package Details */}
+                                          {packageList.map((pkg, index) => (
+                                            <div key={index}>
+                                              {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+                                            </div>
+                                          ))}
+
+                                          {/* 🔢 Identifiers (Serial / IMEI / Description) */}
+                                          {identifiers.map((d, i) => {
+                                            const serial = d.SerialNumber;
+                                            const imei = [d.IMEI1, d.IMEI2].filter(Boolean).join(", ");
+                                            const description = d.Description;
+
+                                            if (!serial && !imei && !description) return null;
+
+                                            return (
+                                              <div key={i}>
+                                                {serial && <div>{serial}</div>}
+                                                {imei && <div>{imei}</div>}
+                                                {description && <div>{description}</div>}
+                                              </div>
+                                            );
+                                          })}
+
+                                          {/* 🔢 Quantity */}
+                                          <div>
+                                            {GlobaldummyData
+                                              ? GlobalQuantity && item?.SalesQty
+                                              : item?.SalesQty}
                                           </div>
-                                        );
-                                      }) || '') +
-                                      (GlobaldummyData
-                                        ? GlobalQuantity && item?.SalesQty
-                                        : item?.SalesQty)}
-                                  </div>
-                                ) : (
-                                  <div>
-                                    {UomPrint?.SettingValue === 'Y' ?((item?.Size || '1') +
-                                      (item?.SinglePc === 'Y'
-                                        ? 'PCS'
-                                        : item?.Type !== 'C'
-                                          ? item?.UomName
-                                          : 'COMBO')) :"" +
-                                      (item?.BrandName || '') +
-                                      (item?.ProductIdentifierDtls?.filter(
-                                        (items) =>
-                                          items.SerialNumber &&
-                                          items.SerialNumber !== ''
-                                      )?.map((a, index) => (
-                                        <div key={`serial-${index}`}>
-                                          {a.SerialNumber}
+
                                         </div>
-                                      )) || '') +
-                                      (item?.ProductIdentifierDtls?.filter(
-                                        (item1) => item1.IMEI1 || item1.IMEI2
-                                      )?.map((item2, index) => {
-                                        const imei1 = item2.IMEI1 || '';
-                                        const imei2 = item2.IMEI2 || '';
-                                        return (
-                                          <div key={`imei-${index}`}>
-                                            {[imei1, imei2]
-                                              .filter(Boolean)
-                                              .join(',')}
+                                      ) : (
+                                        // ================= NO PACKAGE =================
+                                        <div>
+
+                                          {/* 📏 Size + UOM */}
+                                          <div>
+                                            {UomPrint?.SettingValue === 'Y' && (
+                                              <>
+                                                {(item?.Size || "1")}{" "}
+                                                {item?.SinglePc === "Y"
+                                                  ? "PCS"
+                                                  : item?.Type !== "C"
+                                                    ? item?.UomName
+                                                    : "COMBO"}
+                                              </>
+                                            )}
                                           </div>
-                                        );
-                                      }) || '') +
-                                      '-' +
-                                      (GlobaldummyData
-                                        ? GlobalQuantity && item?.SalesQty
-                                        : item?.SalesQty)}
-                                  </div>
-                                )}
+
+                                          {/* 🏷 Brand */}
+                                          {item?.BrandName && (
+                                            <div>{item.BrandName}</div>
+                                          )}
+
+                                          {/* 🔢 Identifiers (Serial / IMEI / Description) */}
+                                          {identifiers.map((d, i) => {
+                                            const serial = d.SerialNumber;
+                                            const imei = [d.IMEI1, d.IMEI2].filter(Boolean).join(", ");
+                                            const description = d.Description;
+
+                                            if (!serial && !imei && !description) return null;
+
+                                            return (
+                                              <div key={i}>
+                                                {serial && <div>{serial}</div>}
+                                                {imei && <div>{imei}</div>}
+                                                {description && <div>{description}</div>}
+                                              </div>
+                                            );
+                                          })}
+
+                                          {/* 🔢 Quantity */}
+                                          <div>
+                                            -
+                                            {GlobaldummyData
+                                              ? GlobalQuantity && item?.SalesQty
+                                              : item?.SalesQty}
+                                          </div>
+
+                                        </div>
+                                      )}
+                                    </>
+                                  );
+                                })()}
                               </>
                             )}
                           </div>
@@ -1056,16 +1084,16 @@ const PrintStyle5 = ({
                               ) : (
                                 <>
                                   <div>{item?.ProdName}</div>
-                                 { UomPrint?.SettingValue === 'Y' &&
-                                  <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>
@@ -1083,19 +1111,19 @@ const PrintStyle5 = ({
                               <>
                                 <div>{item?.ProdName}</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>
+                                    {(item?.Size ? item?.Size : '1') +
+                                      (item?.SinglePc == 'Y'
+                                        ? 'PCS'
+                                        : item?.Type != 'C'
+                                          ? item?.UomName
+                                          : 'COMBO') +
+                                      '-' +
+                                      (GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty)}
+                                  </div>
+                                }
                               </>
                             )}
                           </div>
@@ -2737,8 +2765,8 @@ const PrintStyle5 = ({
               {table2Data?.OrderType === 'E' && estimateTitle && (
                 <div style={{ textTransform: 'uppercase' }}>
                   Estimate{' '}
-                  {SalesModePref?.SettingValue == 'Y' &&
-                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                  {/* {SalesModePref?.SettingValue == 'Y' &&
+                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                 </div>
               )}
               {table2Data?.OrderType === 'E' ? (
@@ -2754,8 +2782,8 @@ const PrintStyle5 = ({
                       : PaymentStatusSuccess?.length === 1
                         ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill'
                         : ''}{' '}
-                  {SalesModePref?.SettingValue == 'Y' &&
-                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                  {/* {SalesModePref?.SettingValue == 'Y' &&
+                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                 </div>
               )}
 
@@ -2765,8 +2793,8 @@ const PrintStyle5 = ({
           {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
             <div style={{ textTransform: 'uppercase', textAlign: 'center' }}>
               Estimate{' '}
-              {SalesModePref?.SettingValue == 'Y' &&
-                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+              {/* {SalesModePref?.SettingValue == 'Y' &&
+                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
             </div>
           )}
 
@@ -2780,7 +2808,12 @@ const PrintStyle5 = ({
               }}
             >
               {' '}
-              <div> {GlobaldummyData ? formattedDate : Date1} </div>{' '}
+              <div> {GlobaldummyData ? formattedDate : Date1}
+                {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
+                  {' '}
+                  Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+                </div>}
+              </div>{' '}
               <div>
                 {' '}
                 Bill No :
@@ -2964,15 +2997,15 @@ const PrintStyle5 = ({
                               <>
                                 <div>{item?.ProdName}</div>
                                 {UomPrint?.SettingValue === 'Y' && (
-                                <div>
-                                  {item?.Size +
-                                    item?.UomName +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
-)}
+                                  <div>
+                                    {item?.Size +
+                                      item?.UomName +
+                                      '-' +
+                                      (GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty)}
+                                  </div>
+                                )}
                               </>
                             )}
                           </div>
@@ -2988,88 +3021,110 @@ const PrintStyle5 = ({
                             )
                           ) : (
                             <>
+                              {/* 🏷 Product Name */}
                               <div>{item?.ProdName}</div>
-                              {PackageDetails?.filter(
-                                (pkg) => pkg.ProdId === item.ProdId
-                              ).length > 0 ? (
-                                <div>
-                                  {PackageDetails?.filter(
-                                    (pkg) => pkg.ProdId === item.ProdId
-                                  )?.map((item, index) => (
-                                    <span
-                                      key={index}
-                                      style={{ display: 'block' }}
-                                    >
-                                      {item.ParcelCount} PCS {item.ParcelQty}{' '}
-                                      PACK ({item.ParcelType})
-                                    </span>
-                                  ))}
 
-                                  {(item?.BrandName || '') +
-                                    (item?.ProductIdentifierDtls?.filter(
-                                      (items) =>
-                                        items.SerialNumber &&
-                                        items.SerialNumber !== ''
-                                    )?.map((a, index) => (
-                                      <div key={`serial-${index}`}>
-                                        {a.SerialNumber}
-                                      </div>
-                                    )) || '') +
-                                    (item?.ProductIdentifierDtls?.filter(
-                                      (item1) => item1.IMEI1 || item1.IMEI2
-                                    )?.map((item2, index) => {
-                                      const imei1 = item2.IMEI1 || '';
-                                      const imei2 = item2.IMEI2 || '';
+                              {(() => {
+                                const packages =
+                                  (PackageDetails ?? []).filter(pkg => pkg.ProdId === item.ProdId);
+
+                                const identifiers = item?.ProductIdentifierDtls ?? [];
+
+                                return packages.length > 0 ? (
+                                  // ================= PACKAGE EXISTS =================
+                                  <div>
+                                    {/* 📦 Package Details */}
+                                    {packages.map((pkg, index) => (
+                                      <span key={index} style={{ display: "block" }}>
+                                        {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+                                      </span>
+                                    ))}
+
+                                    {/* 🏷 Brand */}
+                                    {item?.BrandName && <div>{item.BrandName}</div>}
+
+                                    {/* 🔢 Serial / IMEI / Description */}
+                                    {identifiers.map((d, i) => {
+                                      const values = [
+                                        d.SerialNumber,
+                                        d.IMEI1,
+                                        d.IMEI2,
+                                        d.Description
+                                      ].filter(Boolean);
+
+                                      if (values.length === 0) return null;
+
                                       return (
-                                        <div key={`imei-${index}`}>
-                                          {[imei1, imei2]
-                                            .filter(Boolean)
-                                            .join(',')}
+                                        <div key={i}>
+                                          {values.join(", ")}
                                         </div>
                                       );
-                                    }) || '') +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
-                              ) : (
-                                <div>
-                                  {UomPrint?.SettingValue === 'Y' ?((item?.Size || '1') +
-                                    (item?.SinglePc === 'Y'
-                                      ? 'PCS'
-                                      : item?.Type !== 'C'
-                                        ? item?.UomName
-                                        : 'COMBO')):"" +
-                                    (item?.BrandName || '') +
-                                    (item?.ProductIdentifierDtls?.filter(
-                                      (items) =>
-                                        items.SerialNumber &&
-                                        items.SerialNumber !== ''
-                                    )?.map((a, index) => (
-                                      <div key={`serial-${index}`}>
-                                        {a.SerialNumber}
+                                    })}
+
+                                    {/* 🧪 Debug / Extra Text */}
+                                    <div>ssd3</div>
+
+                                    {/* 🔢 Quantity */}
+                                    <div>
+                                      -
+                                      {GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty}
+                                    </div>
+                                  </div>
+                                ) : (
+                                  // ================= NO PACKAGE =================
+                                  <div>
+                                    {/* 📏 Size + UOM */}
+                                    <div>
+                                     
+                                        {UomPrint?.SettingValue === 'Y' && (
+                                          <>
+                                            {item?.Size || "1"}{" "}
+                                            {item?.SinglePc === "Y"
+                                              ? "PCS"
+                                              : item?.Type !== "C"
+                                                ? item?.UomName
+                                                : "COMBO"}
+                                          </>
+                                        )}
                                       </div>
-                                    )) || '') +
-                                    (item?.ProductIdentifierDtls?.filter(
-                                      (item1) => item1.IMEI1 || item1.IMEI2
-                                    )?.map((item2, index) => {
-                                      const imei1 = item2.IMEI1 || '';
-                                      const imei2 = item2.IMEI2 || '';
+                                   
+
+                                    {/* 🏷 Brand */}
+                                    {item?.BrandName && <div>{item.BrandName}</div>}
+
+                                    {/* 🔢 Serial / IMEI / Description */}
+                                    {identifiers.map((d, i) => {
+                                      const values = [
+                                        d.SerialNumber,
+                                        d.IMEI1,
+                                        d.IMEI2,
+                                        d.Description
+                                      ].filter(Boolean);
+
+                                      if (values.length === 0) return null;
+
                                       return (
-                                        <div key={`imei-${index}`}>
-                                          {[imei1, imei2]
-                                            .filter(Boolean)
-                                            .join(',')}
+                                        <div key={i}>
+                                          {values.join(", ")}
                                         </div>
                                       );
-                                    }) || '') +
-                                    '-' +
-                                    (GlobaldummyData
-                                      ? GlobalQuantity && item?.SalesQty
-                                      : item?.SalesQty)}
-                                </div>
-                              )}
+                                    })}
+
+                                    {/* 🧪 Debug / Extra Text */}
+                                    <div>ssd4</div>
+
+                                    {/* 🔢 Quantity */}
+                                    <div>
+                                      -
+                                      {GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : item?.SalesQty}
+                                    </div>
+                                  </div>
+                                );
+                              })()}
                             </>
                           )}
                         </div>
@@ -3317,16 +3372,16 @@ const PrintStyle5 = ({
                             ) : (
                               <>
                                 <div>{item?.ProdName}</div>
-                               {UomPrint?.SettingValue === 'Y'&& 
-                                <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>
@@ -3344,16 +3399,16 @@ const PrintStyle5 = ({
                             <>
                               <div>{item?.ProdName}</div>
                               <div>
-                                {UomPrint?.SettingValue === 'Y'? ((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>
                             </>
                           )}