karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved merge conflicts

This commit is contained in:
Tamilselvan 2026-03-02 18:28:33 +05:30
parent e7bda2a80f
commit b173fbc823
15 changed files with 489 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
View File

@ -59,6 +59,7 @@ import {
changePreviousOrderPayment, changePreviousOrderPayment,
changePreviousOrderOfferDetail, changePreviousOrderOfferDetail,
GlobalSalesBillEdit, GlobalSalesBillEdit,
changeCombofocus,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeFullFreeProductList, ChangeFullFreeProductList,
@ -93,6 +94,9 @@ const ComboSalesBillTable = () => {
const removeProducts = useRemoveProducts(); const removeProducts = useRemoveProducts();
const applyOffer = useApplyOfferto_CardDetail(); const applyOffer = useApplyOfferto_CardDetail();
const preferenceDatas = useSelector(PreferenceData); const preferenceDatas = useSelector(PreferenceData);
const UomPrint = preferenceDatas?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const preferenceDetails = preferenceDatas?.[0]?.SettingDtlDetails; const preferenceDetails = preferenceDatas?.[0]?.SettingDtlDetails;
const preferenceOffer = const preferenceOffer =
preferenceDetails?.find((item) => item.SettingIdName === 'Offer') preferenceDetails?.find((item) => item.SettingIdName === 'Offer')
@ -1354,7 +1358,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: isPaidproduct?.InwardDtlId, InwardDtlId: isPaidproduct?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: 0, Offer: 0,
OrderRate: isPaidproduct?.OrderRate OrderRate: isPaidproduct?.OrderRate,
}); });
} else if (isPaidproduct?.OrderQty > item?.OrderQty) { } else if (isPaidproduct?.OrderQty > item?.OrderQty) {
// Just Decrease Paid Qty // Just Decrease Paid Qty
@ -1526,7 +1530,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty, OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@ -1605,7 +1609,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty, OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@ -1639,7 +1643,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeOfferAppliedProdsFn({ await ChangeOfferAppliedProdsFn({
inwardDtlId: item?.InwardDtlId, inwardDtlId: item?.InwardDtlId,
@ -1671,7 +1675,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId, InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: 0, Offer: 0,
OrderRate: isPaidProductAvailableInCart?.OrderRate OrderRate: isPaidProductAvailableInCart?.OrderRate,
}); });
} else if ( } else if (
isPaidProductAvailableInCart?.OrderQty > item?.OrderQty isPaidProductAvailableInCart?.OrderQty > item?.OrderQty
@ -1755,7 +1759,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -1782,7 +1786,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -2119,7 +2123,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: item?.InwardDtlId, BuyInwardDtlId: item?.InwardDtlId,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: FreeProd?.OverAllFreeQty - item?.OrderQty, OverAllFreeQty: FreeProd?.OverAllFreeQty - item?.OrderQty,
@ -2138,7 +2142,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: item?.InwardDtlId, BuyInwardDtlId: item?.InwardDtlId,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: item?.OrderQty, OverAllFreeQty: item?.OrderQty,
@ -2544,13 +2548,13 @@ const ComboSalesBillTable = () => {
<td <td
key={`prod-${index}`} key={`prod-${index}`}
className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`} className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
onClick={() => onClick={() => {
(row.FullProductIdentifierDtls?.length > 0 || dispatch(changeCombofocus(true));
row.ProductIdentifierDtls?.length > 0 || imeiModal) row.FullProductIdentifierDtls?.length > 0 ||
row.ProductIdentifierDtls?.length > 0
? handleImeiDetails(row) ? handleImeiDetails(row)
: editField && handleEditQuantity(row) : editField && handleEditQuantity(row);
} }}
> >
{row?.Type !== 'OS' ? row.ProdName : row.ServiceName} {row?.Type !== 'OS' ? row.ProdName : row.ServiceName}
{row?.BrandName ? ` ${row.BrandName}` : ''} {row?.BrandName ? ` ${row.BrandName}` : ''}
@ -2606,13 +2610,15 @@ const ComboSalesBillTable = () => {
}} }}
key={`qty-${index}`} key={`qty-${index}`}
tabIndex={0} tabIndex={0}
className={`${EditQtyCombo && row?.localId === Index className={`${
EditQtyCombo && row?.localId === Index
? 'EditQTYcomboTD' ? 'EditQTYcomboTD'
: 'qtyTd' : 'qtyTd'
} ${isActiveCell ? 'active-cell' : ''}`} } ${isActiveCell ? 'active-cell' : ''}`}
onClick={() => onClick={() => {
editField && handleEditQuantityCombo(row) dispatch(changeCombofocus(true));
} editField && handleEditQuantityCombo(row);
}}
> >
{(!EditQtyCombo || row?.localId !== Index) && ( {(!EditQtyCombo || row?.localId !== Index) && (
<>{row.OrderQty}</> <>{row.OrderQty}</>

43
src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
View File

@ -95,6 +95,9 @@ const InvoiceTemplate = ({
const GlobalBilltext = useSelector(GlobalBillName); const GlobalBilltext = useSelector(GlobalBillName);
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -1292,15 +1295,17 @@ const InvoiceTemplate = ({
))} ))}
</div> </div>
) : ( ) : (
<div> UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"}{" "} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}{" "}
? "PCS" {item?.SinglePc === "Y"
: item?.Type !== "C" ? "PCS"
? item?.UomName : item?.Type !== "C"
: "COMBO"} ? item?.UomName
) : "COMBO"}
</div> )
</div>
)
)} )}
{/* Brand */} {/* Brand */}
@ -2995,15 +3000,17 @@ const InvoiceTemplate = ({
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{/* Size + UOM */} {/* Size + UOM */}
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"}{" "} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}{" "}
? "PCS" {item?.SinglePc === "Y"
: item?.Type !== "C" ? "PCS"
? item?.UomName : item?.Type !== "C"
: "COMBO"} ? item?.UomName
) : "COMBO"}
</div> )
</div>
)}
{/* Brand */} {/* Brand */}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}

43
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -102,6 +102,9 @@ const PrintA4Style11 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -725,15 +728,17 @@ const PrintA4Style11 = ({
))} ))}
</div> </div>
) : ( ) : (
<div> UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"}{" "} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}{" "}
? "PCS" {item?.SinglePc === "Y"
: item?.Type !== "C" ? "PCS"
? item?.UomName : item?.Type !== "C"
: "COMBO"} ? item?.UomName
) : "COMBO"}
</div> )
</div>
)
)} )}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}
@ -1770,15 +1775,17 @@ const PrintA4Style11 = ({
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{/* Size + UOM */} {/* Size + UOM */}
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"}{" "} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}{" "}
? "PCS" {item?.SinglePc === "Y"
: item?.Type !== "C" ? "PCS"
? item?.UomName : item?.Type !== "C"
: "COMBO"} ? item?.UomName
) : "COMBO"}
</div> )
</div>
)}
{/* Brand */} {/* Brand */}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}

49
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -128,6 +128,10 @@ const PrintStyle1 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle' setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
@ -775,6 +779,7 @@ const PrintStyle1 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -792,7 +797,7 @@ const PrintStyle1 = ({
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
? <div> {item?.BrandName}</div> ? <div>{item?.BrandName}</div>
: ''} : ''}
&nbsp; &nbsp;
<div style={{ display: "flex", gap: "2px", flexDirection: "column" }}> <div style={{ display: "flex", gap: "2px", flexDirection: "column" }}>
@ -829,7 +834,7 @@ const PrintStyle1 = ({
(items) => (items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2 items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => ( )?.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> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1053,6 +1059,7 @@ const PrintStyle1 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
@ -3991,6 +3998,7 @@ const PrintStyle1 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -4008,38 +4016,9 @@ const PrintStyle1 = ({
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
? <div> {item?.BrandName}</div> ? item?.BrandName
: ''} : ''}
&nbsp; &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>
);
})
: ''} */}
<div style={{ display: 'flex', gap: "3px", flexDirection: "column" }}> <div style={{ display: 'flex', gap: "3px", flexDirection: "column" }}>
{item?.ProductIdentifierDtls?.length > 0 {item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter( ? item?.ProductIdentifierDtls.filter(
@ -4070,7 +4049,7 @@ const PrintStyle1 = ({
(items) => (items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2 items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => ( )?.map((a, i) => (
<span key={i}>{a.Description} </span> <div key={i}>{a.Description} </div>
)) ))
: ''} : ''}
</div> </div>
@ -4264,6 +4243,7 @@ const PrintStyle1 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -4273,6 +4253,7 @@ const PrintStyle1 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`

48
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

@ -105,6 +105,9 @@ const PrintStyle11 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -3275,8 +3278,7 @@ const PrintStyle11 = ({
</span> </span>
))} ))}
{/* Brand Name */} {item?.BrandName && <div>{item.BrandName}</div>}
{item?.BrandName && <span>{item.BrandName}</span>}
{/* Product Identifiers */} {/* Product Identifiers */}
{item?.ProductIdentifierDtls?.map((detail, idx) => { {item?.ProductIdentifierDtls?.map((detail, idx) => {
@ -3304,17 +3306,17 @@ const PrintStyle11 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <div>
? 'PCS' ({item?.Size ? item?.Size : '1'}{' '}
: item?.Type != 'C' {item?.SinglePc == 'Y'
? item?.UomName ? 'PCS'
: 'COMBO'} : item?.Type != 'C'
) ? item?.UomName
{item?.BrandName !== null : 'COMBO'})
? item?.BrandName </div>
: ''} )}
&nbsp; {item?.BrandName && <div>{item.BrandName}</div>}
{/* {item?.ProductIdentifierDtls?.length > 0 {/* {item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls?.filter( ? item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -3588,15 +3590,17 @@ const PrintStyle11 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size ? item?.Size : '1'}{' '}
? 'PCS' {item?.SinglePc == 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type != 'C'
: 'COMBO'} ? item?.UomName
) : 'COMBO'})
</div> </div>
)}
{item?.BrandName && <div>{item.BrandName}</div>}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

92
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

@ -838,10 +838,7 @@ const Printstyle12 = ({
{item.ParcelType}) {item.ParcelType})
</span> </span>
))} ))}
{item?.BrandName !== null {item?.BrandName && <div>{item.BrandName}</div>}
? item?.BrandName
: ''}
&nbsp;
<div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}> <div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
{item?.ProductIdentifierDtls?.map((detail, index) => { {item?.ProductIdentifierDtls?.map((detail, index) => {
const serial = detail.SerialNumber?.trim(); const serial = detail.SerialNumber?.trim();
@ -870,17 +867,17 @@ const Printstyle12 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <div>
? 'PCS' ({item?.Size || '1'}){' '}
: item?.Type != 'C' {item?.SinglePc === 'Y'
? item?.UomName ? 'PCS'
: 'COMBO'} : item?.Type !== 'C'
) ? item?.UomName
{item?.BrandName !== null : 'COMBO'}
? item?.BrandName </div>
: ''} )}
&nbsp; {item?.BrandName && <div>{item.BrandName}</div>}
{item?.ProductIdentifierDtls {item?.ProductIdentifierDtls
?.length > 0 ?.length > 0
? item?.ProductIdentifierDtls?.filter( ? item?.ProductIdentifierDtls?.filter(
@ -1117,15 +1114,16 @@ const Printstyle12 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size || '1'}){' '}
? 'PCS' {item?.SinglePc === 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type !== 'C'
: 'COMBO'} ? item?.UomName
) : 'COMBO'}
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3463,10 +3461,7 @@ const Printstyle12 = ({
{item.ParcelType}) {item.ParcelType})
</span> </span>
))} ))}
{item?.BrandName !== null {item?.BrandName && <div>{item.BrandName}</div>}
? item?.BrandName
: ''}
&nbsp;
{item?.ProductIdentifierDtls?.length > 0 {item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls?.filter( ? item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -3500,17 +3495,17 @@ const Printstyle12 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <div>
? 'PCS' ({item?.Size || '1'}){' '}
: item?.Type != 'C' {item?.SinglePc === 'Y'
? item?.UomName ? 'PCS'
: 'COMBO'} : item?.Type !== 'C'
) ? item?.UomName
{item?.BrandName !== null : 'COMBO'}
? item?.BrandName </div>
: ''} )}
&nbsp; {item?.BrandName && <div>{item.BrandName}</div>}
{/* {item?.ProductIdentifierDtls?.length > 0 {/* {item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls?.filter( ? item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -3754,15 +3749,16 @@ const Printstyle12 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size || '1'}){' '}
? 'PCS' {item?.SinglePc === 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type !== 'C'
: 'COMBO'} ? item?.UomName
) : 'COMBO'}
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

14
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -107,6 +107,9 @@ const Printstyle2 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -712,7 +715,8 @@ const Printstyle2 = ({
</span> </span>
))} ))}
</div> </div>
) : ( ) : UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -766,7 +770,7 @@ const Printstyle2 = ({
(items) => (items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2 items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => ( )?.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> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1072,6 +1077,7 @@ const Printstyle2 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3356,7 +3362,7 @@ const Printstyle2 = ({
(items) => (items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2 items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => ( )?.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> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3626,6 +3633,7 @@ const Printstyle2 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

@ -80,6 +80,9 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); 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 estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
@ -289,7 +292,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</span> </span>
))} ))}
</div> </div>
: <div> : UomPrint?.SettingValue === 'Y' &&<div>
({item?.Size ? item?.Size : "1"}{" "} ({item?.Size ? item?.Size : "1"}{" "}
{item?.SinglePc == "Y" {item?.SinglePc == "Y"
? "PCS" ? "PCS"
@ -329,7 +332,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
(items) => (items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2 items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => ( )?.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 && {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 style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
<div>{item?.ProdName}</div> <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>} </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 ? 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>} {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> </span>
))} ))}
</div> </div>
: <div> : UomPrint?.SettingValue === 'Y' && <div>
({item?.Size ? item?.Size : "1"}{" "} ({item?.Size ? item?.Size : "1"}{" "}
{item?.SinglePc == "Y" {item?.SinglePc == "Y"
? "PCS" ? "PCS"
@ -1329,7 +1332,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item && {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 style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
<div>{item?.ProdName}</div> <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>} </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 ? 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>} {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>}

32
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -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 = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -759,12 +762,14 @@ const Printstyle4 = ({
</div> </div>
) : ( ) : (
<div> <div>
{(item?.Size || "1")}{" "} {(UomPrint?.SettingValue === 'Y'
{item?.SinglePc === "Y" ? (item?.Size || '1') +
? "PCS" (item?.SinglePc === 'Y'
: item?.Type !== "C" ? ' PCS'
? item?.UomName : item?.Type !== 'C'
: "COMBO"}{" "} ? ` ${item?.UomName}`
: ' COMBO')
: '')}
{item?.BrandName || ""} {item?.BrandName || ""}
</div> </div>
)} )}
@ -1016,6 +1021,7 @@ const Printstyle4 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1025,6 +1031,7 @@ const Printstyle4 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3408,12 +3415,9 @@ const Printstyle4 = ({
</div> </div>
) : ( ) : (
<div> <div>
{(item?.Size || '1')}{" "} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc === 'Y' <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
? 'PCS' )}
: item?.Type !== 'C'
? item?.UomName
: 'COMBO'}{" "}
{item?.BrandName || ""} {item?.BrandName || ""}
</div> </div>
)} )}
@ -3737,6 +3741,7 @@ const Printstyle4 = ({
: Quantity && ( : Quantity && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.SalesQty} {item?.SalesQty}
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3746,6 +3751,7 @@ const Printstyle4 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

148
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -103,6 +103,9 @@ const PrintStyle5 = ({
const GlobalCashierName = useSelector(GlobalprintCashierName); const GlobalCashierName = useSelector(GlobalprintCashierName);
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -679,14 +682,15 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
(GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty (GlobaldummyData
: item?.SalesQty)} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty)}
</div>}
</> </>
)} )}
</div> </div>
@ -756,12 +760,16 @@ const PrintStyle5 = ({
{/* 📏 Size + UOM */} {/* 📏 Size + UOM */}
<div> <div>
{(item?.Size || "1")}{" "} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc === "Y" <>
? "PCS" {(item?.Size || "1")}{" "}
: item?.Type !== "C" {item?.SinglePc === "Y"
? item?.UomName ? "PCS"
: "COMBO"} : item?.Type !== "C"
? item?.UomName
: "COMBO"}
</>
)}
</div> </div>
{/* 🏷 Brand */} {/* 🏷 Brand */}
@ -1076,14 +1084,16 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
(GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty (GlobaldummyData
: item?.SalesQty)} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty)}
</div>
}
</> </>
)} )}
</div> </div>
@ -1100,18 +1110,20 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' &&
{(item?.Size ? item?.Size : '1') + <div>
(item?.SinglePc == 'Y' {(item?.Size ? item?.Size : '1') +
? 'PCS' (item?.SinglePc == 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type != 'C'
: 'COMBO') + ? item?.UomName
'-' + : 'COMBO') +
(GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty (GlobaldummyData
: item?.SalesQty)} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty)}
</div>
}
</> </>
)} )}
</div> </div>
@ -2984,14 +2996,16 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
(GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty (GlobaldummyData
: item?.SalesQty)} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty)}
</div>
)}
</> </>
)} )}
</div> </div>
@ -3063,13 +3077,19 @@ const PrintStyle5 = ({
<div> <div>
{/* 📏 Size + UOM */} {/* 📏 Size + UOM */}
<div> <div>
{(item?.Size || "1")}
{item?.SinglePc === "Y" {UomPrint?.SettingValue === 'Y' && (
? "PCS" <>
: item?.Type !== "C" {item?.Size || "1"}{" "}
? item?.UomName {item?.SinglePc === "Y"
: "COMBO"} ? "PCS"
</div> : item?.Type !== "C"
? item?.UomName
: "COMBO"}
</>
)}
</div>
{/* 🏷 Brand */} {/* 🏷 Brand */}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}
@ -3352,14 +3372,16 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
(GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty (GlobaldummyData
: item?.SalesQty)} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty)}
</div>
}
</> </>
)} )}
</div> </div>
@ -3377,16 +3399,16 @@ const PrintStyle5 = ({
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
{(item?.Size ? item?.Size : '1') + {UomPrint?.SettingValue === 'Y' ? ((item?.Size ? item?.Size : '1') +
(item?.SinglePc == 'Y' (item?.SinglePc == 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type != 'C'
? item?.UomName ? item?.UomName
: 'COMBO') + : 'COMBO')) : "" +
'-' + '-' +
(GlobaldummyData (GlobaldummyData
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>
</> </>
)} )}

140
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -105,6 +105,9 @@ const Printstyle6 = ({
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(CashierNameField, "GlobaldummyData") console.log(CashierNameField, "GlobaldummyData")
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -734,14 +737,16 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty GlobaldummyData
: item?.SalesQty} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty}
</div>
}
</> </>
)} )}
</td> </td>
@ -785,15 +790,11 @@ const Printstyle6 = ({
} }
return ( return (
<div> UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
? "PCS" </div>
: item?.Type !== "C" )
? item?.UomName
: "COMBO"}
)
</div>
); );
})()} })()}
@ -1133,14 +1134,16 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty GlobaldummyData
: item?.SalesQty} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty}
</div>
}
</> </>
)} )}
</td> </td>
@ -1153,16 +1156,15 @@ const Printstyle6 = ({
{/* 🏷 Product Name + Size */} {/* 🏷 Product Name + Size */}
<div> <div>
{GlobaldummyData {GlobaldummyData
? GlobalItem && ? GlobalItem && item?.ProdName
`${item?.ProdName} (${item?.Size}${item?.UomName})` : Item && item?.ProdName
: Item && }
`${item?.ProdName} (${item?.Size ? item.Size : "1"}${item?.SinglePc === "Y"
? "PCS"
: item?.Type !== "C"
? item?.UomName
: "COMBO"
})`}
</div> </div>
{UomPrint?.SettingValue === 'Y' && (
<div>
({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
</div>
)}
{/* 🏷 Brand */} {/* 🏷 Brand */}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}
@ -3553,14 +3555,16 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty GlobaldummyData
: item?.SalesQty} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty}
</div>
}
</> </>
)} )}
</td> </td>
@ -3598,15 +3602,11 @@ const Printstyle6 = ({
</div> </div>
)) ))
) : ( ) : (
<span> UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'} <span>
{item?.SinglePc === 'Y' ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
? 'PCS' </span>
: item?.Type !== 'C' )
? item?.UomName
: 'COMBO'}
)
</span>
)} )}
{' - '} {' - '}
{Quantity && item?.SalesQty} {Quantity && item?.SalesQty}
@ -3846,14 +3846,16 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
<div> {UomPrint?.SettingValue === 'Y' &&
{item?.Size + <div>
item?.UomName + {item?.Size +
'-' + item?.UomName +
GlobaldummyData '-' +
? GlobalQuantity && item?.SalesQty GlobaldummyData
: item?.SalesQty} ? GlobalQuantity && item?.SalesQty
</div> : item?.SalesQty}
</div>
}
</> </>
)} )}
</td> </td>
@ -3867,21 +3869,21 @@ const Printstyle6 = ({
const identifiers = item?.ProductIdentifierDtls ?? []; const identifiers = item?.ProductIdentifierDtls ?? [];
const sizeText = GlobaldummyData const sizeText = GlobaldummyData
? GlobalItem && ? GlobalItem && item?.ProdName
`${item?.ProdName} (${item?.Size}${item?.UomName})` : Item && item?.ProdName;
: Item &&
`${item?.ProdName} (${item?.Size || "1"}${item?.SinglePc === "Y"
? "PCS"
: item?.Type !== "C"
? item?.UomName
: "COMBO"
})`;
return ( return (
<> <>
{/* 🏷 Product Name + Size */} {/* 🏷 Product Name */}
<div>{sizeText}</div> <div>{sizeText}</div>
{/* 📦 Size + UOM */}
{UomPrint?.SettingValue === 'Y' && (
<div>
({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
</div>
)}
{/* 🏷 Brand */} {/* 🏷 Brand */}
{item?.BrandName && <div>{item.BrandName}</div>} {item?.BrandName && <div>{item.BrandName}</div>}

43
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

@ -100,6 +100,9 @@ const PrintStyle7 = ({
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -692,13 +695,9 @@ const PrintStyle7 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
? 'PCS' )}
: item?.Type != 'C'
? item?.UomName
: 'COMBO'}
)
</div> </div>
)} )}
<div style={{ display: "flex", flexDirection: "column", gap: "3px" }}> <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
@ -944,13 +943,9 @@ const PrintStyle7 = ({
{/* 📦 Size + Brand */} {/* 📦 Size + Brand */}
<div> <div>
({item?.Size || "1"}{" "} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc === "Y" <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
? "PCS" )}
: item?.Type !== "C"
? item?.UomName
: "COMBO"}
)
{item?.BrandName ? ` ${item.BrandName}` : ""} {item?.BrandName ? ` ${item.BrandName}` : ""}
</div> </div>
@ -3155,13 +3150,9 @@ const PrintStyle7 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
? 'PCS' )}
: item?.Type != 'C'
? item?.UomName
: 'COMBO'}
)
</div> </div>
)} )}
<div style={{ display: "flex", flexDirection: "column", gap: "3px" }}> <div style={{ display: "flex", flexDirection: "column", gap: "3px" }}>
@ -3388,13 +3379,9 @@ const PrintStyle7 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc == 'Y' <>({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'} </>
? 'PCS' )}
: item?.Type != 'C'
? item?.UomName
: 'COMBO'}
)
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}

