From 1b0ed556ee618fa7e5b085f044c5c7130ce2b6fa Mon Sep 17 00:00:00 2001 From: Tamilselvan Date: Thu, 5 Mar 2026 14:06:00 +0530 Subject: [PATCH] Revert "testing" This reverts commit 0027bb1f499ba13d49b4c172450214833658ebca. --- .../ThermalPrinter/PrintStyle12.jsx | 296 +++++++++--------- 1 file changed, 145 insertions(+), 151 deletions(-) diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx index f0b05d8..b065b7e 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx @@ -31,16 +31,16 @@ import { GlobalprintCredit, GlobalprintTax, GlobalSelectedPrintHeaderColor, - GlobalSelectedPrintHeaderFontColor, - GlobalSelectedTableHeaderColor, - GlobalSelectedTableHeaderFontColor, - GlobalSelectedTableBodyFontColor, - GlobalSelectedTableBodyColor, - GlobalRowType, - GlobalSelectedFooterColor, - GlobalSelectedFooterFontColor, - GlobalSelectedNetAmountColor, - GlobalSelectedNetAmountFontColor, + GlobalSelectedPrintHeaderFontColor, + GlobalSelectedTableHeaderColor, + GlobalSelectedTableHeaderFontColor, + GlobalSelectedTableBodyFontColor, + GlobalSelectedTableBodyColor, + GlobalRowType, + GlobalSelectedFooterColor, + GlobalSelectedFooterFontColor, + GlobalSelectedNetAmountColor, + GlobalSelectedNetAmountFontColor, } from '../../../../Features/ThemeChange/ThemeChange'; import { GlobalUpiIDprint, @@ -114,29 +114,23 @@ const Printstyle12 = ({ const GlobalCredit = useSelector(GlobalprintCredit); const SettingData = useSelector(PreferenceData); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); - const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor); - const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor); - const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor); - const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor); - const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor); - const SelectedRowType = useSelector(GlobalRowType); - const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor); - const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor); - const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor); - const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor); - let printColors = printDatas?.PrintColors; - const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor; - const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor; - const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor; - const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor; - const netAmtColor = printColors?.find(obj => obj.netAmtColor)?.netAmtColor; - const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find( - (setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname' - ); - const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find( - (setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname' - ); - const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter( + const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor); + const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor); + const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor); + const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor); + const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor); + const SelectedRowType = useSelector(GlobalRowType); + const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor); + const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor); + const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor); + const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor); + let printColors = printDatas?.PrintColors; + const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor; + const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor; + const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor; + const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor; + const netAmtColor = printColors?.find(obj => obj.netAmtColor)?.netAmtColor; + const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter( (i) => i.SettingIdName === 'PrintUom' )?.[0]; const estimatePrintHeader = @@ -510,7 +504,7 @@ const Printstyle12 = ({ await printDiv('PrintStyle12', style12, 'FontApply'); }; - const headerStyle = { + const headerStyle = { backgroundColor: GlobaldummyData ? SelectedHeaderColor : headerColor?.background, @@ -816,67 +810,67 @@ const Printstyle12 = ({ {GlobaldummyData - ? GlobalSlNo && S.No - : SLNO && S.No} + ? GlobalSlNo && S.No + : SLNO && S.No} {GlobaldummyData - ? GlobalItem && Description - : Item && Des} + ? GlobalItem && Description + : Item && Des} {GlobaldummyData ? GlobalQuantity && ( - Qty + Qty ) : Quantity && ( - + {' '} {WeightasKg ? 'Qty/Kg' : 'Qty'} )} {GlobaldummyData ? GlobalMRP && ( - MRP + MRP ) : MRP && ( - MRP + MRP )} {GlobaldummyData ? GlobalRate && ( - Rate + Rate ) : Rate && ( - Rate + Rate )} {GlobaldummyData ? GlobalHsnCode && ( - HSN + HSN ) : HsnCode && ( - HSN + HSN )} {GlobaldummyData ? GlobalDiscount && ( - (%) + (%) ) : Discount && ( - (%) + (%) )} {GlobaldummyData ? GlobalTax && ( - + Tax (%) ) : Tax && table2Data?.OrderType !== 'E' && ( - + Tax (%) )} {GlobaldummyData ? GlobalAmount && ( - Amt + Amt ) : Amount && ( - Amt + Amt )} @@ -884,17 +878,17 @@ const Printstyle12 = ({ {dataChunk?.map((item, index) => { return ( + style={ + index % 2 !== 1 && rowtypeStyle === "even" + ? { + ...tableBodyStyle + } + : index % 2 === 1 && rowtypeStyle === "odd" + ? { + ...tableBodyStyle + } + : {} + }> {GlobaldummyData ? GlobalSlNo && {index + 1} : SLNO && ( @@ -1113,67 +1107,67 @@ const Printstyle12 = ({ {GlobaldummyData - ? GlobalSlNo && S.No - : SLNO && S.No} + ? GlobalSlNo && S.No + : SLNO && S.No} {GlobaldummyData - ? GlobalItem && Description - : Item && Des} + ? GlobalItem && Description + : Item && Des} {GlobaldummyData ? GlobalQuantity && ( - Qty + Qty ) : Quantity && ( - + {' '} {WeightasKg ? 'Qty/Kg' : 'Qty'} )} {GlobaldummyData ? GlobalMRP && ( - MRP + MRP ) : MRP && ( - MRP + MRP )} {GlobaldummyData ? GlobalRate && ( - Rate + Rate ) : Rate && ( - Rate + Rate )} {GlobaldummyData ? GlobalHsnCode && ( - HSN + HSN ) : HsnCode && ( - HSN + HSN )} {GlobaldummyData ? GlobalDiscount && ( - (%) + (%) ) : Discount && ( - (%) + (%) )} {GlobaldummyData ? GlobalTax && ( - + Tax (%) ) : Tax && table2Data?.OrderType !== 'E' && ( - + Tax (%) )} {GlobaldummyData ? GlobalAmount && ( - Amt + Amt ) : Amount && ( - Amt + Amt )} @@ -1181,17 +1175,17 @@ const Printstyle12 = ({ {dataChunk?.map((item, index) => { return ( + style={ + index % 2 !== 1 && rowtypeStyle === "even" + ? { + ...tableBodyStyle + } + : index % 2 === 1 && rowtypeStyle === "odd" + ? { + ...tableBodyStyle + } + : {} + }> {GlobaldummyData ? GlobalSlNo && {index + 1} : SLNO && ( @@ -3296,7 +3290,7 @@ const Printstyle12 = ({ {!estimatePrintHeader && table2Data?.OrderType === 'E' ? ( '' ) : ( -
+
{/*

{table2Data?.BrName}

*/}

{GlobaldummyData - ? GlobalSlNo && S.No - : SLNO && S.No} + ? GlobalSlNo && S.No + : SLNO && S.No} {GlobaldummyData - ? GlobalItem && Description - : Item && Des} + ? GlobalItem && Description + : Item && Des} {GlobaldummyData ? GlobalQuantity && ( - Qty + Qty ) : Quantity && ( - + {' '} {WeightasKg ? 'Qty/Kg' : 'Qty'} )} {GlobaldummyData ? GlobalMRP && ( - MRP + MRP ) - : MRP && MRP} + : MRP && MRP} {GlobaldummyData ? GlobalRate && ( - Rate + Rate ) - : Rate && Rate} + : Rate && Rate} {GlobaldummyData ? GlobalHsnCode && ( - HSN + HSN ) : HsnCode && ( - HSN + HSN )} {GlobaldummyData ? GlobalDiscount && ( - (%) + (%) ) : Discount && ( - (%) + (%) )} {GlobaldummyData ? GlobalTax && ( - Tax (%) + Tax (%) ) : Tax && table2Data?.OrderType !== 'E' && ( - Tax (%) + Tax (%) )} {GlobaldummyData ? GlobalAmount && ( - Amt + Amt ) - : Amount && Amt} + : Amount && Amt} @@ -3531,17 +3525,17 @@ const Printstyle12 = ({ (item, index) => { return ( + style={ + index % 2 !== 1 && rowtypeStyle === "even" + ? { + ...tableBodyStyle + } + : index % 2 === 1 && rowtypeStyle === "odd" + ? { + ...tableBodyStyle + } + : {} + }> {GlobaldummyData ? GlobalSlNo && {index + 1} : SLNO && {index + 1}} @@ -3780,44 +3774,44 @@ const Printstyle12 = ({ {GlobaldummyData - ? GlobalSlNo && S.No - : SLNO && S.No} + ? GlobalSlNo && S.No + : SLNO && S.No} {GlobaldummyData - ? GlobalItem && Description - : Item && Des} + ? GlobalItem && Description + : Item && Des} {GlobaldummyData ? GlobalQuantity && ( - Qty + Qty ) : Quantity && ( - + {' '} {WeightasKg ? 'Qty/Kg' : 'Qty'} )} {GlobaldummyData ? GlobalMRP && ( - MRP + MRP ) - : MRP && MRP} + : MRP && MRP} {GlobaldummyData ? GlobalRate && ( - Rate + Rate ) - : Rate && Rate} + : Rate && Rate} {GlobaldummyData ? GlobalHsnCode && ( - HSN + HSN ) : HsnCode && ( - HSN + HSN )} {GlobaldummyData ? GlobalDiscount && ( - (%) + (%) ) : Discount && ( - (%) + (%) )} {GlobaldummyData ? GlobalTax && ( @@ -3825,13 +3819,13 @@ const Printstyle12 = ({ ) : Tax && table2Data?.OrderType !== 'E' && ( - Tax (%) + Tax (%) )} {GlobaldummyData ? GlobalAmount && ( - Amt + Amt ) - : Amount && Amt} + : Amount && Amt} @@ -3839,17 +3833,17 @@ const Printstyle12 = ({ (item, index) => { return ( + style={ + index % 2 !== 1 && rowtypeStyle === "even" + ? { + ...tableBodyStyle + } + : index % 2 === 1 && rowtypeStyle === "odd" + ? { + ...tableBodyStyle + } + : {} + }> {GlobaldummyData ? GlobalSlNo && {index + 1} : SLNO && {index + 1}} @@ -4100,7 +4094,7 @@ const Printstyle12 = ({ )} )} -
+
Amount
: