diff --git a/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdInvoice.jsx b/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdInvoice.jsx index 1ea447b..afdb24e 100644 --- a/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdInvoice.jsx +++ b/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdInvoice.jsx @@ -16,7 +16,7 @@ const PurchaseOrdInvoice = ({ BranchData, printDatas, BankDetails -}) => { +}) => { const GlobaldummyData = useSelector(GlobalPritdummyData); let BillName = printDatas?.PrintHdrName // Function to convert number to words @@ -52,9 +52,9 @@ const PurchaseOrdInvoice = ({ city: BranchData?.City || "", state: BranchData?.State || "", zip: BranchData?.Zip || "" - }, + }, companyGSTIN: BranchData?.CompGSTIN || BranchData?.BrGSTIN || "", - companyEmail: BranchData?.companyEmail || BranchData?.companyEmail ||"", + companyEmail: BranchData?.companyEmail || BranchData?.companyEmail || "", companyMobile: BranchData?.BrMobile || "", companyMobile2: BranchData?.BrMobile2 || "", @@ -67,7 +67,7 @@ const PurchaseOrdInvoice = ({ // Customer Details - mapped from A4Standard CustomerDetails array customerName: table2Data?.CustomerDetails?.[0]?.CustSuppName || table2Data?.CustSuppName - || "", + || "", customerMobile: table2Data?.CustomerDetails?.[0]?.MobileNo || table2Data?.BrMobile || "", customerGSTIN: table2Data?.CustomerDetails?.[0]?.CustGSTNo || table2Data?.CustGSTIN || "", customerAddress: { @@ -82,13 +82,13 @@ const PurchaseOrdInvoice = ({ // Totals - mapped from A4Standard totalAmount: Number(table2Data?.BillAmount || table2Data?.TotalAmt || 0), taxAmount: Number(OrderDetailGST), - grandTotal: Number(table2Data?.NetAmount || table2Data?.GrandTotal|| 0), + grandTotal: Number(table2Data?.NetAmount || table2Data?.GrandTotal || 0), totalBillAmount: Number(table2Data?.BillAmount || table2Data?.NetAmount || 0), // Bank Details - mapped from A4Standard bankDetails: BankDetails?.[0] || "" }; - console.log(printDatas, "Date1Date1", invoiceData, ) + console.log(printDatas, "Date1Date1", invoiceData,) let PageSize = printDatas?.PageSize @@ -135,7 +135,7 @@ const PurchaseOrdInvoice = ({ dataSource = []; } - console.log("Final DataSource:", table2Data, ); + console.log("Final DataSource:", table2Data,); const paginatedChunks = []; @@ -159,6 +159,36 @@ const PurchaseOrdInvoice = ({ paginatedChunks.push([]); // Empty chunk for footer-only page } + 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 headerStyle = { + backgroundColor: headerColor?.background, + color: headerColor?.font, + } + const tableHeaderStyle = { + backgroundColor: tableHeaderColor?.background, + color: tableHeaderColor?.font, + } + const tableBodyStyle = { + backgroundColor: tableBodyColor?.background, + color: tableBodyColor?.font, + } + const rowtypeStyle = tableBodyColor?.rowType; + const footerColorStyle = { + backgroundColor: footerColor?.background, + color: footerColor?.font, + } + const netAmountStyle = { + backgroundColor: netAmtColor?.background, + color: netAmtColor?.font, + } + + return (
| S.No | : SLNO == true &&S.No | } @@ -321,7 +348,18 @@ const PurchaseOrdPrintA4 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image||
|---|---|---|---|
|
@@ -594,19 +632,8 @@ const PurchaseOrdPrintA4 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image
}
-
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
- )
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions - -
+
+ {(TermsnAdCondition == true && TermsAndConditions?.length > 0) && ( Terms & Conditions @@ -768,19 +795,8 @@ const PurchaseOrdPrintA4 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image } -
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
- )
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions - -
+
+ {(TermsnAdCondition == true && TermsAndConditions?.length > 0) && ( Terms & Conditions @@ -932,19 +948,8 @@ const PurchaseOrdPrintA4 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image } -
- {GlobaldummyData ? GlobaltermsAndConditions &&
- (
- )
- :
- (TermsnAdCondition == true && TermsAndConditions?.length > 0) && (- Terms & Conditions - -
+
+ {(TermsnAdCondition == true && TermsAndConditions?.length > 0) && ( Terms & Conditions diff --git a/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdPrintA5.jsx b/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdPrintA5.jsx index 046e496..6e8c435 100644 --- a/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdPrintA5.jsx +++ b/src/Pages/PurchaseOrder/PurchsasePrintStyle/PurchaseOrdPrintA5.jsx @@ -162,6 +162,36 @@ const PurchaseOrdPrintA5 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image const calculatedTotalQuantity = purchaseData?.reduce((total, item) => { return total + (Number(item?.SalesQty) || 0); }, 0); + 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 headerStyle = { + backgroundColor: headerColor?.background, + color: headerColor?.font, + } + const tableHeaderStyle = { + backgroundColor: tableHeaderColor?.background, + color: tableHeaderColor?.font, + } + const tableBodyStyle = { + backgroundColor: tableBodyColor?.background, + color: tableBodyColor?.font, + } + const rowtypeStyle = tableBodyColor?.rowType; + const footerColorStyle = { + backgroundColor: footerColor?.background, + color: footerColor?.font, + } + const netAmountStyle = { + backgroundColor: netAmtColor?.background, + color: netAmtColor?.font, + } + + return (
@@ -171,7 +201,7 @@ const PurchaseOrdPrintA5 = ({ index, ExtraChargeTotal, UpiId, Date1, base64Image
-
+
|