From e5c25772374f9d5d43636bde8100976e02b9931d Mon Sep 17 00:00:00 2001
From: karthikalakshmi <karthigalakshmi@pozomind.com>
Date: Tue, 3 Mar 2026 09:51:12 +0530
Subject: [PATCH] Update
 src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx

---
 .../ThermalPrinter/PrintStyle6.jsx            | 407 ++++++++++--------
 1 file changed, 227 insertions(+), 180 deletions(-)

diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
index 9ca3128..987a176 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
@@ -63,7 +63,7 @@ const Printstyle6 = ({
   sportsAppPreference,
   MembershipApplied = null,
 }) => {
-  console.log(table2Data, 'table2Data');
+  console.log(table2Data, 'table2Data22222222222222');
   const dispatch = useDispatch();
   const GlobalUpiID = useSelector(GlobalUpiIDprint);
   const FieldDetails = useSelector(GloabalFieldDetails);
@@ -105,9 +105,9 @@ const Printstyle6 = ({
   const SettingData = useSelector(PreferenceData);
   const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   console.log(CashierNameField, "GlobaldummyData")
-  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) =>
@@ -458,8 +458,8 @@ const Printstyle6 = ({
                         }}
                       >
                         Estimate{' '}
-                        {SalesModePref?.SettingValue == 'Y' &&
-                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                        {/* {SalesModePref?.SettingValue == 'Y' &&
+                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                       </div>
                     )}
 
@@ -480,8 +480,8 @@ const Printstyle6 = ({
                             : PaymentStatus?.length === 1
                               ? PaymentStatus?.[0]?.PaymentTypeName
                               : ''}{' '}
-                        {SalesModePref?.SettingValue == 'Y' &&
-                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}{' '}
+                        {/* {SalesModePref?.SettingValue == 'Y' &&
+                          `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}{' '} */}
                       </div>
                     )}
                   </div>
@@ -496,8 +496,8 @@ const Printstyle6 = ({
                     }}
                   >
                     Estimate{' '}
-                    {SalesModePref?.SettingValue == 'Y' &&
-                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                    {/* {SalesModePref?.SettingValue == 'Y' &&
+                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                   </div>
                 )}
                 <div
@@ -517,6 +517,10 @@ const Printstyle6 = ({
                       table2Data?.FYStatus
                     )}
                 </div>
+                {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
+                  {' '}
+                  Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+                </div>}
 
                 <div style={{ fontSize: '12px' }}>{Date1}</div>
                 <hr className="PrintStyle6-HrLine" />
@@ -734,15 +738,15 @@ const Printstyle6 = ({
                                         <>
                                           <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>
+                                          }
                                         </>
                                       )}
                                     </td>
@@ -768,35 +772,63 @@ const Printstyle6 = ({
                                       <>
                                         {Item && (
                                           <>
-                                            {item?.ProdName}
-                                            {PackageDetails?.filter(
-                                              (pkg) =>
-                                                pkg.ProdId === item.ProdId
-                                            ).length > 0 ? (
-                                              PackageDetails?.filter(
-                                                (pkg) =>
-                                                  pkg.ProdId === item.ProdId
-                                              )?.map((pkg, index) => (
-                                                <div key={index}>
-                                                  {pkg.ParcelCount} PCS{' '}
-                                                  {pkg.ParcelQty} PACK (
-                                                  {pkg.ParcelType})
-                                                </div>
-                                              ))
-                                            ) : (
-                                              UomPrint?.SettingValue === 'Y' &&
-                                              <span>
-                                                ({item?.Size ? item?.Size : '1'}
-                                                {item?.SinglePc === 'Y'
-                                                  ? 'PCS'
-                                                  : item?.Type !== 'C'
-                                                    ? item?.UomName
-                                                    : 'COMBO'}
+                                            {/* 🏷 Product Name */}
+                                            <div>{item?.ProdName}</div>
+
+                                            {/* 📦 Package OR Size */}
+                                            {(() => {
+                                              const packageList = (PackageDetails ?? []).filter(
+                                                pkg => pkg.ProdId === item.ProdId
+                                              );
+
+                                              if (packageList.length > 0) {
+                                                return packageList.map((pkg, index) => (
+                                                  <div key={index}>
+                                                    {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+                                                  </div>
+                                                ));
+                                              }
+
+                                              return (
+                                                UomPrint?.SettingValue === 'Y' && (
+                                                  <div>
+                                                    ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
+                                                  </div>
                                                 )
-                                              </span>
-                                            )}
-                                            {' - '}
-                                            {Quantity && item?.SalesQty}
+                                              );
+                                            })()}
+
+                                            {/* 🔢 Serial Numbers */}
+                                            {(item?.ProductIdentifierDtls ?? [])
+                                              .filter(d => d.SerialNumber)
+                                              .map((d, i) => (
+                                                <div key={`serial-${i}`}>
+                                                  {d.SerialNumber}
+                                                </div>
+                                              ))}
+
+                                            {/* 📱 IMEI Numbers */}
+                                            {(item?.ProductIdentifierDtls ?? [])
+                                              .filter(d => d.IMEI1 || d.IMEI2)
+                                              .map((d, i) => (
+                                                <div key={`imei-${i}`}>
+                                                  {[d.IMEI1, d.IMEI2].filter(Boolean).join(", ")}
+                                                </div>
+                                              ))}
+
+                                            {/* 📝 Description (Always New Line) */}
+                                            {(item?.ProductIdentifierDtls ?? [])
+                                              .filter(d => d.SerialNumber || d.IMEI1 || d.IMEI2 || d.Description)
+                                              .map((d, i) => (
+                                                <div key={`description-${i}`}>
+                                                  {d.Description}
+                                                </div>
+                                              ))}
+
+                                            {/* 🔢 Quantity */}
+                                            <div>
+                                              - {Quantity && item?.SalesQty}
+                                            </div>
                                           </>
                                         )}
                                       </>
