From db197001ff2b72cdb8f1eadb64febb8a1c3d55a9 Mon Sep 17 00:00:00 2001 From: Srinath Date: Wed, 25 Feb 2026 14:29:48 +0530 Subject: [PATCH 1/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable1/BST1Payment.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx index ebe8b68..484ff5f 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx @@ -260,7 +260,7 @@ export default function BST1Payment() { const RetailWSSalesType = useSelector(GlobalRetailWSSalesType); const SelCustId = useSelector(GlobalSelCustId); const selOption = useSelector(GlobalSelOption); - console.log(selOption, 'selOptionbst2'); + console.log(selOption, 'selOptionbst234343',GetCustId); const SelectedTableDetails = useSelector(GlobalSelectedTableDetails); const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails); @@ -3858,7 +3858,7 @@ export default function BST1Payment() { )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:30:55 +0530 Subject: [PATCH 2/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable2/BSBillingTable2.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx index cb58bf2..f3bc8e0 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx @@ -4177,7 +4177,7 @@ const BSBillingTable2 = () => { )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:31:18 +0530 Subject: [PATCH 3/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx index dcd24ac..5fff035 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx @@ -3788,7 +3788,7 @@ const BSBillingTable3Pay = () => {
)} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:31:41 +0530 Subject: [PATCH 4/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx index 67afd93..4b84a50 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx @@ -3919,7 +3919,7 @@ const BSBilling4Payment = () => { )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:31:59 +0530 Subject: [PATCH 5/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable5/BSBillingTable5.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx index 66402e8..43c2995 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx @@ -4163,7 +4163,7 @@ const BSBillingTable5 = () => { '' )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:32:22 +0530 Subject: [PATCH 6/9] GetCustId change to SelCustId --- .../Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx index aadc122..97cc600 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx @@ -4151,7 +4151,7 @@ const BST6Payment = () => { '' )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:32:50 +0530 Subject: [PATCH 7/9] GetCustId change to SelCustId --- .../BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx index 52c605f..1762acc 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx @@ -3651,7 +3651,7 @@ const BSBilling7Payment = () => { )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:33:25 +0530 Subject: [PATCH 8/9] GetCustId change to SelCustId --- .../BSBillingTables/StandardTable/StandardTablePayment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx index 503a1a1..8554720 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx @@ -3523,7 +3523,7 @@ const StandardTablePayment = () => { )} {/* Customer Orders */} - {GetCustId && ( + {SelCustId && ( {' '}
Date: Wed, 25 Feb 2026 14:34:11 +0530 Subject: [PATCH 9/9] Added last customer orders --- .../Components/BSCombo/BSC1Payment.jsx | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx index d4b72fe..7fc34ed 100644 --- a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState, useRef, lazy, Suspense } from 'react'; -import { FaWhatsapp, FaPrint, FaParking } from 'react-icons/fa'; +import { FaWhatsapp, FaPrint, FaParking, FaCartPlus } from 'react-icons/fa'; import { useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import moment from 'moment'; @@ -267,6 +267,7 @@ import { GlobalOverAllOfferAmt, } from '../../../../Features/Offer/Offernew/BookingOffernew.js'; import pozologoimg from '../../../../Images/pozologoimg.png'; +import CustomerOrders from '../BookingFunctionality/CustomerOrders.jsx'; const PaymentGatewayEmbedded = lazy( () => import('../UtillComponents/PaymentGatewayEmbedded.jsx') ); @@ -364,6 +365,7 @@ const BSC1Payment = (props) => { const [refundPaySelectedName, setRefundPaySelectedName] = useState(null); const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0); const [previousNetAmount, setPreviousNetAmount] = useState(0); + const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false); const appPreferences = useSelector(ApplicationPreferences); const commonModulePreference = appPreferences?.find( (preference) => preference?.PreferredCatName === 'Common Module' @@ -4425,6 +4427,40 @@ const BSC1Payment = (props) => { } )} + {/* Customer Orders */} + {SelCustId && ( + + {' '} +
{ + if ( + CheckBookingStatus !== 'Close' && + !addnewAccess && + !(OrderCardDetail?.length > 0) + ) { + setCustomerPreviesOrders(true); + } + }} + style={{ + cursor: OrderCardDetail?.length > 0 && 'not-allowed', + color: + OrderCardDetail?.length > 0 || + (OrderCardDetail?.length > 0 && + GetCustId?.CustMobile === undefined) + ? 'gray' + : 'rgb(18, 146, 238)', + fontSize: '25px', + display: 'flex', + alignItems: 'center', + height: '2.46rem', + width: '1.5rem', + }} + > + +
+ + )} {preOrderOpen && } {sportsAppPreference && } {dinePreference && @@ -4980,6 +5016,24 @@ const BSC1Payment = (props) => { Do you want to cancel the payment? )} + + {customerPreviesOrders && ( + setCustomerPreviesOrders(false)} + footer={false} + width={700} + className={'ModalPaymentGatewayEmbedded'} + children={ + <> + setCustomerPreviesOrders(false)} + /> + + } + /> + )} );