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

Merge pull request 'FIX#217 Standard table Print trigger issue' (#218) from March-3-deployment into main 

Reviewed-on: Pozomind/pozo-retail-app#218
This commit is contained in:
karthikalakshmi 2026-03-03 17:30:15 +05:30
parent 43de491616 3c01fdc911
commit 8a65376eb2
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ import {
getExpireProductsList, getExpireProductsList,
getLowStockAlertProductsList, getLowStockAlertProductsList,
} from '../../../../../Features/ProductPage/ProductPage.js'; } from '../../../../../Features/ProductPage/ProductPage.js';
// Jsx Files // Jsx Files
const CustomerOrders = lazy( const CustomerOrders = lazy(
() => import('../../BookingFunctionality/CustomerOrders.jsx') () => import('../../BookingFunctionality/CustomerOrders.jsx')
@ -198,13 +198,9 @@ const CustomerOrders = lazy(
const PaymentGatewayEmbedded = lazy( const PaymentGatewayEmbedded = lazy(
() => import('../../UtillComponents/PaymentGatewayEmbedded.jsx') () => import('../../UtillComponents/PaymentGatewayEmbedded.jsx')
); );
const MobileMultiPdfPrintTrigger = lazy( import MobileMultiPdfPrintTrigger from '../../UtillComponents/MobileMultiPdfPrintTrigger.jsx';
() => import('../../UtillComponents/MobileMultiPdfPrintTrigger.jsx') import OtherServicePrintStyle1 from '../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx';
);
const OtherServicePrintStyle1 = lazy(
() =>
import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx')
);
import OtherServiceMobilePrint from '../../BookingFunctionality/OtherServiceMobilePrint.jsx'; import OtherServiceMobilePrint from '../../BookingFunctionality/OtherServiceMobilePrint.jsx';
const QrinScreen = lazy( const QrinScreen = lazy(
@ -215,9 +211,8 @@ const SMSShare = lazy(() => import('../../../../WhatsAppShare/SmsShare'));
const WhatsAppShare = lazy( const WhatsAppShare = lazy(
() => import('../../../../WhatsAppShare/whatsAppShare') () => import('../../../../WhatsAppShare/whatsAppShare')
); );
const TokensinglePrint = lazy(
() => import('../../../../paymentpdfPage/TokenOnlyPrints/TokeninsinglePrint') import TokensinglePrint from '../../../../paymentpdfPage/TokenOnlyPrints/TokeninsinglePrint';
);
import { useApplyOfferto_CardDetail } from '../../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx'; import { useApplyOfferto_CardDetail } from '../../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx';
// Icons File // Icons File
@ -2840,7 +2835,10 @@ const StandardTablePayment = () => {
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
if (holdCheckedSalesSetup || NavBarOptions?.some((e) => e?.OptionName == 'Hold')) { if (
holdCheckedSalesSetup ||
NavBarOptions?.some((e) => e?.OptionName == 'Hold')
) {
getHolddata(); getHolddata();
} }
setCurrentOrderNetAmount(0); setCurrentOrderNetAmount(0);
@ -2910,7 +2908,7 @@ const StandardTablePayment = () => {
PrintOrderDetails?.[0]?.OrderDetails?.[0]?.productDetails?.some( PrintOrderDetails?.[0]?.OrderDetails?.[0]?.productDetails?.some(
(product) => product.TokenAvailable === 'Y' (product) => product.TokenAvailable === 'Y'
); );
if (isMobile) { if (!isMobile) {
if (MobileA4Print) { if (MobileA4Print) {
await MobileMultiPdfPrintTrigger({ await MobileMultiPdfPrintTrigger({
preferenceDetails, preferenceDetails,

2
src/Pages/BookingScreen/Components/UtillComponents/CustomisedInvoiceChange.jsx
View File

@ -172,7 +172,7 @@ const CustomisedInvoiceChange = () => {
/> />
</Form.Item> </Form.Item>
<div className='fromlabelDate'> <div className='fromlabelDate'>
<label>From Date</label> <label>Bill Date</label>
<DatePicker <DatePicker
disabledDate={disablefutureDates} disabledDate={disablefutureDates}
format="DD-MMM-YYYY" format="DD-MMM-YYYY"

1
src/Pages/Kiosk/KioskBookingPage.jsx
View File

@ -37,6 +37,7 @@ const apiUrlToken = import.meta.env.ENV_API_URL_TOKEN;
const KioskBookingPage = () => { const KioskBookingPage = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const kioskTemplateData = useSelector(getKioskTemplateData); const kioskTemplateData = useSelector(getKioskTemplateData);
console.log(kioskTemplateData, 'kioskTemplateData');
const [devicePresent, setDevicePresent] = useState(false); const [devicePresent, setDevicePresent] = useState(false);
const [deviceAccess, setDeviceAccess] = useState(true); const [deviceAccess, setDeviceAccess] = useState(true);
const [deviceAddress, setDeviceAddress] = useState(null); const [deviceAddress, setDeviceAddress] = useState(null);