diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
index 7457dca..68e36ad 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
@@ -67,7 +67,7 @@ const PrintStyle1 = ({
const FieldDetails = useSelector(GloabalFieldDetails);
const SLNO = FieldDetails?.['Sl.No'];
const Item = FieldDetails?.['Item'];
- console.log(Item, 'Item');
+ console.log(Item, 'PrintStyle1PrintStyle1');
const MRP = FieldDetails?.['MRP'];
const Discount = FieldDetails?.['Discount'];
const Tax = FieldDetails?.['Tax'];
@@ -499,8 +499,8 @@ const PrintStyle1 = ({
}}
>
Estimate{' '}
- {SalesModePref?.SettingValue == 'Y' &&
- `(${table2Data?.SalesMode})`}
+ {/* {SalesModePref?.SettingValue == 'Y' &&
+ `(${table2Data?.SalesMode})`} */}
)}
{table2Data?.OrderType === 'E' ? (
@@ -524,8 +524,8 @@ const PrintStyle1 = ({
? PaymentStatusSuccess?.[0]?.PaymentTypeName +
' Bill'
: ''}
- {SalesModePref?.SettingValue == 'Y' &&
- `(${table2Data?.SalesMode})`}
+ {/* {SalesModePref?.SettingValue == 'Y' &&
+ `(${table2Data?.SalesMode})`} */}
)}
@@ -542,8 +542,8 @@ const PrintStyle1 = ({
}}
>
Estimate{' '}
- {SalesModePref?.SettingValue == 'Y' &&
- `(${table2Data?.SalesMode})`}
+ {/* {SalesModePref?.SettingValue == 'Y' &&
+ `(${table2Data?.SalesMode})`} */}
)}
@@ -609,6 +609,12 @@ const PrintStyle1 = ({
{' '}
Date : {GlobaldummyData ? formattedDate : Date1}{' '}
+ {SalesModePref?.SettingValue == 'Y' &&
+ {' '}
+ Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+
+
}
+
@@ -752,7 +758,7 @@ const PrintStyle1 = ({
? GlobalItem && {item?.ProdName} |
: Item == true && (
{item?.ProdName}
{PackageDetails?.filter(
@@ -792,36 +798,48 @@ const PrintStyle1 = ({
{' '}
{item?.BrandName !== null
? {item?.BrandName}
- : ''}
+ : ''}
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls?.filter(
- (items) =>
- !(
- items.SerialNumber == '' ||
- items.SerialNumber == null
- )
- )?.map((a) => {
- return {a.SerialNumber} ;
- })
- : ''}{' '}
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls.filter(
- (item1) =>
- item1.IMEI1 !== '' ||
- item1.IMEI2 !== ''
- )?.map((item2) => {
- const imei1 = item2.IMEI1 || '';
- const imei2 = item2.IMEI2 || '';
- return (
-
- {[imei1, imei2]
- .filter(Boolean)
- .join(',')}
-
- );
- })
- : ''}
+
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls?.filter(
+ (items) =>
+ !(
+ items.SerialNumber == '' ||
+ items.SerialNumber == null
+ )
+ )?.map((a) => {
+ return {a.SerialNumber} ;
+ })
+ : ''}{' '}
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (item1) =>
+ item1.IMEI1 !== '' ||
+ item1.IMEI2 !== ''
+ )?.map((item2) => {
+ const imei1 = item2.IMEI1 || '';
+ const imei2 = item2.IMEI2 || '';
+ return (
+
+ {[imei1, imei2]
+ .filter(Boolean)
+ .join(',')}
+
+ );
+ })
+ : ''}
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (items) =>
+ items.SerialNumber || items.IMEI1 || items.IMEI2
+ )?.map((a, i) => (
+ {a.Description}
+ ))
+
+ : ''}
+
+
|
)}
{GlobaldummyData
@@ -1028,6 +1046,7 @@ const PrintStyle1 = ({
? GlobalItem && {item?.ProdName} |
: Item == true && (
{item?.ProdName}
{UomPrint?.SettingValue === 'Y' &&
@@ -3743,8 +3762,8 @@ const PrintStyle1 = ({
}}
>
Estimate{' '}
- {SalesModePref?.SettingValue == 'Y' &&
- `(${table2Data?.SalesMode})`}
+ {/* {SalesModePref?.SettingValue == 'Y' &&
+ `(${table2Data?.SalesMode})`} */}
)}
{table2Data?.OrderType === 'E' ? (
@@ -3785,8 +3804,8 @@ const PrintStyle1 = ({
}}
>
Estimate{' '}
- {SalesModePref?.SettingValue == 'Y' &&
- `(${table2Data?.SalesMode})`}
+ {/* {SalesModePref?.SettingValue == 'Y' &&
+ `(${table2Data?.SalesMode})`} */}
)}
@@ -3958,7 +3977,7 @@ const PrintStyle1 = ({
? GlobalItem && | {item?.ProdName} |
: Item == true && (
{item?.ProdName}
{PackageDetails?.filter(
@@ -3999,35 +4018,41 @@ const PrintStyle1 = ({
{item?.BrandName !== null
? item?.BrandName
: ''}
-
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls?.filter(
- (items) =>
- !(
- items.SerialNumber == '' ||
- items.SerialNumber == null
- )
- )?.map((a) => {
- return {a.SerialNumber} ;
- })
- : ''}{' '}
- {item?.ProductIdentifierDtls?.length > 0
- ? item?.ProductIdentifierDtls.filter(
- (item1) =>
- item1.IMEI1 !== '' ||
- item1.IMEI2 !== ''
- )?.map((item2) => {
- const imei1 = item2.IMEI1 || '';
- const imei2 = item2.IMEI2 || '';
- return (
-
- {[imei1, imei2]
- .filter(Boolean)
- .join(',')}
-
- );
- })
- : ''}
+
+
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (items) =>
+ items.SerialNumber &&
+ items.SerialNumber !== ''
+ ).map((a, i) => (
+ {a.SerialNumber}
+ ))
+ : ''}
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (id) => id.IMEI1 !== '' || id.IMEI2 !== ''
+ ).map((id, i) => {
+ const imei1 = id.IMEI1 || '';
+ const imei2 = id.IMEI2 || '';
+ return (
+
+ {[imei1, imei2]
+ .filter(Boolean)
+ .join(',')}
+
+ );
+ })
+ : ''}
+ {item?.ProductIdentifierDtls?.length > 0
+ ? item?.ProductIdentifierDtls.filter(
+ (items) =>
+ items.SerialNumber || items.IMEI1 || items.IMEI2
+ )?.map((a, i) => (
+ {a.Description}
+ ))
+ : ''}
+
|
)}
{GlobaldummyData
@@ -4215,7 +4240,7 @@ const PrintStyle1 = ({
? GlobalItem && {item?.ProdName} |
: Item == true && (
{item?.ProdName}
{UomPrint?.SettingValue === 'Y' &&
|