diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx index 4b84a50..47011ad 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx @@ -486,6 +486,7 @@ const BSBilling4Payment = () => { const [addnewAccess, setaddnewAccess] = useState(true); const [responsiveBill, setResponsiveBill] = useState(true); const tableOptions = templateData?.BookingBilling?.[1]; + const NavBarOptions = templateData?.BookingNavbar?.[1]; const [blink, setBlink] = useState(false); const BookingStatus = useSelector(GlobalBookingStatus); const CheckBookingStatus = @@ -1278,7 +1279,7 @@ const BSBilling4Payment = () => { }, [OrderCardDetail]); useEffect(() => { if (CompId && BranchId && AppId) { - if (holdCheckedSalesSetup) { + if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { getHolddata(); } // getUnpaiddatas(); @@ -1948,7 +1949,7 @@ const BSBilling4Payment = () => { setCurrentOrderNetAmount(0); setPreviousNetAmount(0); setUpinotSelected(false); - if (holdCheckedSalesSetup) { + if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { getHolddata(); } if (defaultBookingType === 'Both') { diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx index 97cc600..e9afb8d 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx @@ -143,8 +143,8 @@ import { getAddCustomerDetails, getDefaultPaymentOptions, GlobalAddCustomerDetails, - ReprintDetails, triggerCustomerRefresh, + VerifiedPaymentDtl, } from '../../../../../Features/BookingScreen/Customer/addCustomer'; import BSCustomerSelect from '../../UtillComponents/BSSelectCustomer.jsx'; import PozoHoldIcon from '../../UtillComponents/Pozo retail icons/PozoHoldIcon'; @@ -302,6 +302,7 @@ const BST6Payment = () => { const ProdSubCat = useSelector(GlobalProductSubCategorie); const templateData = useSelector(getTemplateData); const tableOptions = templateData?.BookingBilling?.[1]; + const NavBarOptions = templateData?.BookingNavbar?.[1]; const OfferCheckedInSetup = templateData?.BookingNavbar?.[1].some( (item) => item?.OptionName == 'Offer' ); @@ -1050,7 +1051,7 @@ const BST6Payment = () => { }; useEffect(() => { if (CompId && BranchId && AppId) { - if (holdCheckedSalesSetup) { + if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { getHolddata(); } // getUnpaiddatas(); @@ -1075,7 +1076,7 @@ const BST6Payment = () => { OrderId: businessUPIOrderId, }; - const res = await dispatch(ReprintDetails(data)).unwrap(); + const res = await dispatch(VerifiedPaymentDtl(data)).unwrap(); if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) { const orderData = [{ OrderDetails: res.data.data }]; @@ -1934,7 +1935,7 @@ const BST6Payment = () => { setUpinotSelected(false); setCurrentOrderNetAmount(0); setPreviousNetAmount(0); - if (holdCheckedSalesSetup) { + if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { getHolddata(); } if (defaultBookingType === 'Both') { diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx index 5a39a5b..a7ff4b7 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx @@ -170,8 +170,8 @@ import BSCreditCustomer from '../../UtillComponents/BSCreditCustomer'; import { getDefaultPaymentOptions, GlobalAddCustomerDetails, - ReprintDetails, triggerCustomerRefresh, + VerifiedPaymentDtl, } from '../../../../../Features/BookingScreen/Customer/addCustomer'; import { useNavigate } from 'react-router-dom'; import { ApplicationPreferences } from '../../../../../Features/BrachLogin/BranchLogin'; @@ -310,6 +310,11 @@ const StandardTablePayment = () => { const BookingStatus = useSelector(GlobalBookingStatus); const tabledata = useSelector(GlobalUnpaidListData); const tableOptions = templateData?.BookingBilling?.[1]; + const NavBarOptions = templateData?.BookingNavbar?.[1]; + const holdCheckedSalesSetup = tableOptions?.some( + (item) => item?.OptionName === 'Hold' + ); + const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails); const AddBookingDetailsTrigger = useSelector(GlobalAddBookingDetailsTrigger); const GetCustId = useSelector(GlobalCustId); @@ -1096,7 +1101,7 @@ const StandardTablePayment = () => { OrderId: businessUPIOrderId, }; - const res = await dispatch(ReprintDetails(data)).unwrap(); + const res = await dispatch(VerifiedPaymentDtl(data)).unwrap(); if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) { const orderData = [{ OrderDetails: res.data.data }]; @@ -2835,7 +2840,7 @@ const StandardTablePayment = () => { setPaybtnselected(PaymentOptionsModeId); setQrCode(false); setUpinotSelected(false); - if (holdCheckedSalesSetup) { + if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { getHolddata(); } setCurrentOrderNetAmount(0); diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarHand.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarHand.jsx index 1ad761a..a463ecb 100644 --- a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarHand.jsx +++ b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarHand.jsx @@ -131,11 +131,11 @@ const BSNavBarHand = ({ {hold && ( { - e.stopPropagation(); + e?.stopPropagation(); handleHoldCancel(); }} modalOpen={hold} - closeModal={() => setHold(false)} + // closeModal={() => setHold(false)} /> )}