-
}
- htmlType={true}
- handleSubmit={onfinish}
- />
+ const printsyleget = async () => {
+ try {
+ const Data = { AppId, CompId, BranchId };
+ let response = await dispatch(
+ getPrintSelectionComponentData(Data)
+ ).unwrap();
+
+ if (response?.data?.statusCode === 1) {
+ // const salesTemplates = response.data.data?.flatMap(template =>
+ // (template.ComponentDetails || []).filter(comp => comp.PrintTypeName === "Sales" && comp.SetasDefault === "Y")
+ // );
+ // setPrintTemplates(salesTemplates);
+
+ let TableData = response?.data?.data?.[0]?.ComponentDetails.map(
+ (item) => ({
+ ActiveStatus: 'A',
+ OptionDetails: item.FieldDetails,
+ StyleId: item.StyleId,
+ SetasDefault: item.SetasDefault,
+ SetasDefaultInvoice: item.SetasDefaultInvoice,
+ StyleName: item.StyleName,
+ Signature: item.Signature,
+ PrintType: item.PrintType,
+ PrintHdrName: item.PrintHdrName,
+ Notes: item?.Notes,
+ PageSize: item?.PageSize,
+ PrintTypeId: item?.PrintTypeId,
+ TermsandConditions: (item?.TermsandConditions
+ ? item?.TermsandConditions
+ : []
+ )?.map((tc) => tc?.TermsandConditions),
+ })
+ )?.sort((a, b) => {
+ if ((a.StyleName || '') === 'A4Standard') return 1;
+ if ((b.StyleName || '') === 'A4Standard') return -1;
+ const isA4orA5 = (name) => /A4|A5/i.test(name);
+ const nameA = a.StyleName || '';
+ const nameB = b.StyleName || '';
+ if (isA4orA5(nameA) && !isA4orA5(nameB)) return 1;
+ if (!isA4orA5(nameA) && isA4orA5(nameB)) return -1;
+ const numA = parseInt(nameA.match(/\d+/)?.[0]) || 0;
+ const numB = parseInt(nameB.match(/\d+/)?.[0]) || 0;
+ return numA - numB;
+ });
+ setSizeOptionData(TableData);
+ }
+ } catch (error) {
+ console.error('Error fetching print styles:', error);
+ }
+ };
+
+ // Log current values for debugging
+ console.log('Current PrintType:', getPrintTypeValue());
+ console.log('Current PageSize:', getPageSizeValue());
+ console.log('Selected Template:', selectedTemplate);
+
+ useEffect(() => {
+ const currentSettings = {
+ PrintType: getPrintTypeValue(),
+ PageSize: getPageSizeValue(),
+ selectedTemplate,
+ };
+ console.log('Current Print Settings:', currentSettings);
+
+ // Call the callback if provided
+ if (onSettingsChange && typeof onSettingsChange === 'function') {
+ onSettingsChange(currentSettings);
+ }
+ }, [selectedTemplate, PrintType, PageSize]); // Removed onSettingsChange from dependencies
+
+ // Also pass data when component mounts and when selectedTemplate changes
+ useEffect(() => {
+ if (
+ selectedTemplate &&
+ onSettingsChange &&
+ typeof onSettingsChange === 'function'
+ ) {
+ const currentSettings = {
+ PrintType: selectedTemplate.PrintType,
+ PageSize: selectedTemplate.PageSize,
+ selectedTemplate,
+ };
+ console.log('Template-based Print Settings:', currentSettings);
+ onSettingsChange(currentSettings);
+ }
+ }, [selectedTemplate]);
+
+ const onfinish = async (values) => {
+ try {
+ if (!SizeOptionData || SizeOptionData.length === 0) {
+ setMessageType('error');
+ setMessageData('Please Setup the Screen');
+ return;
+ }
+
+ if (!selectedTemplate) {
+ setMessageType('error');
+ setMessageData('Please select a template first');
+ return;
+ }
+
+ const currentPrintType = getPrintTypeValue(); // 'S' or 'C'
+ const currentPageSize = getPageSizeValue(); // 'A4' or 'A5'
+
+ // Only one "Sales" style should have SetasDefault: "Y"
+ const updatedTemplates = SizeOptionData.map((item) => {
+ if (item.PrintType === 'Sales' || item.PrintType === 'S') {
+ return {
+ ...item,
+ SetasDefault: item.StyleId === selectedTemplate.StyleId ? 'Y' : 'N',
+ };
+ }
+ return item;
+ });
+
+ let TemplateDetails = updatedTemplates.map((item) => {
+ const isSelectedTemplate = item.StyleId === selectedTemplate.StyleId;
+
+ return {
+ SizeId: null,
+ StyleId: item.StyleId,
+ SetasDefault: item.SetasDefault,
+ SetasDefaultInvoice: item.SetasDefaultInvoice,
+ PrintTypeId: item?.PrintTypeId,
+ SizeDetails: item.OptionDetails.map((opt) => ({
+ OptionId: opt.ConfigId,
+ })),
+ ...(item?.TermsandConditions?.length > 0
+ ? {
+ PrintTermsandConditions: (item?.TermsandConditions
+ ? item?.TermsandConditions
+ : []
+ )?.map((tc) => ({
+ TermsandConditions: tc,
+ })),
+ }
+ : {}),
+ ...(item?.Notes ? { Notes: item.Notes } : {}),
+ PageSize: isSelectedTemplate ? currentPageSize : item?.PageSize,
+ ...(item?.PrintHdrName ? { PrintHdrName: item.PrintHdrName } : {}),
+ ...(item?.Signature ? { Signature: item?.Signature } : {}),
+ PrintType: isSelectedTemplate ? currentPrintType : item?.PrintType,
+ };
+ });
+
+ const Data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ TemplateDetails: TemplateDetails,
+ CreatedBy: UserId,
+ };
+
+ // console.log('API Request Data:', Data);
+
+ const response = await dispatch(
+ putPrintSelectionComponentData(Data)
+ ).unwrap();
+
+ if (response?.data?.statusCode === 1) {
+ dispatch(changeSelectedPrintdummyData(false));
+ await printsyleget();
+ setMessageType('success');
+ setMessageData(response?.data?.response);
+ if (closeModel) {
+ closeModel();
+ }
+ }
+ } catch (error) {
+ console.error('Error setting default template:', error);
+ setMessageType('error');
+ setMessageData('Failed to set default template');
+ }
+ };
+
+ const onComplete = useCallback(() => {
+ setMessageData(null);
+ setMessageType(null);
+ }, []);
+
+ return (
+
+
+
+
Print : {selectedTemplate?.StyleName}
+
+
+
+ {
+
+
+ Customized
+
+
+
+
+
+
+
+ Standard
+
+
+
+
+ }
- )
-}
-export default SalesPrintSize
\ No newline at end of file
+
+ {currentPrintType && (
+
+ A4
+
+ A5
+
+ )}
+
+
+
+
+ }
+ htmlType={true}
+ handleSubmit={onfinish}
+ />
+
+
+ );
+};
+
+export default SalesPrintSize;
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
index f01016d..6be8c8e 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
@@ -1,215 +1,215 @@
-import { ArrowRightOutlined } from "@ant-design/icons";
-import Buttons from "../../../../Components/Forms/Buttons";
-import { gettableData, postPreferenceAppNames } from "../../../../Features/PreferenceMaster/PreferenceMaster";
-import { getSession } from "../../../../Services/Others";
-import { useDispatch } from "react-redux";
-import { useEffect, useState } from "react";
-import { getPreferenceData } from "../../../../Features/BookingScreen/BookingData/BookingData";
-import { Messages } from "../../../../Components/Notifications/Messages";
-import { changeSelectedPrintdummyData } from "../../../../Features/ThemeChange/ThemeChange";
+import { ArrowRightOutlined } from '@ant-design/icons';
+import Buttons from '../../../../Components/Forms/Buttons';
+import {
+ gettableData,
+ postPreferenceAppNames,
+} from '../../../../Features/PreferenceMaster/PreferenceMaster';
+import { getSession } from '../../../../Services/Others';
+import { useDispatch } from 'react-redux';
+import { useEffect, useState } from 'react';
+import { getPreferenceData } from '../../../../Features/BookingScreen/BookingData/BookingData';
+import { Messages } from '../../../../Components/Notifications/Messages';
+import { changeSelectedPrintdummyData } from '../../../../Features/ThemeChange/ThemeChange';
const SelectPrintMode = ({ closeModel }) => {
- const CompId = getSession("CompId");
- const BranchId = getSession("BranchId");
- const AppId = getSession("AppId");
- const UserId = getSession("UserId");
- const dispatch = useDispatch();
+ const CompId = getSession('CompId');
+ const BranchId = getSession('BranchId');
+ const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+ const dispatch = useDispatch();
- const [modes, setModes] = useState([]);
- const [selected, setSelected] = useState({
- whatsapp: false,
- sms: false,
- print: false,
- email: false
+ const [modes, setModes] = useState([]);
+ const [selected, setSelected] = useState({
+ whatsapp: false,
+ sms: false,
+ print: false,
+ email: false,
+ });
+ const [messageType, setMessageType] = useState('');
+ const [messageData, setMessageData] = useState('');
+
+ console.log(selected, 'selected');
+
+ useEffect(() => {
+ fetchTableData();
+ }, []);
+
+ const fetchTableData = async () => {
+ const response = await dispatch(
+ gettableData({ CompId, BranchId, AppId })
+ ).unwrap();
+
+ const data = response?.data?.data?.[0]?.SettingDtlDetails || [];
+ console.log(data, 'datadata');
+
+ setModes(data);
+
+ // Pre-fill checkboxes from API data
+ setSelected({
+ whatsapp: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'whatsapp' &&
+ i.SettingValue === 'Y'
+ ),
+ sms: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'sms' &&
+ i.SettingValue === 'Y'
+ ),
+ print: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'print' &&
+ i.SettingValue === 'Y'
+ ),
+ email: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'email' &&
+ i.SettingValue === 'Y'
+ ),
});
- const [messageType, setMessageType] = useState("");
- const [messageData, setMessageData] = useState("");
+ };
- console.log(selected, 'selected');
+ const handleChange = (key) => {
+ setSelected((prev) => ({
+ ...prev,
+ [key]: !prev[key],
+ }));
+ };
+ const handleSave = async () => {
+ const allowed = ['whatsapp', 'sms', 'print', 'email'];
- useEffect(() => {
- fetchTableData();
- }, []);
+ const updatedSettings = modes.map((item) => {
+ const name = item.SettingIdName?.trim()?.toLowerCase();
- const fetchTableData = async () => {
-
- const response = await dispatch(
- gettableData({ CompId, BranchId, AppId })
- ).unwrap();
-
- const data = response?.data?.data?.[0]?.SettingDtlDetails || [];
- console.log(data, 'datadata');
-
- setModes(data);
-
- // Pre-fill checkboxes from API data
- setSelected({
- whatsapp: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "whatsapp" &&
- i.SettingValue === "Y"
- ),
- sms: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "sms" &&
- i.SettingValue === "Y"
- ),
- print: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "print" &&
- i.SettingValue === "Y"
- ),
- email: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "email" &&
- i.SettingValue === "Y"
- )
- });
-
- };
-
- const handleChange = (key) => {
- setSelected((prev) => ({
- ...prev,
- [key]: !prev[key]
- }));
-
-
- };
-
-
- const handleSave = async () => {
- const allowed = ["whatsapp", "sms", "print", "email"];
-
- const updatedSettings = modes.map((item) => {
- const name = item.SettingIdName?.trim()?.toLowerCase();
-
- if (allowed?.includes(name)) {
- return {
- ...item,
- SettingValue: selected[name] ? "Y" : "N"
- };
- }
-
- return item;
-
- });
-
- const payload = {
- CompId,
- BranchId,
- CreatedBy: UserId,
- AppId,
- SettingDtlDetails: updatedSettings
+ if (allowed?.includes(name)) {
+ return {
+ ...item,
+ SettingValue: selected[name] ? 'Y' : 'N',
};
+ }
- console.log(payload, "payload to send");
+ return item;
+ });
- try {
- const response = await dispatch(postPreferenceAppNames(payload)).unwrap();
-
- if (response?.data?.statusCode === 1) {
- setMessageType("success");
- setMessageData("Printer settings saved successfully.");
- dispatch(changeSelectedPrintdummyData(false));
- await updatePreference();
- closeModel()
- } else {
- setMessageType("error");
- setMessageData(response?.data?.message || "Failed to save printer settings.");
- }
- } catch (error) {
- console.error("Error while saving:", error);
- }
+ const payload = {
+ CompId,
+ BranchId,
+ CreatedBy: UserId,
+ AppId,
+ SettingDtlDetails: updatedSettings,
};
- const updatePreference = async () => {
- await dispatch(getPreferenceData({ CompId, BranchId, AppId }));
+ console.log(payload, 'payload to send');
+
+ try {
+ const response = await dispatch(postPreferenceAppNames(payload)).unwrap();
+
+ if (response?.data?.statusCode === 1) {
+ setMessageType('success');
+ setMessageData('Printer settings saved successfully.');
+ dispatch(changeSelectedPrintdummyData(false));
+ await updatePreference();
+ closeModel();
+ } else {
+ setMessageType('error');
+ setMessageData(
+ response?.data?.message || 'Failed to save printer settings.'
+ );
+ }
+ } catch (error) {
+ console.error('Error while saving:', error);
}
+ };
- return (
-
-
{
- setMessageData(null);
- setMessageType(null);
- }}
- />
-
- Select Print Mode
-
+ const updatePreference = async () => {
+ await dispatch(getPreferenceData({ CompId, BranchId, AppId }));
+ };
-
-
+ return (
+
-
- }
- htmlType={true}
- handleSubmit={handleSave}
- />
-
-
+ }
+ htmlType={true}
+ handleSubmit={handleSave}
+ />
+
+
+ );
};
export default SelectPrintMode;
diff --git a/src/Pages/DeliveryChallan/DeliveryChallan.scss b/src/Pages/DeliveryChallan/DeliveryChallan.scss
index 7adb85d..0818c13 100644
--- a/src/Pages/DeliveryChallan/DeliveryChallan.scss
+++ b/src/Pages/DeliveryChallan/DeliveryChallan.scss
@@ -4,7 +4,7 @@
flex-wrap: wrap;
gap: 1rem;
- .ant-input-affix-wrapper>input.ant-input {
+ .ant-input-affix-wrapper > input.ant-input {
padding: 4px 1px !important;
padding-top: 1rem !important;
}
@@ -61,6 +61,10 @@
.DeliveryChallan-inputForm .ant-table-content {
width: 70vw;
}
+.DeliveryChallan-inputForm .ant-table-thead tr {
+ background-color: #2c88ee !important;
+
+ }
.DeliveryChallan-inputForm {
display: flex;
@@ -107,8 +111,8 @@
// right: 100px;
}
-.ant-table-wrapper .ant-table-tbody>tr.ant-table-row:hover>td,
-.ant-table-wrapper .ant-table-tbody>tr>th.ant-table-cell-row-hover>td.ant-table-cell-row-hover {
+.ant-table-wrapper .ant-table-tbody > tr.ant-table-row:hover > td,
+.ant-table-wrapper .ant-table-tbody > tr > th.ant-table-cell-row-hover > td.ant-table-cell-row-hover {
background: rgb(224, 223, 223) !important;
font-size: unset !important;
transition-duration: 0.4s !important;
@@ -129,7 +133,6 @@
}
.Deliverychallan-table {
-
// width: 70px;
.ant-table table {
border-spacing: 0px;
@@ -138,4 +141,8 @@
.ant-table-wrapper table {
width: 84% !important;
}
+}
+.product-scan .sales-quotation{
+ display: flex;
+
}
\ No newline at end of file
diff --git a/src/Pages/DeliveryChallan/Deliverychallan.jsx b/src/Pages/DeliveryChallan/Deliverychallan.jsx
index 20a8ac9..e851d21 100644
--- a/src/Pages/DeliveryChallan/Deliverychallan.jsx
+++ b/src/Pages/DeliveryChallan/Deliverychallan.jsx
@@ -61,6 +61,7 @@ import { useSelector } from 'react-redux';
import { getPrintSelectionComponentData } from '../../Features/ThemeChange/ThemeChange.js';
import { DCPDFMobilePrint } from './DCPDFMobilePrint.js';
import { isMobile } from 'react-device-detect';
+
const DeliveryChellanForm = () => {
const { SadminuserAccess } = useAuth();
diff --git a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
index b023641..46669ca 100644
--- a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
+++ b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
@@ -24,6 +24,9 @@
vertical-align: middle;
height: 35px;
}
+ .ant-table-thead tr {
+ background-color: #2c88ee !important;
+ }
}
.dc-to-invoice-payment-mode {
@@ -46,4 +49,16 @@
margin: 0px 2rem;
gap: 10px;
padding-top: 0;
-}
\ No newline at end of file
+}
+
+.delivery-challan-to-invoice-form {
+ width: 100%;
+}
+
+.DCformDivAnt {
+ display: flex;
+ align-items: flex-start;
+ gap: 1rem;
+ justify-content: flex-start;
+ flex-direction: column;
+}
diff --git a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
index 59131d3..259458b 100644
--- a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
+++ b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
@@ -342,7 +342,7 @@ const DeliveryChallanToInvoiceForm = () => {