karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'testing-bug-fix' (#174) from testing-bug-fix into main 

Reviewed-on: Pozomind/pozo-retail-app#174
This commit is contained in:
karthikalakshmi 2026-02-25 14:36:02 +05:30
parent 6c23498eea dd97ae5ecb
commit 60ce7114d2
9 changed files with 64 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
View File

@ -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 && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx
View File

@ -4177,7 +4177,7 @@ const BSBillingTable2 = () => {
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
View File

@ -3788,7 +3788,7 @@ const BSBillingTable3Pay = () => {
</div>
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
View File

@ -3919,7 +3919,7 @@ const BSBilling4Payment = () => {
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx
View File

@ -4163,7 +4163,7 @@ const BSBillingTable5 = () => {
''
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
View File

@ -4151,7 +4151,7 @@ const BST6Payment = () => {
''
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx
View File

@ -3651,7 +3651,7 @@ const BSBilling7Payment = () => {
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

2
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
View File

@ -3523,7 +3523,7 @@ const StandardTablePayment = () => {
)}
{/* Customer Orders */}
{GetCustId && (
{SelCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div

56
src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
View File

@ -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 && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div
className="BSBillingNav-icon-table-icon"
onClick={() => {
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',
}}
>
<FaCartPlus />
</div>
</Tooltip>
)}
{preOrderOpen && <BSNavBarPreOrder />}
{sportsAppPreference && <BSMembership />}
{dinePreference &&
@ -4980,6 +5016,24 @@ const BSC1Payment = (props) => {
Do you want to cancel the payment?
</Modal>
)}
{customerPreviesOrders && (
<DefaultModal
open={customerPreviesOrders}
handleCancel={() => setCustomerPreviesOrders(false)}
footer={false}
width={700}
className={'ModalPaymentGatewayEmbedded'}
children={
<>
<CustomerOrders
CustomerDetails={selOption}
close={() => setCustomerPreviesOrders(false)}
/>
</>
}
/>
)}
</>
</Suspense>
);