diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx index e7b76a2..aab8f22 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx @@ -101,6 +101,9 @@ const PrintStyle10 = ({ 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) => @@ -687,8 +690,8 @@ const PrintStyle10 = ({ textAlign: 'left', }} > - {item?.ProdName}( - {item?.Size + item?.UomName}) + {item?.ProdName} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size + item?.UomName})`} ) : Item && ( @@ -735,13 +738,8 @@ const PrintStyle10 = ({
{/* Product size + brand */}
- ({item?.Size || '1'}{' '} - {item?.SinglePc === 'Y' - ? 'PCS' - : item?.Type !== 'C' - ? item?.UomName - : 'COMBO'} - ) {item?.BrandName || ''} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size || '1'} ${item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'})`} + {item?.BrandName && ` ${item?.BrandName}`}
{/* Product identifiers */} @@ -1019,8 +1017,8 @@ const PrintStyle10 = ({ textAlign: 'left', }} > - {item?.ProdName}( - {item?.Size + item?.UomName}) + {item?.ProdName} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size + item?.UomName})`} ) : Item && ( @@ -1031,15 +1029,17 @@ const PrintStyle10 = ({ }} >
{item?.ProdName}
-
- ({item?.Size ? item?.Size : '1'}{' '} - {item?.SinglePc == 'Y' - ? 'PCS' - : item?.Type != 'C' - ? item?.UomName - : 'COMBO'} - ) -
+ {UomPrint?.SettingValue === 'Y' && ( +
+ ({item?.Size ? item?.Size : '1'}{' '} + {item?.SinglePc == 'Y' + ? 'PCS' + : item?.Type != 'C' + ? item?.UomName + : 'COMBO'} + ) +
+ )} )} {GlobaldummyData @@ -3258,7 +3258,8 @@ const PrintStyle10 = ({ - {item?.ProdName}({item?.Size + item?.UomName}) + {item?.ProdName} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size + item?.UomName})`} ) : Item && ( @@ -3273,37 +3274,29 @@ const PrintStyle10 = ({ (pkg) => pkg.ProdId === item.ProdId ).length > 0 ? (
- {/* Package Details */} - {PackageDetails?.filter(pkg => pkg.ProdId === item.ProdId).map((pkg, index) => ( -
- {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType}) -
- ))} + {/* Package Details */} + {PackageDetails?.filter(pkg => pkg.ProdId === item.ProdId).map((pkg, index) => ( +
+ {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType}) +
+ ))} - {/* Brand */} - {item?.BrandName &&
{item.BrandName}
} + {/* Brand */} + {item?.BrandName &&
{item.BrandName}
} - {/* Product Identifiers */} - {item?.ProductIdentifierDtls?.map((id, i) => ( -
- {id.SerialNumber &&
{id.SerialNumber}
} - {(id.IMEI1 || id.IMEI2) &&
{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}
} - {id.Description &&
{id.Description}
} -
- ))} -
+ {/* Product Identifiers */} + {item?.ProductIdentifierDtls?.map((id, i) => ( +
+ {id.SerialNumber &&
{id.SerialNumber}
} + {(id.IMEI1 || id.IMEI2) &&
{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}
} + {id.Description &&
{id.Description}
} +
+ ))} +
) : (
- ({item?.Size ? item?.Size : '1'}{' '} - {item?.SinglePc == 'Y' - ? 'PCS' - : item?.Type != 'C' - ? item?.UomName - : 'COMBO'} - ) - {item?.BrandName !== null - ? item?.BrandName - : ''} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size ? item?.Size : '1'} ${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})`} + {item?.BrandName && ` ${item?.BrandName}`}   {/* {item?.ProductIdentifierDtls?.length > 0 ? item?.ProductIdentifierDtls?.filter( @@ -3569,7 +3562,8 @@ const PrintStyle10 = ({ - {item?.ProdName}({item?.Size + item?.UomName}) + {item?.ProdName} + {UomPrint?.SettingValue === 'Y' && `(${item?.Size + item?.UomName})`} ) : Item && ( @@ -3580,15 +3574,17 @@ const PrintStyle10 = ({ }} >
{item?.ProdName}
-
- ({item?.Size ? item?.Size : '1'}{' '} - {item?.SinglePc == 'Y' - ? 'PCS' - : item?.Type != 'C' - ? item?.UomName - : 'COMBO'} - ) -
+ {UomPrint?.SettingValue === 'Y' && ( +
+ ({item?.Size ? item?.Size : '1'}{' '} + {item?.SinglePc == 'Y' + ? 'PCS' + : item?.Type != 'C' + ? item?.UomName + : 'COMBO'} + ) +
+ )} )} {GlobaldummyData