@@ -1103,15 +1135,15 @@ const Printstyle6 = ({
                                         <>
                                           <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>
+                                          }
                                         </>
                                       )}
                                     </td>
@@ -1119,55 +1151,52 @@ const Printstyle6 = ({
                                 ) : (
                                   <td
                                     className="Re-print-body-Rate"
-                                    style={{ textAlign: 'left' }}
+                                    style={{ textAlign: "left" }}
                                   >
-                                    {(GlobaldummyData
-                                      ? GlobalItem &&
-                                      item?.ProdName +
-                                      `(${item?.Size + item?.UomName})`
-                                      : Item &&
-                                      item?.ProdName +
-                                     UomPrint?.SettingValue === 'Y' ? `(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})` : '' ) +
-                                      item?.BrandName !==
-                                      null
-                                      ? item?.BrandName
-                                      : '' +
-                                        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>
-                                            );
-                                          })
-                                          : '' +
-                                          '-' +
-                                          (GlobaldummyData
-                                            ? GlobalQuantity && item?.SalesQty
-                                            : Quantity && item?.SalesQty)}
+                                    {/* 🏷 Product Name + Size */}
+                                    <div>
+                                      {GlobaldummyData
+                                        ? 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>}
+
+                                    {/* 🔢 Serial Numbers */}
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(d => d.SerialNumber)
+                                      .map((d, i) => (
+                                        <div key={`serial-${i}`}>{d.SerialNumber}</div>
+                                      ))}
+
+                                    {/* 📱 IMEI Numbers */}
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(d => d.IMEI1 || d.IMEI2)
+                                      .map((d, i) => (
+                                        <div key={`imei-${i}`}>
+                                          {[d.IMEI1, d.IMEI2].filter(Boolean).join(", ")}
+                                        </div>
+                                      ))}
+                                    {(item?.ProductIdentifierDtls ?? [])
+                                      .filter(d => d.IMEI1 || d.IMEI2 || d.SerialNumber)
+                                      .map((d, i) => (
+                                        <div key={`description-${i}`}>{d.Description}</div>
+                                      ))}
+
+                                    {/* 🔢 Quantity */}
+                                    <div>
+                                      -
+                                      {GlobaldummyData
+                                        ? GlobalQuantity && item?.SalesQty
+                                        : Quantity && item?.SalesQty}
+                                    </div>
                                   </td>
                                 )}
                                 {GlobaldummyData
@@ -3319,8 +3348,8 @@ const Printstyle6 = ({
                   }}
                 >
                   Estimate{' '}
-                  {SalesModePref?.SettingValue == 'Y' &&
-                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                  {/* {SalesModePref?.SettingValue == 'Y' &&
+                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                 </div>
               )}
 
@@ -3343,8 +3372,8 @@ const Printstyle6 = ({
                       : PaymentStatusSuccess?.length === 1
                         ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill'
                         : ''}{' '}
-                  {SalesModePref?.SettingValue == 'Y' &&
-                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                  {/* {SalesModePref?.SettingValue == 'Y' &&
+                    `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                 </div>
               )}
             </div>
@@ -3360,8 +3389,8 @@ const Printstyle6 = ({
               }}
             >
               Estimate{' '}
-              {SalesModePref?.SettingValue == 'Y' &&
-                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+              {/* {SalesModePref?.SettingValue == 'Y' &&
+                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
             </div>
           )}
           <div
@@ -3381,6 +3410,10 @@ const Printstyle6 = ({
                 table2Data?.FYStatus
               )}
           </div>
+          {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
+            {' '}
+            Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+          </div>}
 
           <div style={{ fontSize: '12px' }}>{Date1}</div>
           <hr className="PrintStyle6-HrLine" />
@@ -3522,16 +3555,16 @@ const Printstyle6 = ({
                                   ) : (
                                     <>
                                       <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>
+                                      }
                                     </>
                                   )}
                                 </td>
@@ -3569,16 +3602,11 @@ const Printstyle6 = ({
                                             </div>
                                           ))
                                         ) : (
-                                          UomPrint?.SettingValue === 'Y' &&
-                                          <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}
@@ -3819,15 +3847,15 @@ const Printstyle6 = ({
                                     <>
                                       <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>
+                                      }
                                     </>
                                   )}
                                 </td>
@@ -3835,50 +3863,69 @@ const Printstyle6 = ({
                             ) : (
                               <td
                                 className="Re-print-body-Rate"
-                                style={{ textAlign: 'left' }}
+                                style={{ textAlign: "left" }}
                               >
-                                {(GlobaldummyData
-                                  ? GlobalItem &&
-                                  item?.ProdName +
-                                  `(${item?.Size + item?.UomName})`
-                                  : Item &&
-                                  item?.ProdName +
-                                  UomPrint?.SettingValue === 'Y' ? `(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})` : '' ) +
-                                  item?.BrandName !==
-                                  null
-                                  ? item?.BrandName
-                                  : '' + 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(',')}
+                                {(() => {
+                                  const identifiers = item?.ProductIdentifierDtls ?? [];
+
+                                  const sizeText = GlobaldummyData
+                                    ? GlobalItem && item?.ProdName
+                                    : Item && item?.ProdName;
+
+                                  return (
+                                    <>
+                                      {/* 🏷 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>}
+
+                                      {/* 🔢 Serial Numbers */}
+                                      {identifiers
+                                        .filter(d => d.SerialNumber)
+                                        .map((d, i) => (
+                                          <div key={`serial-${i}`}>
+                                            {d.SerialNumber}
                                           </div>
-                                        );
-                                      })
-                                      : '' +
-                                      '-' +
-                                      (GlobaldummyData
-                                        ? GlobalQuantity && item?.SalesQty
-                                        : Quantity && item?.SalesQty)}
+                                        ))}
+
+                                      {/* 📱 IMEI Numbers */}
+                                      {identifiers
+                                        .filter(d => d.IMEI1 || d.IMEI2)
+                                        .map((d, i) => (
+                                          <div key={`imei-${i}`}>
+                                            {[d.IMEI1, d.IMEI2].filter(Boolean).join(", ")}
+                                          </div>
+                                        ))}
+
+                                      {/* 📝 Description (only if Serial or IMEI exists) */}
+                                      {identifiers
+                                        .filter(d => d.SerialNumber || d.IMEI1 || d.IMEI2 || d.Description)
+                                        .map((d, i) =>
+                                          d.Description ? (
+                                            <div key={`description-${i}`}>
+                                              {d.Description}
+                                            </div>
+                                          ) : null
+                                        )}
+
+                                      {/* 🔢 Quantity */}
+                                      <div>
+                                        -
+                                        {GlobaldummyData
+                                          ? GlobalQuantity && item?.SalesQty
+                                          : Quantity && item?.SalesQty}
+                                      </div>
+                                    </>
+                                  );
+                                })()}
                               </td>
                             )}
                             {GlobaldummyData