From 38e9e6ab8a311f06adcfbff6ba2422503ca3a88a Mon Sep 17 00:00:00 2001 From: karthikalakshmi Date: Fri, 6 Mar 2026 14:57:48 +0530 Subject: [PATCH 1/3] Package.json issue --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5365059..8af1305 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "date-fns": "^4.1.0", "devtools-detect": "^4.0.2", "exceljs": "^4.3.0", + "file-saver": "^2.0.5", "google-maps-react": "^2.0.6", "highcharts": "^11.4.3", "highcharts-react-official": "^3.2.1", From 7e8ef0ddfba2add29f97981ed4b1fd0cc96f641a Mon Sep 17 00:00:00 2001 From: karthikalakshmi Date: Fri, 6 Mar 2026 15:40:03 +0530 Subject: [PATCH 2/3] FIX #258 Printer mapping issue solving --- .../BSBillingTable4/BSBilling4Payment.jsx | 5 ++- .../StandardTable/StandardTablePayment.jsx | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx index 08f3b9e..a7f4b57 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx @@ -251,9 +251,8 @@ const CustomerOrders = lazy( const BSOtherServiceClaim = lazy( () => import('../../UtillComponents/BSOtherServiceClaim.jsx') ); -const OtherServiceMobilePrint = lazy( - () => import('../../BookingFunctionality/OtherServiceMobilePrint.jsx') -); +import OtherServiceMobilePrint from '../../BookingFunctionality/OtherServiceMobilePrint.jsx'; + const OtherServicePrintStyle1 = lazy( () => import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx') diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx index 7dc3e99..089846f 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx @@ -120,6 +120,7 @@ import { import { shallowEqual, useSelector } from 'react-redux'; import { Global_OverallOfferAmount } from '../../../../../Features/Offer/Offer'; import { + getPrinterMappingDetails, getTemplateData, GlobalprintDatas, GlobalPrinterMappingDtls, @@ -524,6 +525,36 @@ const StandardTablePayment = () => { }, 0) ); }, [GlobalExtraCharge]); +useEffect(() => { + + const fetchPrinterMapping = async () => { + try { + if (UserType !== 'Super Admin' && isMobile && MobileA4Print) { + const data = { + CompId: CompId, + BranchId: BranchId, + AppId: AppId, + UserId: UserId, + }; + // && isMobile && MobileA4Print + const response = await dispatch(getPrinterMappingDetails(data)).unwrap(); + if (response?.data?.statusCode === 0) { + handlePrintMappingClick() + } + console.log(response, "printer mapping response"); + } + } catch (error) { + console.error("Error fetching printer mapping:", error); + } + }; + + fetchPrinterMapping(); + + }, []); + const handlePrintMappingClick = () => { + // setReprint1(true) + window.dispatchEvent(new Event('CLICK PRINTER MAPPING')); + }; useEffect(() => { if (salesBillEdit) { From d65e6a842c49ef722071b62bbe17c1ecccc4b4bd Mon Sep 17 00:00:00 2001 From: karthikalakshmi Date: Fri, 6 Mar 2026 19:11:55 +0530 Subject: [PATCH 3/3] countermapping master access issue --- .../BookingFunctionality/CustomerOTP.jsx | 20 ++++++++++++++++++- .../CounterCategoryMappingForm.jsx | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOTP.jsx b/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOTP.jsx index c79b1e5..243abd4 100644 --- a/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOTP.jsx +++ b/src/Pages/BookingScreen/Components/BookingFunctionality/CustomerOTP.jsx @@ -37,6 +37,7 @@ const CustomerMobileNumberModal = ({ open, HandleCloseModal }) => { const [messageType, setMessageType] = useState(null); const [messageData, setMessageData] = useState(null); const [canResend, setCanResend] = useState(true); + const [resendTimer, setResendTimer] = useState(0) const [otpInput, setOtpInput] = useState(['', '', '', '']); const [otpIndex, setOtpIndex] = useState(0); const [otpSent, setOtpSent] = useState(false); @@ -211,7 +212,10 @@ const CustomerMobileNumberModal = ({ open, HandleCloseModal }) => { let response = await dispatch( sendupiotp({ MobileNo: number, - CreatedBy: 0, + CreatedBy: SessionData.UserId, + AppId: SessionData.AppId, + CompId: SessionData.CompId, + BranchId: SessionData.BranchId, }) )?.unwrap(); if (response?.data?.statusCode == 1) { @@ -224,6 +228,20 @@ const CustomerMobileNumberModal = ({ open, HandleCloseModal }) => { console.log(error); } }; + const startResendTimer = () => { + setCanResend(false); + setResendTimer(30); + const timer = setInterval(() => { + setResendTimer((prev) => { + if (prev <= 1) { + clearInterval(timer); + setCanResend(true); + return 0; + } + return prev - 1; + }); + }, 1000); + } const verifyOtp = () => { const enteredOtp = otpInput.join(''); diff --git a/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx b/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx index 1f34fbf..1b05945 100644 --- a/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx +++ b/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx @@ -239,7 +239,7 @@ const CounterCategoryMappingForm = () => { }; let response = await dispatch(getEmpAccess(data)).unwrap(); let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter( - (item) => item.ConfigName === 'Counter Category Mapping' + (item) => item.ConfigName === 'Counter Mapping' ); setEmpData(datas?.[0]); };