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

Merge pull request 'FIX #71 Issue Solving feb 3' (#72) from newdeployment into main 

Reviewed-on: Pozomind/pozo-retail-app#72
This commit is contained in:
karthikalakshmi 2026-02-04 10:21:38 +05:30
parent 712207c6ff cd6f0df9be
commit e8c88723c1
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,7 @@ import pozologoimg from '../../../../../Images/pozologoimg.png';
import PaymentGatewayEmbedded from '../../UtillComponents/PaymentGatewayEmbedded.jsx'; import PaymentGatewayEmbedded from '../../UtillComponents/PaymentGatewayEmbedded.jsx';
import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx'; import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx';
import { useDateStore } from '../../../../../Features/BookingScreen/BookingData/DateStore.js'; import { useDateStore } from '../../../../../Features/BookingScreen/BookingData/DateStore.js';
import CustomerOrders from '../../BookingFunctionality/CustomerOrders.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL; const subDirectory = import.meta.env.ENV_BASE_URL;
const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL; const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL;

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

@ -211,6 +211,7 @@ import UpiPopover from '../StandardTable/Utils/UpiPopOver.jsx';
import PaymentGatewayEmbedded from '../../UtillComponents/PaymentGatewayEmbedded.jsx'; import PaymentGatewayEmbedded from '../../UtillComponents/PaymentGatewayEmbedded.jsx';
import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx'; import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx';
import { useDateStore } from '../../../../../Features/BookingScreen/BookingData/DateStore.js'; import { useDateStore } from '../../../../../Features/BookingScreen/BookingData/DateStore.js';
import CustomerOrders from '../../BookingFunctionality/CustomerOrders.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL; const subDirectory = import.meta.env.ENV_BASE_URL;
const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL; const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL;

7
src/Pages/BookingScreen/Components/PrintMainPage/PrinterSelection.jsx
View File

@ -12,6 +12,7 @@ import { DropDowns } from "../../../../Components/Forms/DropDown";
import { Switch } from "antd"; import { Switch } from "antd";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import KioskPrinterSelection from "./KioskPrinterSelection"; import KioskPrinterSelection from "./KioskPrinterSelection";
import { GlobalFeatAddOnData } from "../../../../Features/BookingScreen/BookingData/BookingData";
const PrinterSelection = (props) => { const PrinterSelection = (props) => {
const CompId = getSession("CompId"); const CompId = getSession("CompId");
@ -28,6 +29,7 @@ const PrinterSelection = (props) => {
const [activePrinterId, setActivePrinterId] = useState(null); const [activePrinterId, setActivePrinterId] = useState(null);
const [initialPrinters, setInitialPrinters] = useState([]); const [initialPrinters, setInitialPrinters] = useState([]);
const PrinterDetails = useSelector(GlobalPrinterMappingDtls); const PrinterDetails = useSelector(GlobalPrinterMappingDtls);
const FeatureAddonData = useSelector(GlobalFeatAddOnData);
const [MyPrinter, setMyPrinter] = useState(true); const [MyPrinter, setMyPrinter] = useState(true);
const [MyKioskPrinter, setMyKioskPrinter] = useState(false); const [MyKioskPrinter, setMyKioskPrinter] = useState(false);
const { onClose } = props; const { onClose } = props;
@ -314,6 +316,10 @@ const PrinterSelection = (props) => {
{/* <HiOutlineSquares2X2 size={16} /> */} {/* <HiOutlineSquares2X2 size={16} /> */}
My Printer My Printer
</div> </div>
{FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
) &&
<div <div
className={MyKioskPrinter ? 'selected' : ''} className={MyKioskPrinter ? 'selected' : ''}
onClick={openKioskPrinter} onClick={openKioskPrinter}
@ -321,6 +327,7 @@ const PrinterSelection = (props) => {
{/* <HiSquaresPlus size={16} /> */} {/* <HiSquaresPlus size={16} /> */}
Kiosk Printer Kiosk Printer
</div> </div>
}
</div> </div>