114
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

@ -105,6 +105,9 @@ const Printstyle8 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -773,15 +776,11 @@ const Printstyle8 = ({
))} ))}
</div> </div>
) : ( ) : (
<div> UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
? 'PCS' </div>
: item?.Type != 'C' )
? item?.UomName
: 'COMBO'}
)
</div>
)} )}
<div style={{ display: 'flex', gap: "3px" }}> <div style={{ display: 'flex', gap: "3px" }}>
{item?.ProductIdentifierDtls?.length > 0 {item?.ProductIdentifierDtls?.length > 0
@ -1133,45 +1132,38 @@ const Printstyle8 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
? '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
)}
</div> </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> </div>
</td> </td>
)} )}
@ -3529,15 +3521,11 @@ const Printstyle8 = ({
))} ))}
</div> </div>
) : ( ) : (
<div> UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size || '1'}) {item?.SinglePc === 'Y' ? 'PCS' : item?.Type !== 'C' ? item?.UomName : 'COMBO'}
? 'PCS' </div>
: item?.Type != 'C' )
? item?.UomName
: 'COMBO'}
)
</div>
)} )}
</td> </td>
)} )}
@ -3779,15 +3767,11 @@ const Printstyle8 = ({
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{/* 📦 Size */} {/* 📦 Size */}
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size || "1"}{" "} <div>
{item?.SinglePc === "Y" ({item?.Size || "1"}) {item?.SinglePc === "Y" ? "PCS" : item?.Type !== "C" ? item?.UomName : "COMBO"}
? "PCS" </div>
: item?.Type !== "C" )}
? item?.UomName
: "COMBO"}
)
</div>
{/* 🏷 Brand */} {/* 🏷 Brand */}
{item?.BrandName && ( {item?.BrandName && (

118
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -102,6 +102,9 @@ const PrintStyle9 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -728,7 +731,7 @@ const PrintStyle9 = ({
</span> </span>
))} ))}
{item?.BrandName || ""} {item?.BrandName && <div>{item.BrandName}</div>}
{/* Identifiers */} {/* Identifiers */}
<div style={{ display: "flex", gap: "3px", flexWrap: "wrap", flexDirection: "column" }}> <div style={{ display: "flex", gap: "3px", flexWrap: "wrap", flexDirection: "column" }}>
@ -748,15 +751,18 @@ const PrintStyle9 = ({
) : ( ) : (
<div> <div>
{/* Size + UOM */} {/* Size + UOM */}
({item?.Size || "1"}{" "} {UomPrint?.SettingValue === 'Y' && (
{item?.SinglePc === "Y" <div>
? "PCS" ({item?.Size || "1"}{" "}
: item?.Type !== "C" {item?.SinglePc === "Y"
? item?.UomName ? "PCS"
: "COMBO"} : item?.Type !== "C"
) ? item?.UomName
: "COMBO"})
</div>
)}
{item?.BrandName || ""} {item?.BrandName && <div>{item.BrandName}</div>}
{/* Identifiers */} {/* Identifiers */}
{identifiers.map((id, i) => ( {identifiers.map((id, i) => (
@ -1028,15 +1034,17 @@ const PrintStyle9 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size ? item?.Size : '1'}{' '}
? 'PCS' {item?.SinglePc == 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type != 'C'
: 'COMBO'} ? item?.UomName
) : 'COMBO'})
</div> </div>
)}
{item?.BrandName && <div>{item.BrandName}</div>}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3396,45 +3404,43 @@ const PrintStyle9 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> {UomPrint?.SettingValue === 'Y' && (
({item?.Size ? item?.Size : '1'}{' '} <div>
{item?.SinglePc == 'Y' ({item?.Size ? item?.Size : '1'}{' '}
? 'PCS' {item?.SinglePc == 'Y'
: item?.Type != 'C' ? 'PCS'
? item?.UomName : item?.Type != 'C'
: 'COMBO'} ? 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
)}
</div> </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> </div>
</td> </td>
)} )}

13
src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
View File

@ -456,7 +456,7 @@ const PaymentPdfBooking = ({
> >
Estimate Estimate
</p> </p>
<p {/* <p
style={{ style={{
display: 'flex', display: 'flex',
fontSize: '14px', fontSize: '14px',
@ -468,7 +468,7 @@ const PaymentPdfBooking = ({
> >
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
</p> </p> */}
</div> </div>
) : ( ) : (
<div <div
@ -490,7 +490,7 @@ const PaymentPdfBooking = ({
? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill'
: 'Bill'} : 'Bill'}
</p> </p>
<p {/* <p
style={{ style={{
display: 'flex', display: 'flex',
fontSize: '14px', fontSize: '14px',
@ -502,7 +502,7 @@ const PaymentPdfBooking = ({
> >
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
</p> </p> */}
</div> </div>
)} )}
</div> </div>
@ -516,6 +516,11 @@ const PaymentPdfBooking = ({
table2Data?.FYStatus table2Data?.FYStatus
)} )}
</div> </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 className="Re-print-bold1">Date:{Date1}</div>
</div> </div>
{TakeawayData?.length > 0 && ( {TakeawayData?.length > 0 && (