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

Solved Issue

This commit is contained in:
Your Name 2026-02-25 16:24:29 +05:30
parent 60ce7114d2
commit 76c6d44ef3
41 changed files with 7585 additions and 7787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/App.jsx
View File

@ -10,8 +10,12 @@ import { routesConfig } from './routesConfig';
import { GlobalItemCard } from './Features/BookingScreen/BookingData/BookingData.js'; import { GlobalItemCard } from './Features/BookingScreen/BookingData/BookingData.js';
import { clearSession, getSession } from './Services/Others.js'; import { clearSession, getSession } from './Services/Others.js';
const KisokSelBooking = lazy(() => import('./Pages/SelfBooking/KisokSelBooking')); const KisokSelBooking = lazy(
const IndividualBooking = lazy(() => import('./Pages/SelfBooking/IndividualBooking')); () => import('./Pages/SelfBooking/KisokSelBooking')
);
const IndividualBooking = lazy(
() => import('./Pages/SelfBooking/IndividualBooking')
);
const commonSubDir = import.meta.env.ENV_COMMON_BASE_URL; const commonSubDir = import.meta.env.ENV_COMMON_BASE_URL;
const subDirectory = import.meta.env.ENV_BASE_URL; const subDirectory = import.meta.env.ENV_BASE_URL;
@ -23,7 +27,7 @@ import useSubscriptionManager from './useSubscriptionManager.js';
import useSessionManager from './useSessionManager.js'; import useSessionManager from './useSessionManager.js';
import ExtendSubscriptionModal from './Pages/ExtentedModal/ExtendSubscriptionModal.jsx'; import ExtendSubscriptionModal from './Pages/ExtentedModal/ExtendSubscriptionModal.jsx';
const isCapacitor = () => !!(window.Capacitor?.isNativePlatform?.()); const isCapacitor = () => !!window.Capacitor?.isNativePlatform?.();
// ✅ Define your home/exit pages here // ✅ Define your home/exit pages here
const HOME_PAGES = [ const HOME_PAGES = [
@ -37,7 +41,14 @@ const LOGIN_PAGES = ['signin', 'login', 'auth'];
const AppRoutes = () => { const AppRoutes = () => {
const ItemCard = useSelector(GlobalItemCard); const ItemCard = useSelector(GlobalItemCard);
const { sessionData, logout } = useSessionManager(ItemCard); const { sessionData, logout } = useSessionManager(ItemCard);
const { remainingDays, handleCancel, freeExtend, extendModel,handlePay, setExtendModel } = useSubscriptionManager(sessionData, logout); const {
remainingDays,
handleCancel,
freeExtend,
extendModel,
handlePay,
setExtendModel,
} = useSubscriptionManager(sessionData, logout);
const location = useLocation(); const location = useLocation();
const navigate = useNavigate(); const navigate = useNavigate();
@ -56,7 +67,7 @@ const AppRoutes = () => {
const path = location.pathname + (location.search || ''); const path = location.pathname + (location.search || '');
// Don't track login pages // Don't track login pages
if (LOGIN_PAGES.some(p => path.includes(p))) return; if (LOGIN_PAGES.some((p) => path.includes(p))) return;
const raw = sessionStorage.getItem('navStack'); const raw = sessionStorage.getItem('navStack');
let stack = raw ? JSON.parse(raw) : []; let stack = raw ? JSON.parse(raw) : [];
@ -78,7 +89,7 @@ const AppRoutes = () => {
const currentPath = location.pathname; const currentPath = location.pathname;
// On home page — just stay, don't redirect // On home page — just stay, don't redirect
if (HOME_PAGES.some(p => currentPath.includes(p))) { if (HOME_PAGES.some((p) => currentPath.includes(p))) {
window.history.go(1); // stay here window.history.go(1); // stay here
return; return;
} }
@ -104,42 +115,44 @@ const AppRoutes = () => {
useEffect(() => { useEffect(() => {
if (!isMobile && !isIOS && !isCapacitor()) return; if (!isMobile && !isIOS && !isCapacitor()) return;
const handler = async () => { let backButtonListener;
const setupBackButton = async () => {
try {
backButtonListener = await CapacitorApp.addListener(
'backButton',
async () => {
try { try {
const currentPath = location.pathname + (location.search || ''); const currentPath = location.pathname + (location.search || '');
console.log('🔙 Back pressed:', currentPath); console.log('🔙 Back pressed:', currentPath);
// ✅ On home page // 🏠 Home page → minimize
if (HOME_PAGES.some(p => currentPath.includes(p))) { if (HOME_PAGES.some((p) => currentPath.includes(p))) {
if (isCapacitor()) { if (isCapacitor()) {
console.log('📱 Minimizing app'); await CapacitorApp.minimizeApp();
await CapacitorApp.minimizeApp(); // minimize — not exit
} }
return; return;
} }
// ✅ On login page → exit app // 🚪 Login page → exit
if (LOGIN_PAGES.some(p => currentPath.includes(p))) { if (LOGIN_PAGES.some((p) => currentPath.includes(p))) {
console.log('🚪 Exiting app'); if (isCapacitor()) {
if (isCapacitor()) await CapacitorApp.exitApp(); await CapacitorApp.exitApp();
}
return; return;
} }
// ✅ Get stack and go back one by one
const raw = sessionStorage.getItem('navStack'); const raw = sessionStorage.getItem('navStack');
let stack = raw ? JSON.parse(raw) : []; let stack = raw ? JSON.parse(raw) : [];
// Remove current path from top while (stack.length && stack[stack.length - 1] === currentPath) {
while (stack.length > 0 && stack[stack.length - 1] === currentPath) {
stack.pop(); stack.pop();
} }
if (stack.length > 0) { if (stack.length) {
const previous = stack[stack.length - 1]; const previous = stack[stack.length - 1];
// If previous is login → go to home instead if (LOGIN_PAGES.some((p) => previous.includes(p))) {
if (LOGIN_PAGES.some(p => previous.includes(p))) {
console.log('⬅️ Previous was login → going home');
const home = '/landing-page/home'; const home = '/landing-page/home';
sessionStorage.setItem('navStack', JSON.stringify([home])); sessionStorage.setItem('navStack', JSON.stringify([home]));
isBackNav.current = true; isBackNav.current = true;
@ -147,34 +160,32 @@ const AppRoutes = () => {
return; return;
} }
console.log('⬅️ Back to:', previous);
sessionStorage.setItem('navStack', JSON.stringify(stack)); sessionStorage.setItem('navStack', JSON.stringify(stack));
isBackNav.current = true; // ✅ Prevent loop isBackNav.current = true;
navigate(previous); navigate(previous);
} else { } else {
// Stack empty → go home
const home = '/landing-page/home'; const home = '/landing-page/home';
console.log('📭 Stack empty → home');
sessionStorage.setItem('navStack', JSON.stringify([home])); sessionStorage.setItem('navStack', JSON.stringify([home]));
isBackNav.current = true; isBackNav.current = true;
navigate(home); navigate(home);
} }
} catch (e) { } catch (err) {
console.error('Back error:', e); console.error('Back handler error:', err);
navigate('/landing-page/home'); navigate('/landing-page/home');
} }
}
);
} catch (err) {
console.error('Listener error:', err);
}
}; };
let listener; setupBackButton();
try {
listener = CapacitorApp.addListener('backButton', handler);
} catch (e) {}
return () => { return () => {
try { try {
if (listener?.remove) listener.remove(); backButtonListener?.remove();
} catch (e) {} } catch (err) {}
}; };
}, [navigate, location.pathname, location.search]); }, [navigate, location.pathname, location.search]);

26
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx
View File

@ -1470,7 +1470,7 @@ const BSBillingTable1 = () => {
OrderQty: isPaidproduct?.OrderQty, OrderQty: isPaidproduct?.OrderQty,
CompleteRemove: true, CompleteRemove: true,
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
}); });
@ -1506,7 +1506,7 @@ const BSBillingTable1 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
}); });
await ChangeOfferAppliedProdsFn({ await ChangeOfferAppliedProdsFn({
inwardDtlId: item?.InwardDtlId, inwardDtlId: item?.InwardDtlId,
@ -1536,7 +1536,7 @@ const BSBillingTable1 = () => {
OrderQty: isPaidProductAvailableInCart?.OrderQty, OrderQty: isPaidProductAvailableInCart?.OrderQty,
CompleteRemove: true, CompleteRemove: true,
InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId, InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
OrderRate:isPaidProductAvailableInCart?.OrderRate, OrderRate: isPaidProductAvailableInCart?.OrderRate,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: 0, Offer: 0,
}); });
@ -1622,7 +1622,7 @@ const BSBillingTable1 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -1649,7 +1649,7 @@ const BSBillingTable1 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -1982,7 +1982,7 @@ const BSBillingTable1 = () => {
CompleteRemove: true, CompleteRemove: true,
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: item?.InwardDtlId, BuyInwardDtlId: item?.InwardDtlId,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
Offer: item?.Offer, Offer: item?.Offer,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
@ -2001,7 +2001,7 @@ const BSBillingTable1 = () => {
CompleteRemove: true, CompleteRemove: true,
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: item?.InwardDtlId, BuyInwardDtlId: item?.InwardDtlId,
OrderRate:item?.OrderRate, OrderRate: item?.OrderRate,
Offer: item?.Offer, Offer: item?.Offer,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
@ -2252,7 +2252,8 @@ const BSBillingTable1 = () => {
{OldtableDataTakeAway?.map((item, index) => ( {OldtableDataTakeAway?.map((item, index) => (
<tr <tr
key={index} key={index}
className={`${item?.SalesId && OrderType !== 'Hold' className={`${
item?.SalesId && OrderType !== 'Hold'
? 'Billing-Table1-row-disabled' ? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row' : 'Billing-Table1-row'
} }
@ -2547,7 +2548,8 @@ const BSBillingTable1 = () => {
{OldtableDataDinein?.map((item, index) => ( {OldtableDataDinein?.map((item, index) => (
<tr <tr
key={OldtableDataTakeAway?.length + index} key={OldtableDataTakeAway?.length + index}
className={`${item?.SalesId className={`${
item?.SalesId
? 'Billing-Table1-row-disabled' ? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row' : 'Billing-Table1-row'
} }
@ -2843,7 +2845,8 @@ const BSBillingTable1 = () => {
OldtableDataTakeAway?.length + OldtableDataTakeAway?.length +
index index
} }
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'Billing-Table1-row-disabled' ? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row' : 'Billing-Table1-row'
} }
@ -3188,7 +3191,8 @@ const BSBillingTable1 = () => {
tableDataTakeAway?.length + tableDataTakeAway?.length +
index index
} }
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'Billing-Table1-row-disabled' ? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row' : 'Billing-Table1-row'
} }

64
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx
View File

@ -130,14 +130,24 @@ const BsBill2 = () => {
const productBasedExtraCharges = GlobalExtraCharge.filter( const productBasedExtraCharges = GlobalExtraCharge.filter(
(obj) => 'ProdName' in obj (obj) => 'ProdName' in obj
); );
const overAllLimitPreferenece = const overAllLimitPreferenece = preferenceDatas?.[0]?.[
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( 'SettingDtlDetails'
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y'); ]?.find(
const itemWiseLimitPreferenece = (item) =>
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( item.SettingIdName?.toLowerCase() === 'overalllimit' &&
(item) => item.SettingIdName?.toLowerCase() === 'itemwiselimit' && item?.SettingValue === 'Y'); item?.SettingValue === 'Y'
const maxQtyLimit = itemWiseLimitPreferenece?.SettingCount || overAllLimitPreferenece?.SettingCount || null; );
const itemWiseLimitPreferenece = preferenceDatas?.[0]?.[
'SettingDtlDetails'
]?.find(
(item) =>
item.SettingIdName?.toLowerCase() === 'itemwiselimit' &&
item?.SettingValue === 'Y'
);
const maxQtyLimit =
itemWiseLimitPreferenece?.SettingCount ||
overAllLimitPreferenece?.SettingCount ||
null;
const tableDataDinein = CartOrderDetails?.filter( const tableDataDinein = CartOrderDetails?.filter(
(a, b) => a.BookingTypeName === 'Dine In' && !a?.SalesId (a, b) => a.BookingTypeName === 'Dine In' && !a?.SalesId
@ -283,8 +293,8 @@ const BsBill2 = () => {
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) { if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) { if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails); const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails);
if ((calculatedOverAllQty + 1) > maxQtyLimit) { if (calculatedOverAllQty + 1 > maxQtyLimit) {
message.warning(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`) message.warning(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
return; return;
} }
@ -1463,31 +1473,23 @@ const BsBill2 = () => {
<div className="summary-listedit-div"> <div className="summary-listedit-div">
<div className="items-editables"> <div className="items-editables">
{/* <MinusOutlined onClick={() => decline(item)} /> */}
<Suspense fallback={<span>Loading...</span>}>
<MinusOutlined onClick={() => decline(item)} /> <MinusOutlined onClick={() => decline(item)} />
</Suspense>
<Badge count={item?.OrderQty} overflowCount={10000}> <Badge count={item?.OrderQty} overflowCount={10000}>
{' '} {' '}
</Badge> </Badge>
{item?.StockAvailable === 'Y' ? ( {item?.StockAvailable === 'Y' ? (
returnCount(item) > 0 && ( returnCount(item) > 0 && (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
) )
) : ( ) : (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
)} )}
<Suspense fallback={<span>Loading Edit...</span>}>
<EditOutlined <EditOutlined
style={{ fontSize: '14px' }} style={{ fontSize: '14px' }}
onClick={() => handleEditQuantity(item)} onClick={() => handleEditQuantity(item)}
/> />
</Suspense>
</div> </div>
</div> </div>
</div> </div>
@ -1688,30 +1690,22 @@ const BsBill2 = () => {
<div className="items-editables"> <div className="items-editables">
{/* <MinusOutlined onClick={() => decline(item)} /> {/* <MinusOutlined onClick={() => decline(item)} />
*/} */}
<Suspense fallback={<span>Loading...</span>}>
<MinusOutlined onClick={() => decline(item)} /> <MinusOutlined onClick={() => decline(item)} />
</Suspense>
<Badge count={item?.OrderQty} overflowCount={10000}> <Badge count={item?.OrderQty} overflowCount={10000}>
{' '} {' '}
</Badge> </Badge>
{item?.StockAvailable === 'Y' ? ( {item?.StockAvailable === 'Y' ? (
returnCount(item) > 0 && ( returnCount(item) > 0 && (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
) )
) : ( ) : (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
)} )}
<Suspense fallback={<span>Loading Edit...</span>}>
<EditOutlined <EditOutlined
style={{ fontSize: '14px' }} style={{ fontSize: '14px' }}
onClick={() => handleEditQuantity(item)} onClick={() => handleEditQuantity(item)}
/> />
</Suspense>
</div> </div>
</div> </div>
</div> </div>
@ -1946,15 +1940,12 @@ const BsBill2 = () => {
<div className="summary-listedit-div"> <div className="summary-listedit-div">
<div className="items-editables"> <div className="items-editables">
<Suspense fallback={<span>Loading...</span>}>
<MinusOutlined onClick={() => decline(item)} /> <MinusOutlined onClick={() => decline(item)} />
</Suspense>
<Badge count={item?.OrderQty} overflowCount={10000}> <Badge count={item?.OrderQty} overflowCount={10000}>
{' '} {' '}
</Badge> </Badge>
{item?.StockAvailable === 'Y' ? ( {item?.StockAvailable === 'Y' ? (
returnCount(item) > 0 && ( returnCount(item) > 0 && (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined <PlusOutlined
onClick={() => onClick={() =>
item.Type == 'P' || item.Type == 'C' item.Type == 'P' || item.Type == 'C'
@ -1964,10 +1955,8 @@ const BsBill2 = () => {
: '' : ''
} }
/> />
</Suspense>
) )
) : ( ) : (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined <PlusOutlined
onClick={() => onClick={() =>
item.Type == 'P' || item.Type == 'C' item.Type == 'P' || item.Type == 'C'
@ -1977,15 +1966,12 @@ const BsBill2 = () => {
: '' : ''
} }
/> />
</Suspense>
)} )}
<Suspense fallback={<span>Loading Edit...</span>}>
<EditOutlined <EditOutlined
style={{ fontSize: '14px' }} style={{ fontSize: '14px' }}
onClick={() => handleEditQuantity(item)} onClick={() => handleEditQuantity(item)}
/> />
</Suspense>
</div> </div>
</div> </div>
</div> </div>
@ -2205,30 +2191,22 @@ const BsBill2 = () => {
<div className="summary-listedit-div"> <div className="summary-listedit-div">
<div className="items-editables"> <div className="items-editables">
<Suspense fallback={<span>Loading...</span>}>
<MinusOutlined onClick={() => decline(item)} /> <MinusOutlined onClick={() => decline(item)} />
</Suspense>
<Badge count={item?.OrderQty} overflowCount={10000}> <Badge count={item?.OrderQty} overflowCount={10000}>
{' '} {' '}
</Badge> </Badge>
{item?.StockAvailable === 'Y' ? ( {item?.StockAvailable === 'Y' ? (
returnCount(item) > 0 && ( returnCount(item) > 0 && (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
) )
) : ( ) : (
<Suspense fallback={<span>Loading...</span>}>
<PlusOutlined onClick={() => increase(item)} /> <PlusOutlined onClick={() => increase(item)} />
</Suspense>
)} )}
<Suspense fallback={<span>Loading Edit...</span>}>
<EditOutlined <EditOutlined
style={{ fontSize: '14px' }} style={{ fontSize: '14px' }}
onClick={() => handleEditQuantity(item)} onClick={() => handleEditQuantity(item)}
/> />
</Suspense>
</div> </div>
</div> </div>
</div> </div>

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

@ -14,6 +14,7 @@ import defaultupi from '../../../../../Images/defaultupi.png';
import pozologoimg from '../../../../../Images/pozologoimg.png'; import pozologoimg from '../../../../../Images/pozologoimg.png';
import paydevice from '../../../../../Images/paydevice.png'; import paydevice from '../../../../../Images/paydevice.png';
import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable15.scss'; import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable15.scss';
import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss';
import { isMobile } from 'react-device-detect'; import { isMobile } from 'react-device-detect';
import { import {
GlobalSelectedFont, GlobalSelectedFont,

59
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BsBill.jsx
View File

@ -128,7 +128,8 @@ const BsBill = () => {
const GetCustId = useSelector(GlobalCustId); const GetCustId = useSelector(GlobalCustId);
const selectedCustomer = useSelector(GlobalSelOption); const selectedCustomer = useSelector(GlobalSelOption);
const [customerPriceHistoryOpen, setCustomerPriceHistoryOpen] = useState(false); const [customerPriceHistoryOpen, setCustomerPriceHistoryOpen] =
useState(false);
const [customerProduct, setCustomerProduct] = useState(null); const [customerProduct, setCustomerProduct] = useState(null);
const [PreviousdataLength, setPreviousdataLength] = const [PreviousdataLength, setPreviousdataLength] =
useState(PreviousOrderLength); useState(PreviousOrderLength);
@ -145,14 +146,24 @@ const BsBill = () => {
const OrderType = useSelector(GlobalOrderType); const OrderType = useSelector(GlobalOrderType);
const GlobEstBooking = useSelector(GlobalEstimateBooking); const GlobEstBooking = useSelector(GlobalEstimateBooking);
const GlobalExtraCharge = useSelector(globalExtraTotalAmount); const GlobalExtraCharge = useSelector(globalExtraTotalAmount);
const overAllLimitPreferenece = const overAllLimitPreferenece = preferenceDatas?.[0]?.[
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( 'SettingDtlDetails'
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y'); ]?.find(
const itemWiseLimitPreferenece = (item) =>
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( item.SettingIdName?.toLowerCase() === 'overalllimit' &&
(item) => item.SettingIdName?.toLowerCase() === 'itemwiselimit' && item?.SettingValue === 'Y'); item?.SettingValue === 'Y'
const maxQtyLimit = itemWiseLimitPreferenece?.SettingCount || overAllLimitPreferenece?.SettingCount || null; );
const itemWiseLimitPreferenece = preferenceDatas?.[0]?.[
'SettingDtlDetails'
]?.find(
(item) =>
item.SettingIdName?.toLowerCase() === 'itemwiselimit' &&
item?.SettingValue === 'Y'
);
const maxQtyLimit =
itemWiseLimitPreferenece?.SettingCount ||
overAllLimitPreferenece?.SettingCount ||
null;
const OtherServicesglobal = useSelector(GlobalOtherSevices); const OtherServicesglobal = useSelector(GlobalOtherSevices);
@ -853,7 +864,6 @@ const BsBill = () => {
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (TableData?.length <= 1) { if (TableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([])); await dispatch(changeReorderProductDetails([]));
@ -1726,7 +1736,6 @@ const BsBill = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(TableData?.length); // setPreviousdataLength(TableData?.length);
@ -1988,7 +1997,6 @@ const BsBill = () => {
event.preventDefault(); event.preventDefault();
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
@ -2140,11 +2148,10 @@ const BsBill = () => {
setMessageType(null); setMessageType(null);
}, []); }, []);
const increase = async (item) => { const increase = async (item) => {
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) { if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) { if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(TableData); const calculatedOverAllQty = calculateOverAllQtyLimit(TableData);
if ((calculatedOverAllQty + 1) > maxQtyLimit) { if (calculatedOverAllQty + 1 > maxQtyLimit) {
setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`); setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
setMessageType('warning'); setMessageType('warning');
return; return;
@ -2511,7 +2518,7 @@ const BsBill = () => {
const handleCustomerProductPriceHistory = (item) => { const handleCustomerProductPriceHistory = (item) => {
setCustomerPriceHistoryOpen(true); setCustomerPriceHistoryOpen(true);
setCustomerProduct(item?.ProdId); setCustomerProduct(item?.ProdId);
} };
const decline = async (item) => { const decline = async (item) => {
setPreviousdataLength(TableData?.length); setPreviousdataLength(TableData?.length);
const isItemInCart = TableData?.find( const isItemInCart = TableData?.find(
@ -3098,7 +3105,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '10px', width: '10px',
padding: '1px', padding: '1px',
}} }}
@ -3118,7 +3125,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '10px', width: '10px',
}} }}
> >
@ -3135,7 +3142,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
}} }}
> >
{!isMobile ? ( {!isMobile ? (
@ -3151,7 +3158,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '20px', width: '20px',
}} }}
> >
@ -3168,7 +3175,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '20px', width: '20px',
}} }}
> >
@ -3185,7 +3192,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '20px', width: '20px',
}} }}
// onClick={TableData?.length>0? OpenEditTotalAmount :""} // onClick={TableData?.length>0? OpenEditTotalAmount :""}
@ -3208,7 +3215,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '20px', width: '20px',
}} }}
> >
@ -3225,7 +3232,7 @@ const BsBill = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '20px', width: '20px',
}} }}
> >
@ -3245,7 +3252,7 @@ const BsBill = () => {
padding: '0.5rem', padding: '0.5rem',
borderBottom: '1.9px solid #000', borderBottom: '1.9px solid #000',
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '10px', width: '10px',
}} }}
> >
@ -4653,7 +4660,7 @@ const BsBill = () => {
ProductDetail={Modaldata} ProductDetail={Modaldata}
/> />
)} )}
{(customerPriceHistoryOpen && GetCustId) && {customerPriceHistoryOpen && GetCustId && (
<CustomerPriceHistory <CustomerPriceHistory
open={customerPriceHistoryOpen} open={customerPriceHistoryOpen}
custId={GetCustId} custId={GetCustId}
@ -4662,7 +4669,7 @@ const BsBill = () => {
setCustomerProduct={setCustomerProduct} setCustomerProduct={setCustomerProduct}
selectedCustomer={selectedCustomer} selectedCustomer={selectedCustomer}
/> />
} )}
</div> </div>
); );
}; };

48
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBillingTable7.jsx
View File

@ -1044,7 +1044,7 @@ const BSBillingTable7 = () => {
InwardDtlId: isPaidproduct?.InwardDtlId, InwardDtlId: isPaidproduct?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: 0, Offer: 0,
OrderRate: isPaidproduct?.OrderRate OrderRate: isPaidproduct?.OrderRate,
}); });
} else if (isPaidproduct?.OrderQty > item?.OrderQty) { } else if (isPaidproduct?.OrderQty > item?.OrderQty) {
// Just Decrease Paid Qty // Just Decrease Paid Qty
@ -1218,7 +1218,7 @@ const BSBillingTable7 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty, OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@ -1329,7 +1329,7 @@ const BSBillingTable7 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeOfferAppliedProdsFn({ await ChangeOfferAppliedProdsFn({
inwardDtlId: item?.InwardDtlId, inwardDtlId: item?.InwardDtlId,
@ -1361,7 +1361,7 @@ const BSBillingTable7 = () => {
InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId, InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: 0, Offer: 0,
OrderRate: isPaidProductAvailableInCart?.OrderRate OrderRate: isPaidProductAvailableInCart?.OrderRate,
}); });
} else if ( } else if (
isPaidProductAvailableInCart?.OrderQty > item?.OrderQty isPaidProductAvailableInCart?.OrderQty > item?.OrderQty
@ -1445,7 +1445,7 @@ const BSBillingTable7 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -1472,7 +1472,7 @@ const BSBillingTable7 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null, BuyInwardDtlId: null,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty, OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -1819,7 +1819,7 @@ const BSBillingTable7 = () => {
InwardDtlId: item?.InwardDtlId, InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: item?.InwardDtlId, BuyInwardDtlId: item?.InwardDtlId,
Offer: item?.Offer, Offer: item?.Offer,
OrderRate: item?.OrderRate OrderRate: item?.OrderRate,
}); });
await ChangeFreeprodlistFn({ await ChangeFreeprodlistFn({
OverAllFreeQty: item?.OrderQty, OverAllFreeQty: item?.OrderQty,
@ -1998,7 +1998,7 @@ const BSBillingTable7 = () => {
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
padding: '8px', padding: '8px',
fontSize: '16px', fontSize: '14px',
width: '10px', width: '10px',
}} }}
> >
@ -2017,7 +2017,7 @@ const BSBillingTable7 = () => {
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
padding: '8px', padding: '8px',
fontSize: '16px', fontSize: '14px',
}} }}
> >
{!isMobile ? ( {!isMobile ? (
@ -2033,7 +2033,7 @@ const BSBillingTable7 = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
padding: '8px', padding: '8px',
fontSize: '16px', fontSize: '14px',
width: '5%', width: '5%',
}} }}
> >
@ -2051,7 +2051,7 @@ const BSBillingTable7 = () => {
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
padding: '8px', padding: '8px',
fontSize: '16px', fontSize: '14px',
width: '5%', width: '5%',
}} }}
> >
@ -2068,7 +2068,7 @@ const BSBillingTable7 = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
padding: '8px', padding: '8px',
width: '5%', width: '5%',
}} }}
@ -2092,7 +2092,7 @@ const BSBillingTable7 = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '5%', width: '5%',
padding: '8px', padding: '8px',
}} }}
@ -2110,7 +2110,7 @@ const BSBillingTable7 = () => {
style={{ style={{
fontFamily: SelectedFont, fontFamily: SelectedFont,
fontWeight: '600', fontWeight: '600',
fontSize: '16px', fontSize: '14px',
width: '5%', width: '5%',
padding: '8px', padding: '8px',
}} }}
@ -2183,11 +2183,12 @@ const BSBillingTable7 = () => {
? () => handleEditQuantity(item) ? () => handleEditQuantity(item)
: editdelete === 'Delete' : editdelete === 'Delete'
? () => removeFromCart(item) ? () => removeFromCart(item)
: () => { } : () => {}
} }
// onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""} // onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""}
className={`${item?.SalesId && OrderType !== 'Hold' className={`${
item?.SalesId && OrderType !== 'Hold'
? 'BSBill-Table7-content-disabled' ? 'BSBill-Table7-content-disabled'
: 'BSBill-Table7-content' : 'BSBill-Table7-content'
} }
@ -2412,11 +2413,12 @@ const BSBillingTable7 = () => {
? () => handleEditQuantity(item) ? () => handleEditQuantity(item)
: editdelete === 'Delete' : editdelete === 'Delete'
? () => removeFromCart(item) ? () => removeFromCart(item)
: () => { } : () => {}
} }
// onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""} // onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""}
className={`${item?.SalesId className={`${
item?.SalesId
? 'BSBill-Table7-content-disabled' ? 'BSBill-Table7-content-disabled'
: 'BSBill-Table7-content' : 'BSBill-Table7-content'
} }
@ -2680,11 +2682,12 @@ const BSBillingTable7 = () => {
: '' : ''
: editdelete === 'Delete' : editdelete === 'Delete'
? () => removeFromCart(item) ? () => removeFromCart(item)
: () => { } : () => {}
} }
// onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""} // onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""}
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'BSBill-Table7-content-disabled' ? 'BSBill-Table7-content-disabled'
: 'BSBill-Table7-content' : 'BSBill-Table7-content'
} }
@ -2947,11 +2950,12 @@ const BSBillingTable7 = () => {
? () => handleEditQuantity(item) ? () => handleEditQuantity(item)
: editdelete === 'Delete' : editdelete === 'Delete'
? () => removeFromCart(item) ? () => removeFromCart(item)
: () => { } : () => {}
} }
// onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""} // onClick={editdelete === "Edit" ? () => handleEditQuantity(item) : editdelete === "Delete" ? () => removeFromCart(item) : ""}
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'BSBill-Table7-content-disabled' ? 'BSBill-Table7-content-disabled'
: 'BSBill-Table7-content' : 'BSBill-Table7-content'
} }

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

@ -205,9 +205,8 @@ const OtherServicePrintStyle1 = lazy(
() => () =>
import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx') import('../../../PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx')
); );
const OtherServiceMobilePrint = lazy( import OtherServiceMobilePrint from '../../BookingFunctionality/OtherServiceMobilePrint.jsx';
() => import('../../BookingFunctionality/OtherServiceMobilePrint.jsx')
);
const QrinScreen = lazy( const QrinScreen = lazy(
() => import('../../BookingFunctionality/DynamicScreenQr.jsx') () => import('../../BookingFunctionality/DynamicScreenQr.jsx')
); );
@ -3605,13 +3604,6 @@ const StandardTablePayment = () => {
title="Share on WhatsApp" title="Share on WhatsApp"
/> />
)} )}
{/* <FaPrint
size={32}
color="#1292EE"
style={{ cursor: 'pointer' }}
onClick={handlePrintOrToken}
title="Print"
/> */}
{(filteredSettingNames?.includes('Print') || {(filteredSettingNames?.includes('Print') ||
!MobileNoWhatsApp || !MobileNoWhatsApp ||
@ -4196,8 +4188,7 @@ const StandardTablePayment = () => {
} }
/> />
)} )}
{ {OtherServicesPrintDetails?.length > 0 && (
OtherServicesPrintDetails?.length > 0 && (
// PrintOrderDetails?.[0]?.OrderDetails?.map((orderDetail, index) => ( // PrintOrderDetails?.[0]?.OrderDetails?.map((orderDetail, index) => (
<div style={{ display: 'none' }}> <div style={{ display: 'none' }}>
<OtherServicePrintStyle1 <OtherServicePrintStyle1
@ -4217,9 +4208,7 @@ const StandardTablePayment = () => {
printDatas={printDatas} printDatas={printDatas}
/> />
</div> </div>
) )}
// ))
}
</div> </div>
</Suspense> </Suspense>
); );

13
src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx
View File

@ -1,6 +1,5 @@
import React, { import React, {
lazy, lazy,
Suspense,
useCallback, useCallback,
useEffect, useEffect,
useRef, useRef,
@ -11,13 +10,9 @@ import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { TiLocation } from 'react-icons/ti'; import { TiLocation } from 'react-icons/ti';
import { BsFillPersonFill } from 'react-icons/bs'; import { BsFillPersonFill } from 'react-icons/bs';
import { PiStorefrontFill } from 'react-icons/pi';
import { BiSolidDashboard, BiSolidReport } from 'react-icons/bi'; import { BiSolidDashboard, BiSolidReport } from 'react-icons/bi';
import { FaUserLarge } from 'react-icons/fa6';
import { BiSolidPhoneCall } from 'react-icons/bi';
import { CgMenuGridR } from 'react-icons/cg'; import { CgMenuGridR } from 'react-icons/cg';
import { MdTableChart } from 'react-icons/md'; import { MdTableChart } from 'react-icons/md';
import { MdEdit } from 'react-icons/md';
import MyTime, { DateDisplay, TimeDisplay } from './BSTimer.jsx'; import MyTime, { DateDisplay, TimeDisplay } from './BSTimer.jsx';
import '../../../../Styles/BookingScreen/Template/BSLayout7/BSC1NavBar.scss'; import '../../../../Styles/BookingScreen/Template/BSLayout7/BSC1NavBar.scss';
import { import {
@ -31,7 +26,6 @@ import {
sessionStore, sessionStore,
} from '../../../../Services/Others'; } from '../../../../Services/Others';
import PozoHomeIcon from '../UtillComponents/Pozo retail icons/PozoHomeIcon.jsx'; import PozoHomeIcon from '../UtillComponents/Pozo retail icons/PozoHomeIcon.jsx';
import { GlobalCompBranchData } from '../../../../Features/BrachLogin/BranchLogin.js';
import { isMobile } from 'react-device-detect'; import { isMobile } from 'react-device-detect';
import { FaDisplay } from 'react-icons/fa6'; import { FaDisplay } from 'react-icons/fa6';
import { import {
@ -233,7 +227,6 @@ const BSC1NavBar = () => {
} }
}, [isFullscreen]); }, [isFullscreen]);
return ( return (
<Suspense fallback={<div>Loading...</div>}>
<> <>
<div <div
className="BSC1NavBar-Container" className="BSC1NavBar-Container"
@ -298,7 +291,6 @@ const BSC1NavBar = () => {
</div> </div>
<div className="BSC1NavBar-name"> <div className="BSC1NavBar-name">
{/* <PiStorefrontFill className="BSC1NavBar-name-icon" /> */}
<TooltipWrapper placement="bottom" title={branchData.branchName}> <TooltipWrapper placement="bottom" title={branchData.branchName}>
<span className="BSC1NavBar-ellipsisname"> <span className="BSC1NavBar-ellipsisname">
{branchData.branchName} {branchData.branchName}
@ -336,9 +328,7 @@ const BSC1NavBar = () => {
<Tooltip title={isFullscreen ? 'Exit Full Screen' : 'Full Screen'}> <Tooltip title={isFullscreen ? 'Exit Full Screen' : 'Full Screen'}>
<div <div
className={ className={
isFullscreen isFullscreen ? 'BsNavbar1FullScreenExit' : 'BsNavbar1FullScreen'
? 'BsNavbar1FullScreenExit'
: 'BsNavbar1FullScreen'
} }
onClick={handleFullscreen} onClick={handleFullscreen}
> >
@ -392,7 +382,6 @@ const BSC1NavBar = () => {
</div> </div>
</div> </div>
</> </>
</Suspense>
); );
}; };

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

@ -1,4 +1,4 @@
import React, { useEffect, useState, useRef, lazy, Suspense } from 'react'; import React, { useEffect, useState, useRef, lazy } from 'react';
import { FaWhatsapp, FaPrint, FaParking, FaCartPlus } from 'react-icons/fa'; import { FaWhatsapp, FaPrint, FaParking, FaCartPlus } from 'react-icons/fa';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
@ -3479,7 +3479,6 @@ const BSC1Payment = (props) => {
}; };
return ( return (
<Suspense fallback={<div>Loading...</div>}>
<> <>
<div <div
className="BSC1Payment-Container" className="BSC1Payment-Container"
@ -3570,8 +3569,7 @@ const BSC1Payment = (props) => {
BookingType !== 'TakeAway' && ChangeTakeAway() BookingType !== 'TakeAway' && ChangeTakeAway()
} }
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<PozoTakeAway <PozoTakeAway
@ -3628,10 +3626,7 @@ const BSC1Payment = (props) => {
title="Alt + A" title="Alt + A"
open={isAltPressed} open={isAltPressed}
> >
<TooltipWrapper <TooltipWrapper title={'Extra Charge'} isMobile={isMobile}>
title={'Extra Charge'}
isMobile={isMobile}
>
<div <div
className="BSC1Payment-div1-btns" className="BSC1Payment-div1-btns"
onClick={handleextraCharges} onClick={handleextraCharges}
@ -3938,10 +3933,7 @@ const BSC1Payment = (props) => {
}} }}
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(payment.ModeId, payment.ModeName)
payment.ModeId,
payment.ModeName
)
: handlePaymentMode(payment.ModeId, payment.ModeName) : handlePaymentMode(payment.ModeId, payment.ModeName)
} }
> >
@ -4114,14 +4106,6 @@ const BSC1Payment = (props) => {
</div> </div>
</TooltipWrapper> </TooltipWrapper>
{/* <div className='BSC1Payment-div2-2'>
<select className='BSC1Payment-div2-button'>
<option className='BSC1Payment-div1-btns'>CASH</option>
<option className='BSC1Payment-div1-btns'>CARD</option>
<option className='BSC1Payment-div1-btns'>UPI</option>
</select>
</div> */}
<div class="BSC1Payment-vl"></div> <div class="BSC1Payment-vl"></div>
<div className="BSC1Payment-div3"> <div className="BSC1Payment-div3">
@ -4150,10 +4134,7 @@ const BSC1Payment = (props) => {
> >
<div style={{ width: '3rem' }}>Qty </div> <div style={{ width: '3rem' }}>Qty </div>
<div style={{ width: '4px' }}> : </div> <div style={{ width: '4px' }}> : </div>
<div style={{ textAlign: 'right', width: '1rem' }}> <div style={{ textAlign: 'right', width: '1rem' }}> {Qty} </div>
{' '}
{Qty}{' '}
</div>
</div> </div>
<div <div
style={{ display: 'flex', alignItems: 'center' }} style={{ display: 'flex', alignItems: 'center' }}
@ -4259,9 +4240,7 @@ const BSC1Payment = (props) => {
> >
<div <div
style={{ style={{
backgroundColor: Holddata backgroundColor: Holddata ? '#52c41a' : 'default',
? '#52c41a'
: 'default',
color: Holddata ? '#ffffffff' : 'default', color: Holddata ? '#ffffffff' : 'default',
height: '40px', height: '40px',
width: '45px', width: '45px',
@ -4290,16 +4269,11 @@ const BSC1Payment = (props) => {
{tabledata?.length > 0 && dinePreference && ( {tabledata?.length > 0 && dinePreference && (
<> <>
{item?.OptionName == 'UnpaidBill' && ( {item?.OptionName == 'UnpaidBill' && (
<TooltipWrapper <TooltipWrapper title="Unpaid Bills" isMobile={isMobile}>
title="Unpaid Bills"
isMobile={isMobile}
>
{' '} {' '}
<div <div
style={{ style={{
backgroundColor: unpaidFlow backgroundColor: unpaidFlow ? '#52c41a' : '#1292EE',
? '#52c41a'
: '#1292EE',
color: unpaidFlow ? '#ffffffff' : '#ffffffff', color: unpaidFlow ? '#ffffffff' : '#ffffffff',
height: '40px', height: '40px',
width: '40px', width: '40px',
@ -4485,8 +4459,7 @@ const BSC1Payment = (props) => {
: '' : ''
} }
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
/> />
</TooltipWrapper> </TooltipWrapper>
@ -4568,10 +4541,7 @@ const BSC1Payment = (props) => {
}} }}
> >
<BSCustomerSelect /> <BSCustomerSelect />
<TooltipWrapper <TooltipWrapper title={'Add Customer'} isMobile={isMobile}>
title={'Add Customer'}
isMobile={isMobile}
>
<div> <div>
<PozoAddCustomerIcon <PozoAddCustomerIcon
className="BSBillingNav-icon-table-icon bspaymentcomboAddCus" className="BSBillingNav-icon-table-icon bspaymentcomboAddCus"
@ -4875,10 +4845,9 @@ const BSC1Payment = (props) => {
children={ children={
<> <>
<div> <div>
You have already selected a table. If you click 'OK,' the You have already selected a table. If you click 'OK,' the table
table selection will be removed, and the unpaid flow will selection will be removed, and the unpaid flow will continue. If
continue. If you click 'Cancel,' the dine-in flow will proceed you click 'Cancel,' the dine-in flow will proceed as selected.
as selected.
</div> </div>
</> </>
} }
@ -5035,7 +5004,6 @@ const BSC1Payment = (props) => {
/> />
)} )}
</> </>
</Suspense>
); );
}; };

81
src/Pages/BookingScreen/Components/BSCombo/BSC1Search.jsx
View File

@ -1,11 +1,4 @@
import { import { useEffect, useRef, useState, useCallback, lazy } from 'react';
useEffect,
useRef,
useState,
useCallback,
Suspense,
lazy,
} from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import moment from 'moment'; import moment from 'moment';
import { BiBarcodeReader } from 'react-icons/bi'; import { BiBarcodeReader } from 'react-icons/bi';
@ -133,13 +126,24 @@ export default function BSC1Search(props) {
const FeatureAddonData = useSelector(GlobalFeatAddOnData); const FeatureAddonData = useSelector(GlobalFeatAddOnData);
useSaleswiseOfferWatcher(); useSaleswiseOfferWatcher();
const preferenceDatas = useSelector(PreferenceData); const preferenceDatas = useSelector(PreferenceData);
const overAllLimitPreferenece = const overAllLimitPreferenece = preferenceDatas?.[0]?.[
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( 'SettingDtlDetails'
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y'); ]?.find(
const itemWiseLimitPreferenece = (item) =>
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( item.SettingIdName?.toLowerCase() === 'overalllimit' &&
(item) => item.SettingIdName?.toLowerCase() === 'itemwiselimit' && item?.SettingValue === 'Y'); item?.SettingValue === 'Y'
const maxQtyLimit = itemWiseLimitPreferenece?.SettingCount || overAllLimitPreferenece?.SettingCount || null; );
const itemWiseLimitPreferenece = preferenceDatas?.[0]?.[
'SettingDtlDetails'
]?.find(
(item) =>
item.SettingIdName?.toLowerCase() === 'itemwiselimit' &&
item?.SettingValue === 'Y'
);
const maxQtyLimit =
itemWiseLimitPreferenece?.SettingCount ||
overAllLimitPreferenece?.SettingCount ||
null;
const preferenceOffer = const preferenceOffer =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
(item) => item.SettingIdName === 'Offer' (item) => item.SettingIdName === 'Offer'
@ -253,22 +257,27 @@ export default function BSC1Search(props) {
document.activeElement.tagName !== 'INPUT' && document.activeElement.tagName !== 'INPUT' &&
document.activeElement.tagName !== 'TEXTAREA' document.activeElement.tagName !== 'TEXTAREA'
) { ) {
event.preventDefault(); // Stops "S" from being typed event.preventDefault();
inputRef?.current?.focus(); inputRef?.current?.focus();
} }
} }
}; };
const handleClickOutside = () => { const handleClickOutside = (event) => {
if (
containerRef.current &&
!containerRef.current.contains(event.target)
) {
inputRef?.current?.blur(); inputRef?.current?.blur();
}
}; };
window.addEventListener('keydown', handleKeyPress); window.addEventListener('keydown', handleKeyPress);
window.addEventListener('mousedown', handleClickOutside); document.addEventListener('mousedown', handleClickOutside);
return () => { return () => {
window.removeEventListener('keydown', handleKeyPress); window.removeEventListener('keydown', handleKeyPress);
window.removeEventListener('mousedown', handleClickOutside); document.removeEventListener('mousedown', handleClickOutside);
}; };
}, []); }, []);
//dhana //dhana
@ -2827,11 +2836,10 @@ export default function BSC1Search(props) {
}; };
const AddOrderDetails = async (item) => { const AddOrderDetails = async (item) => {
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) { if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) { if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails); const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails);
if ((calculatedOverAllQty + 1) > maxQtyLimit) { if (calculatedOverAllQty + 1 > maxQtyLimit) {
setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`); setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
setMessageType('warning'); setMessageType('warning');
return; return;
@ -4535,7 +4543,6 @@ export default function BSC1Search(props) {
const widthBasedOnProdVariantDetails = getMaxBrandWidth(); const widthBasedOnProdVariantDetails = getMaxBrandWidth();
return ( return (
<Suspense fallback={<div>Loading...</div>}>
<> <>
<div <div
className="BSC1Search-container" className="BSC1Search-container"
@ -4624,9 +4631,7 @@ export default function BSC1Search(props) {
</div> </div>
{ProductSearch?.length > 5 && {ProductSearch?.length > 5 &&
QuickAdd && QuickAdd &&
GetmultipleSearchDatas.some( GetmultipleSearchDatas.some((e) => e.toLowerCase() === 'qrcode') && (
(e) => e.toLowerCase() === 'qrcode'
) && (
<div> <div>
<FeaturesFunctionalities <FeaturesFunctionalities
handleQuickAddCancel={handleQuickCancel} handleQuickAddCancel={handleQuickCancel}
@ -4701,11 +4706,8 @@ export default function BSC1Search(props) {
<div key={index}> <div key={index}>
<div <div
className={ className={
returnQtyCount( returnQtyCount(item?.ProdId, item, CartOrderDetails) >
item?.ProdId, 0 || item?.StockAvailable !== 'Y'
item,
CartOrderDetails
) > 0 || item?.StockAvailable !== 'Y'
? 'ItemQtyCard' ? 'ItemQtyCard'
: 'ItemQtyCard-disabled' : 'ItemQtyCard-disabled'
} }
@ -4739,8 +4741,8 @@ export default function BSC1Search(props) {
<sup style={{ fontFamily: 'Gilroy' }}>₹</sup> <sup style={{ fontFamily: 'Gilroy' }}>₹</sup>
&nbsp; &nbsp;
{ {
item?.ProdVariantDetails?.[0] item?.ProdVariantDetails?.[0]?.StockDetails?.[0]
?.StockDetails?.[0]?.SellPrice ?.SellPrice
} }
</p> </p>
) : ( ) : (
@ -4751,11 +4753,7 @@ export default function BSC1Search(props) {
</div> </div>
))} ))}
</div> </div>
{brandId !== 'null' && brandId !== 'undefined' ? ( {brandId !== 'null' && brandId !== 'undefined' ? <hr></hr> : ''}
<hr></hr>
) : (
''
)}
</div> </div>
))} ))}
@ -4794,9 +4792,7 @@ export default function BSC1Search(props) {
className="EditQuantity-headingproductname" className="EditQuantity-headingproductname"
style={{ marginLeft: '1rem' }} style={{ marginLeft: '1rem' }}
> >
<p className="EditQuantity-productname"> <p className="EditQuantity-productname">{qtydata?.ProdName}</p>
{qtydata?.ProdName}
</p>
</div> </div>
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
@ -4850,9 +4846,7 @@ export default function BSC1Search(props) {
className="EditQuantity-headingproductname" className="EditQuantity-headingproductname"
style={{ marginLeft: '1rem' }} style={{ marginLeft: '1rem' }}
> >
<p className="EditQuantity-productname"> <p className="EditQuantity-productname">{qtydata?.ProdName}</p>
{qtydata?.ProdName}
</p>
</div> </div>
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
@ -4878,6 +4872,5 @@ export default function BSC1Search(props) {
</div> </div>
</DefaultModal> </DefaultModal>
</> </>
</Suspense>
); );
} }

62
src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx
View File

@ -165,13 +165,24 @@ const BSItemCard = (props) => {
// const applyOffer = useApplyOfferto_CardDetail(); // const applyOffer = useApplyOfferto_CardDetail();
const preferenceDatas = useSelector(PreferenceData, shallowEqual); const preferenceDatas = useSelector(PreferenceData, shallowEqual);
const { selectedDate } = useDateStore(); const { selectedDate } = useDateStore();
const overAllLimitPreferenece = const overAllLimitPreferenece = preferenceDatas?.[0]?.[
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( 'SettingDtlDetails'
(item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y'); ]?.find(
const itemWiseLimitPreferenece = (item) =>
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( item.SettingIdName?.toLowerCase() === 'overalllimit' &&
(item) => item.SettingIdName?.toLowerCase() === 'itemwiselimit' && item?.SettingValue === 'Y'); item?.SettingValue === 'Y'
const maxQtyLimit = itemWiseLimitPreferenece?.SettingCount || overAllLimitPreferenece?.SettingCount || null; );
const itemWiseLimitPreferenece = preferenceDatas?.[0]?.[
'SettingDtlDetails'
]?.find(
(item) =>
item.SettingIdName?.toLowerCase() === 'itemwiselimit' &&
item?.SettingValue === 'Y'
);
const maxQtyLimit =
itemWiseLimitPreferenece?.SettingCount ||
overAllLimitPreferenece?.SettingCount ||
null;
const preferenceOffer = const preferenceOffer =
preferenceDatas?.[0]?.['SettingDtlDetails']?.find( preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
(item) => item.SettingIdName === 'Offer' (item) => item.SettingIdName === 'Offer'
@ -1299,7 +1310,7 @@ const BSItemCard = (props) => {
SinglePc: otherscarddata?.SinglePc, SinglePc: otherscarddata?.SinglePc,
CounterName: '', //sri CounterName: '', //sri
}; };
AddOrderDetails(data,otherscarddata?.Quantity); AddOrderDetails(data, otherscarddata?.Quantity);
} }
// data["OrderRate"] = otherscarddata?.SellPrice // data["OrderRate"] = otherscarddata?.SellPrice
}, [otherscarddata]); }, [otherscarddata]);
@ -2080,11 +2091,11 @@ const BSItemCard = (props) => {
return dateVal; return dateVal;
}; };
const AddOrderDetails = async (item,Qty=1) => { const AddOrderDetails = async (item, Qty = 1) => {
if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) { if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
if (overAllLimitPreferenece) { if (overAllLimitPreferenece) {
const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails); const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails);
if ((calculatedOverAllQty + Qty) > maxQtyLimit) { if (calculatedOverAllQty + Qty > maxQtyLimit) {
setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`); setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
setMessageType('warning'); setMessageType('warning');
return; return;
@ -3682,7 +3693,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdName === ProdName (a) => a?.ProdName === ProdName
); );
@ -3883,7 +3894,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -3919,7 +3930,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -4005,7 +4016,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -4044,7 +4055,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -4136,7 +4147,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -4179,7 +4190,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -4263,7 +4274,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -4310,7 +4321,7 @@ const BSItemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -7433,16 +7444,6 @@ const BSItemCard = (props) => {
onTouchStart={handleTouchStart} onTouchStart={handleTouchStart}
onTouchMove={handleTouchMove} onTouchMove={handleTouchMove}
onTouchEnd={handleTouchEnd} onTouchEnd={handleTouchEnd}
// style={{
// marginTop: "1rem",
// display: "flex",
// gap: "1rem",
// overflowX: "auto",
// cursor: "grab",
// pointerEvents: OrderType === "Failed" ? "none" : "auto",
// scrollBehavior: "smooth",
// padding: "0 2rem", // space for arrows
// }}
style={{ style={{
cursor: 'grab', cursor: 'grab',
overflowX: 'auto', overflowX: 'auto',
@ -7469,7 +7470,8 @@ const BSItemCard = (props) => {
userSelect: 'none', userSelect: 'none',
textAlign: 'center', textAlign: 'center',
fontWeight: fontWeight:
selectedBrand === brand ? 'bold' : 'normal', selectedBrand === brand ? '600' : 'normal',
fontFamily: 'Poppins',
}} }}
> >
{brand === 'Others' ? 'Others' : brand} {brand === 'Others' ? 'Others' : brand}

26
src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx
View File

@ -2310,7 +2310,7 @@ const BsBookingitemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdName === ProdName (a) => a?.ProdName === ProdName
); );
@ -2511,7 +2511,7 @@ const BsBookingitemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -2547,7 +2547,7 @@ const BsBookingitemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -2633,7 +2633,7 @@ const BsBookingitemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return ( return (
@ -2672,7 +2672,7 @@ const BsBookingitemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
parseInt(ItemQuantity) > parseInt(ItemQuantity) >
@ -2764,7 +2764,7 @@ const BsBookingitemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -2807,7 +2807,7 @@ const BsBookingitemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -2891,7 +2891,7 @@ const BsBookingitemCard = (props) => {
parseInt(totalSelectedProductQty || 0) + parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0); parseInt(reorderComboConsumed || 0);
} }
} catch (_) { } } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter( let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
); );
@ -2938,7 +2938,7 @@ const BsBookingitemCard = (props) => {
}, 0); }, 0);
totalOrderQty = totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
} catch (_) { } } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty; let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if ( if (
@ -4875,7 +4875,7 @@ const BsBookingitemCard = (props) => {
className="BSItemCard-itemName" className="BSItemCard-itemName"
> >
{item?.ProdName} {item?.ProdName}
{ } {}
</p> </p>
{cardFunction?.Price && ( {cardFunction?.Price && (
<p <p
@ -5618,7 +5618,8 @@ const BsBookingitemCard = (props) => {
userSelect: 'none', userSelect: 'none',
textAlign: 'center', textAlign: 'center',
fontWeight: fontWeight:
selectedBrand === brand ? 'bold' : 'normal', selectedBrand === brand ? '600' : 'normal',
fontFamily: 'Poppins',
}} }}
> >
{brand === 'Others' ? 'Others' : brand} {brand === 'Others' ? 'Others' : brand}
@ -6074,7 +6075,8 @@ const BsBookingitemCard = (props) => {
return ( return (
<div <div
key={idx} key={idx}
className={`slotTimingSelect ${isBooked className={`slotTimingSelect ${
isBooked
? 'booked' ? 'booked'
: isAlreadyAdded : isAlreadyAdded
? 'incart' ? 'incart'

4
src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx
View File

@ -1,4 +1,4 @@
import React, { lazy, Suspense } from 'react'; import React, { lazy } from 'react';
import { MdEdit } from 'react-icons/md'; import { MdEdit } from 'react-icons/md';
import { FaUserLarge } from 'react-icons/fa6'; import { FaUserLarge } from 'react-icons/fa6';
import { BiSolidPhoneCall } from 'react-icons/bi'; import { BiSolidPhoneCall } from 'react-icons/bi';
@ -39,7 +39,6 @@ const BSNavBarUserInfo = ({
navigate(`${subDirectory}app-page/branch-login`); navigate(`${subDirectory}app-page/branch-login`);
}; };
return ( return (
<Suspense fallback={<NavbarSkeleton />}>
<div ref={divRef} className="BSNavBar1-Accmenu"> <div ref={divRef} className="BSNavBar1-Accmenu">
<div className="BSNavBar1-Acc-menu"> <div className="BSNavBar1-Acc-menu">
{CompBranchData?.length > 1 && ( {CompBranchData?.length > 1 && (
@ -99,7 +98,6 @@ const BSNavBarUserInfo = ({
</div> </div>
</div> </div>
</div> </div>
</Suspense>
); );
}; };

58
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
View File

@ -1,11 +1,4 @@
import React, { import React, { useCallback, useEffect, useRef, useState, lazy } from 'react';
useCallback,
useEffect,
useRef,
useState,
lazy,
Suspense,
} from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { Badge, Popconfirm, Popover, Tooltip } from 'antd'; import { Badge, Popconfirm, Popover, Tooltip } from 'antd';
@ -612,7 +605,6 @@ const BSNavbar1 = (props) => {
}; };
return ( return (
<Suspense fallback={<NavbarSkeleton />}>
<div <div
className="BSBillingNavBar1" className="BSBillingNavBar1"
style={{ style={{
@ -674,9 +666,7 @@ const BSNavbar1 = (props) => {
}} }}
> >
<FaParking <FaParking
fill={ fill={OtherServicesglobal === true ? '#52C41A' : '#1292EE'}
OtherServicesglobal === true ? '#52C41A' : '#1292EE'
}
/> />
</div> </div>
</TooltipWrapper> </TooltipWrapper>
@ -706,10 +696,7 @@ const BSNavbar1 = (props) => {
OrderType === 'Failed' ? 'none' : 'auto', OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarSearch <BSNavBarSearch nosearch={true} OrderType={OrderType} />
nosearch={true}
OrderType={OrderType}
/>
</div> </div>
)} )}
</> </>
@ -738,11 +725,10 @@ const BSNavbar1 = (props) => {
<> <>
<> <>
{item?.OptionName == 'RePrint' && !OtherServicesglobal && ( {item?.OptionName == 'RePrint' && !OtherServicesglobal && (
<TooltipWrapper title="RePrint (Alt+R)" isMobile={isMobile}> <TooltipWrapper title="Reprint (Alt+R)" isMobile={isMobile}>
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSPrinterSetting /> <BSPrinterSetting />
@ -765,8 +751,7 @@ const BSNavbar1 = (props) => {
{item?.OptionName == 'QuickAdd' && ( {item?.OptionName == 'QuickAdd' && (
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarQuickAdd /> <BSNavBarQuickAdd />
@ -791,8 +776,7 @@ const BSNavbar1 = (props) => {
{item?.OptionName == 'TakeAway' && takeAwayPreference && ( {item?.OptionName == 'TakeAway' && takeAwayPreference && (
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarHandbag /> <BSNavBarHandbag />
@ -819,8 +803,7 @@ const BSNavbar1 = (props) => {
// CartOrderDetails?.length > 0 && // CartOrderDetails?.length > 0 &&
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarAddons /> <BSNavBarAddons />
@ -956,10 +939,7 @@ const BSNavbar1 = (props) => {
)} )}
{VerifyTheProducts && ( {VerifyTheProducts && (
<TooltipWrapper <TooltipWrapper title={'Verfied Products'} isMobile={isMobile}>
title={'Verfied Products'}
isMobile={isMobile}
>
<div> <div>
<VerfiedProducts /> <VerfiedProducts />
</div> </div>
@ -1026,16 +1006,11 @@ const BSNavbar1 = (props) => {
<div <div
style={{ fontSize: '1.5rem', color: 'rgb(18, 146, 238)' }} style={{ fontSize: '1.5rem', color: 'rgb(18, 146, 238)' }}
> >
<TooltipWrapper <TooltipWrapper title="Other Services" isMobile={isMobile}>
title="Other Services"
isMobile={isMobile}
>
<div onClick={handleotherservices}> <div onClick={handleotherservices}>
<FaParking <FaParking
fill={ fill={
OtherServicesglobal === true OtherServicesglobal === true ? '#52C41A' : '#1292EE'
? '#52C41A'
: '#1292EE'
} }
/> />
</div> </div>
@ -1043,9 +1018,7 @@ const BSNavbar1 = (props) => {
</div> </div>
)} )}
{!OtherServicesglobal && {!OtherServicesglobal &&
ScanLayoutScreen?.SettingValue === 'Y' && ( ScanLayoutScreen?.SettingValue === 'Y' && <BSScanTemplate />}
<BSScanTemplate />
)}
{!OtherServicesglobal && ( {!OtherServicesglobal && (
<> <>
@ -1207,8 +1180,7 @@ const BSNavbar1 = (props) => {
))} ))}
{FeatureAddonData?.FeatureDtls?.find( {FeatureAddonData?.FeatureDtls?.find(
(item) => (item) =>
item?.FeatureAddonName?.toLowerCase() === item?.FeatureAddonName?.toLowerCase() === 'Weight Scale'
'Weight Scale'
) && ( ) && (
<div <div
style={{ style={{
@ -1289,8 +1261,7 @@ const BSNavbar1 = (props) => {
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarDragItems type="small-screen" /> <BSNavBarDragItems type="small-screen" />
@ -1363,7 +1334,6 @@ const BSNavbar1 = (props) => {
} }
/> />
</div> </div>
</Suspense>
); );
}; };
export default BSNavbar1; export default BSNavbar1;

44
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx
View File

@ -1,11 +1,4 @@
import React, { import React, { useEffect, useRef, useState, useCallback, lazy } from 'react';
useEffect,
useRef,
useState,
useCallback,
lazy,
Suspense,
} from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { AiFillHome } from 'react-icons/ai'; import { AiFillHome } from 'react-icons/ai';
@ -586,7 +579,6 @@ const BSNavbar2 = () => {
}; };
return ( return (
<Suspense fallback={<NavbarSkeleton />}>
<div className="BSBillingNavBar2" style={{ backgroundColor: 'white' }}> <div className="BSBillingNavBar2" style={{ backgroundColor: 'white' }}>
<div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}>
<div> <div>
@ -616,14 +608,16 @@ const BSNavbar2 = () => {
{OtherServiceStatus && ( {OtherServiceStatus && (
<div <div
style={{ style={{
fontSize: '1.5rem', // fontSize: '1.5rem',
color: 'rgb(18, 146, 238)', color: 'rgb(18, 146, 238)',
position: 'sticky', position: 'sticky',
height: '32px',
}} }}
> >
<TooltipWrapper title="Other Services" isMobile={isMobile}> <TooltipWrapper title="Other Services" isMobile={isMobile}>
<div onClick={handleotherservices}> <div onClick={handleotherservices}>
<FaParking <FaParking
className="FaparkingIcon"
fill={OtherServicesglobal === true ? '#52C41A' : '#1292EE'} fill={OtherServicesglobal === true ? '#52C41A' : '#1292EE'}
/> />
</div> </div>
@ -668,10 +662,9 @@ const BSNavbar2 = () => {
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
<div style={{ display: 'flex', flexGrow: '1' }}> <div style={{ display: 'flex', flexGrow: '1' }}>
<> <>
{item?.OptionName == 'RePrint' && {item?.OptionName == 'RePrint' && !OtherServicesglobal && (
!OtherServicesglobal && (
<TooltipWrapper <TooltipWrapper
title="RePrint (Alt+R)" title="Reprint (Alt+R)"
isMobile={isMobile} isMobile={isMobile}
> >
<div <div
@ -906,8 +899,7 @@ const BSNavbar2 = () => {
)} )}
{FeatureAddonData?.FeatureDtls?.find( {FeatureAddonData?.FeatureDtls?.find(
(item) => (item) => item?.FeatureAddonName?.toLowerCase() === 'customer display'
item?.FeatureAddonName?.toLowerCase() === 'customer display'
) && ( ) && (
<TooltipWrapper title="Customer Display" isMobile={isMobile}> <TooltipWrapper title="Customer Display" isMobile={isMobile}>
<div <div
@ -963,16 +955,11 @@ const BSNavbar2 = () => {
<div <div
style={{ fontSize: '1.5rem', color: 'rgb(18, 146, 238)' }} style={{ fontSize: '1.5rem', color: 'rgb(18, 146, 238)' }}
> >
<TooltipWrapper <TooltipWrapper title="Other Services" isMobile={isMobile}>
title="Other Services"
isMobile={isMobile}
>
<div onClick={handleotherservices}> <div onClick={handleotherservices}>
<FaParking <FaParking
fill={ fill={
OtherServicesglobal === true OtherServicesglobal === true ? '#52C41A' : '#1292EE'
? '#52C41A'
: '#1292EE'
} }
/> />
</div> </div>
@ -1009,8 +996,7 @@ const BSNavbar2 = () => {
)} */} )} */}
{navbarOptions?.map((item) => ( {navbarOptions?.map((item) => (
<> <>
{item?.OptionName == 'RePrint' && {item?.OptionName == 'RePrint' && !OtherServicesglobal && (
!OtherServicesglobal && (
<div <div
style={{ style={{
pointerEvents: pointerEvents:
@ -1145,8 +1131,7 @@ const BSNavbar2 = () => {
<> <>
{FeatureAddonData?.FeatureDtls?.find( {FeatureAddonData?.FeatureDtls?.find(
(item) => (item) =>
item?.FeatureAddonName?.toLowerCase() === item?.FeatureAddonName?.toLowerCase() === 'Weight Scale'
'Weight Scale'
) && ( ) && (
<div <div
style={{ style={{
@ -1161,8 +1146,7 @@ const BSNavbar2 = () => {
<> <>
{FeatureAddonData?.FeatureDtls?.find( {FeatureAddonData?.FeatureDtls?.find(
(item) => (item) =>
item?.FeatureAddonName?.toLowerCase() === item?.FeatureAddonName?.toLowerCase() === 'preorder'
'preorder'
) && ( ) && (
<div <div
style={{ style={{
@ -1234,8 +1218,7 @@ const BSNavbar2 = () => {
)} )}
<div <div
style={{ style={{
pointerEvents: pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
OrderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<BSNavBarDragItems type="small-screen" /> <BSNavBarDragItems type="small-screen" />
@ -1331,7 +1314,6 @@ const BSNavbar2 = () => {
} }
/> />
</div> </div>
</Suspense>
); );
}; };
export default BSNavbar2; export default BSNavbar2;

38
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar3.jsx
View File

@ -1,12 +1,4 @@
import { import { useState, useEffect, useRef, useCallback, useMemo, lazy } from 'react';
useState,
useEffect,
useRef,
useCallback,
useMemo,
lazy,
Suspense,
} from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { useDispatch, useSelector, shallowEqual } from 'react-redux'; import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { import {
@ -596,7 +588,6 @@ const BSNavbar3 = ({ optionNames }) => {
}; };
return ( return (
<Suspense fallback={<NavbarSkeleton />}>
<> <>
<div className="BSNavbar3Main"> <div className="BSNavbar3Main">
<div className="homeTime"> <div className="homeTime">
@ -631,9 +622,7 @@ const BSNavbar3 = ({ optionNames }) => {
justifyContent: 'center', justifyContent: 'center',
cursor: 'pointer', cursor: 'pointer',
}} }}
fill={ fill={OtherServicesglobal === true ? '#52C41A' : '#1292EE'}
OtherServicesglobal === true ? '#52C41A' : '#1292EE'
}
/> />
</div> </div>
</TooltipWrapper> </TooltipWrapper>
@ -792,10 +781,7 @@ const BSNavbar3 = ({ optionNames }) => {
)} )}
{!sportsAppPreference && ( {!sportsAppPreference && (
<div <div className="FaTruckIconFavItem" style={{ padding: '4px 6px' }}>
className="FaTruckIconFavItem"
style={{ padding: '4px 6px' }}
>
{renderWithTooltip( {renderWithTooltip(
<BSNavBarFavItems <BSNavBarFavItems
size={41} size={41}
@ -894,9 +880,7 @@ const BSNavbar3 = ({ optionNames }) => {
<Tooltip title={isFullscreen ? 'Exit Full Screen' : 'Full Screen'}> <Tooltip title={isFullscreen ? 'Exit Full Screen' : 'Full Screen'}>
<div <div
className={ className={
isFullscreen isFullscreen ? 'BsNavbar3FullScreenExit' : 'BsNavbar3FullScreen'
? 'BsNavbar3FullScreenExit'
: 'BsNavbar3FullScreen'
} }
onClick={handleFullscreen} onClick={handleFullscreen}
> >
@ -1001,10 +985,7 @@ const BSNavbar3 = ({ optionNames }) => {
</div> </div>
)} )}
{quickAddOption && ( {quickAddOption && (
<div <div className="mobile-action-item" onClick={handleQuickAddOpen}>
className="mobile-action-item"
onClick={handleQuickAddOpen}
>
{renderWithTooltip(<FaPlus size={30} />, 'Quick Add', 'top')} {renderWithTooltip(<FaPlus size={30} />, 'Quick Add', 'top')}
<div>Quick Add</div> <div>Quick Add</div>
</div> </div>
@ -1103,10 +1084,7 @@ const BSNavbar3 = ({ optionNames }) => {
} }
}} }}
> >
<TooltipWrapper <TooltipWrapper title={'Verfied Products'} isMobile={isMobile}>
title={'Verfied Products'}
isMobile={isMobile}
>
<div> <div>
<VerfiedProducts <VerfiedProducts
drawerOpen={drawerOpen} drawerOpen={drawerOpen}
@ -1170,8 +1148,7 @@ const BSNavbar3 = ({ optionNames }) => {
<div <div
className="BSBillingNavBar2-AllIcons" className="BSBillingNavBar2-AllIcons"
style={{ style={{
pointerEvents: pointerEvents: orderType === 'Failed' ? 'none' : 'auto',
orderType === 'Failed' ? 'none' : 'auto',
}} }}
> >
<div className="mobile-action-item" onClick={() => {}}> <div className="mobile-action-item" onClick={() => {}}>
@ -1236,7 +1213,6 @@ const BSNavbar3 = ({ optionNames }) => {
/> />
)} )}
</> </>
</Suspense>
); );
}; };

75
src/Pages/BookingScreen/Components/BookingFunctionality/OtherServiceMobilePrint.jsx
View File

@ -1,19 +1,34 @@
import { extractLastNumber, getSession } from '../../../../Services/Others'; import { extractLastNumber, getSession } from '../../../../Services/Others';
import moment from 'moment'; import moment from 'moment';
const OtherServiceMobilePrint = async (PrintDetails, Mode, Preference, Token) => { const OtherServiceMobilePrint = async (
PrintDetails,
Mode,
Preference,
Token
) => {
console.log(
PrintDetails,
Mode,
Preference,
Token,
PrintDetails?.[0]?.OtherServicesTicketDetails,
'PrintDetails, UpiId, Mode, Preference, Token'
);
console.log(PrintDetails, Mode, Preference, Token, PrintDetails?.[0]?.OtherServicesTicketDetails,'PrintDetails, UpiId, Mode, Preference, Token'); let Otherservicesdetails = PrintDetails?.[0]?.OtherServicesTicketDetails;
let Otherservicesdetails1 = PrintDetails;
let Otherservicesdetails = PrintDetails?.[0]?.OtherServicesTicketDetails; let UpiId = PrintDetails?.[0]?.TicketNo;
let Otherservicesdetails1 = PrintDetails;
let UpiId = PrintDetails?.[0]?.TicketNo;
let PrintDetail; let PrintDetail;
let PaymentDetail; let PaymentDetail;
let PrintLogo = Preference?.[0]?.SettingDtlDetails?.filter((i) => i.SettingIdName === 'PrintLogo' )?.[0]; let PrintLogo = Preference?.[0]?.SettingDtlDetails?.filter(
let PrintGreeting = Preference?.[0]?.SettingDtlDetails?.filter((i) => i.SettingIdName === 'PrintGreetings' )?.[0]; (i) => i.SettingIdName === 'PrintLogo'
)?.[0];
let PrintGreeting = Preference?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintGreetings'
)?.[0];
if (Mode === 'Reprint') { if (Mode === 'Reprint') {
PrintDetail = PrintDetails?.[0]?.OtherServicesTicketDetails; PrintDetail = PrintDetails?.[0]?.OtherServicesTicketDetails;
PaymentDetail = PrintDetails?.[0]?.OtherServicesTicketDetails; PaymentDetail = PrintDetails?.[0]?.OtherServicesTicketDetails;
@ -31,12 +46,12 @@ let UpiId = PrintDetails?.[0]?.TicketNo;
let FooterPrint = ''; let FooterPrint = '';
let OrderId; let OrderId;
let receiptTextest = ''; let receiptTextest = '';
let totalAmt = PrintDetail?.[0]?.NetAmount let totalAmt = PrintDetail?.[0]?.NetAmount;
// let totalestAmt = PrintDetail?.find((a) => a.OrderType === 'E')?.NetAmount // let totalestAmt = PrintDetail?.find((a) => a.OrderType === 'E')?.NetAmount
// ? PrintDetail?.find((a) => a.OrderType === 'E')?.NetAmount // ? PrintDetail?.find((a) => a.OrderType === 'E')?.NetAmount
// : ''; // : '';
OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
? extractLastNumber(PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId) ? extractLastNumber(PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId)
: ''; : '';
const aggregatedPayments = PaymentDetail?.reduce((acc, paymentdata) => { const aggregatedPayments = PaymentDetail?.reduce((acc, paymentdata) => {
@ -274,15 +289,15 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
const snoSpacing = Math.max(0, 3 - String(index + 1).length); const snoSpacing = Math.max(0, 3 - String(index + 1).length);
const rateSpacing = Math.max(0, 6 - String(data?.Rate).length); const rateSpacing = Math.max(0, 6 - String(data?.Rate).length);
const qtySpacing = Math.max(0, 3 - String(data?.Qty).length); const qtySpacing = Math.max(0, 3 - String(data?.Qty).length);
const totalAmtSpacing = Math.max(0,1 - String(data?.TotalAmount).length); const totalAmtSpacing = Math.max(
0,
1 - String(data?.TotalAmount).length
);
let formattedString = let formattedString =
' '.repeat(snoSpacing) + ' '.repeat(snoSpacing) +
parseInt(index + 1) + parseInt(index + 1) +
' ' + ' ' +
(data?.ServiceName + ' '.repeat(20)).substring(0, 20) +
(
data?.ServiceName + ' '.repeat(20)
).substring(0, 20) +
' ' + ' ' +
' '.repeat(qtySpacing) + ' '.repeat(qtySpacing) +
String(data?.Qty); String(data?.Qty);
@ -294,7 +309,6 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
' '.repeat(rateSpacing) + ' '.repeat(rateSpacing) +
String(data?.Rate) + String(data?.Rate) +
' ' + ' ' +
' '.repeat(totalAmtSpacing) + ' '.repeat(totalAmtSpacing) +
String(data?.TotalAmount) + String(data?.TotalAmount) +
' ' + ' ' +
@ -337,10 +351,10 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
'S.No' + 'S.No' +
' ' + ' ' +
' Name ' + ' Name ' +
(' ') + ' ' +
' ' + ' ' +
'Qty ' + 'Qty ' +
('') + // Add Disc column conditionally '' + // Add Disc column conditionally
' ' + ' ' +
'Rate ' + 'Rate ' +
' ' + ' ' +
@ -358,7 +372,7 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
fulltakeawaydata = ''; fulltakeawaydata = '';
} }
// PAYEMENT TYPE NAME // PAYEMENT TYPE NAME
let PaymentType; let PaymentType;
PaymentType = PaymentType =
@ -368,7 +382,7 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
'Bill' + 'Bill' +
'</u></b>\n'; '</u></b>\n';
// BRANCJ DETAILS // BRANCJ DETAILS
let BranchAddress; let BranchAddress;
// if (Otherservicesdetails1) { // if (Otherservicesdetails1) {
if ( if (
@ -390,8 +404,7 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
Otherservicesdetails1?.[0]?.Address1 !== null && Otherservicesdetails1?.[0]?.Address1 !== null &&
Otherservicesdetails1?.[0]?.Address1 !== undefined Otherservicesdetails1?.[0]?.Address1 !== undefined
) { ) {
BranchAddress = BranchAddress = '[C]' + Otherservicesdetails1?.[0]?.Address1 + '\n';
'[C]' + Otherservicesdetails1?.[0]?.Address1 + '\n';
} else { } else {
BranchAddress = ''; BranchAddress = '';
} }
@ -405,7 +418,8 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
Otherservicesdetails1?.[0]?.BrMobile !== undefined && Otherservicesdetails1?.[0]?.BrMobile !== undefined &&
Otherservicesdetails1?.[0]?.BrMobile !== '' Otherservicesdetails1?.[0]?.BrMobile !== ''
) { ) {
MobileNumber = '[C]<b>Ph:' + Otherservicesdetails1?.[0]?.BrMobileNo + '</b>\n'; MobileNumber =
'[C]<b>Ph:' + Otherservicesdetails1?.[0]?.BrMobileNo + '</b>\n';
} else { } else {
MobileNumber = ''; MobileNumber = '';
} }
@ -460,15 +474,15 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
// VATHeader + // VATHeader +
// VATBreakup.join('') + // VATBreakup.join('') +
// GstdetailsLines + // GstdetailsLines +
"[C]<b><font size='normal'>" + "[C]<b><font size='normal'>" +
'Bill Amt: ' + 'Bill Amt: ' +
parseFloat(Otherservicesdetails1?.[0]?.BillAmount).toFixed(2) + parseFloat(Otherservicesdetails1?.[0]?.BillAmount).toFixed(2) +
'</font></b>\n' + '</font></b>\n' +
"[C]<b><font size='normal'>" + "[C]<b><font size='normal'>" +
'Tax: ' + 'Tax: ' +
parseFloat(Otherservicesdetails1?.[0]?.TaxAmount).toFixed(2) + parseFloat(Otherservicesdetails1?.[0]?.TaxAmount).toFixed(2) +
'</font></b>\n' + '</font></b>\n' +
"[C]<b><font size='normal'>" + "[C]<b><font size='normal'>" +
'Amount: ' + 'Amount: ' +
parseFloat(Otherservicesdetails1?.[0]?.NetAmount).toFixed(2) + parseFloat(Otherservicesdetails1?.[0]?.NetAmount).toFixed(2) +
'</font></b>\n' + '</font></b>\n' +
@ -519,7 +533,7 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
'ImgE' + 'ImgE' +
TypeCheck + TypeCheck +
'OthTypS' + 'OthTypS' +
"OtherService" + 'OtherService' +
'OthTypE' + 'OthTypE' +
'OthqrS' + 'OthqrS' +
UpiId + UpiId +
@ -547,6 +561,5 @@ OrderIdSales = PrintDetail?.find((a) => a.OrderType === 'S')?.OrderId
'HasFooterTextE' + 'HasFooterTextE' +
';end;'; ';end;';
} }
}; };
export default OtherServiceMobilePrint; export default OtherServiceMobilePrint;

11
src/Pages/BookingScreen/Components/BookingFunctionality/SplitPayment.jsx
View File

@ -1,11 +1,4 @@
import { import { useEffect, useRef, useState, useCallback, lazy } from 'react';
useEffect,
useRef,
useState,
useCallback,
lazy,
Suspense,
} from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import moment from 'moment'; import moment from 'moment';
import { Form, Radio } from 'antd'; import { Form, Radio } from 'antd';
@ -2173,7 +2166,6 @@ const SplitPayment = (props) => {
} }
return ( return (
<Suspense fallback={<div>Loading...</div>}>
<> <>
<Messages messageType={messageType} messageData={messageData} /> <Messages messageType={messageType} messageData={messageData} />
<div className="splitmodal"> <div className="splitmodal">
@ -2366,7 +2358,6 @@ const SplitPayment = (props) => {
/> />
)} )}
</> </>
</Suspense>
); );
}; };
export default SplitPayment; export default SplitPayment;

3
src/Pages/BookingScreen/Components/UtillComponents/AllSalesPageSettings.jsx
View File

@ -20,6 +20,7 @@ const AllSalesPageSettings = () => {
<> <>
<TooltipWrapper> <TooltipWrapper>
<div <div
className="allpageSettingIcon"
onClick={() => setsettingModal(true)} onClick={() => setsettingModal(true)}
style={{ style={{
cursor: 'pointer', cursor: 'pointer',
@ -61,7 +62,7 @@ const AllSalesPageSettings = () => {
<div className="SettingsComponentDiv"> <div className="SettingsComponentDiv">
{selectedComponent == 'Payment' && ( {selectedComponent == 'Payment' && (
<div> <div>
<PaymentOptions setModalOpen={setsettingModal}/> <PaymentOptions setModalOpen={setsettingModal} />
</div> </div>
)} )}

2
src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
View File

@ -356,7 +356,7 @@ const BSLayout1 = () => {
{BookingNavbar != 'Navbar3' ? ( {BookingNavbar != 'Navbar3' ? (
<div <div
className="Layout-bill-container" className="Layout-bill-container"
style={{ marginTop: '9px' }} style={{ marginTop: '12px' }}
> >
<div <div
className="Layout-bill-Subcontainer" className="Layout-bill-Subcontainer"

2
src/Pages/BookingScreen/Template/BSLayout2/BSLayout2.jsx
View File

@ -342,9 +342,7 @@ const BSLayout2 = () => {
(AppExpDate?.RemainingDays <= 7 || (AppExpDate?.RemainingDays <= 7 ||
AppExpDate === 'undefined' || AppExpDate === 'undefined' ||
AppExpDate?.PlanType?.toLowerCase() === 'extend') && ( AppExpDate?.PlanType?.toLowerCase() === 'extend') && (
<Suspense fallback={<NavbarSkeleton />}>
<PlanExpireNotification /> <PlanExpireNotification />
</Suspense>
)} )}
<div <div
className="BSLayout2-Master" className="BSLayout2-Master"

13
src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx
View File

@ -75,6 +75,7 @@ import {
StoredSessionData, StoredSessionData,
} from '../../../../Features/ThemeChange/ThemeChange.js'; } from '../../../../Features/ThemeChange/ThemeChange.js';
import './../../../../Styles/BookingScreen/Template/BSLayout7/Combo1.scss'; import './../../../../Styles/BookingScreen/Template/BSLayout7/Combo1.scss';
import '../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss';
import { import {
GLobalSadminUserPin, GLobalSadminUserPin,
putSadminUserExit, putSadminUserExit,
@ -124,6 +125,7 @@ const VerfiedProducts = lazy(
); );
import ShortcutKeyHelper from '../../Components/UtillComponents/ShortcutKeyHelper.jsx'; import ShortcutKeyHelper from '../../Components/UtillComponents/ShortcutKeyHelper.jsx';
import PlanExpireNotification from '../PlanExpireNotification.jsx'; import PlanExpireNotification from '../PlanExpireNotification.jsx';
import CardSkeleton from '../../../../Components/Skeleton/CardSkeleton.jsx';
const subDirectory = import.meta.env.BASE_URL; const subDirectory = import.meta.env.BASE_URL;
const commonDirectory = import.meta.env.COMMON_BASE_URL; const commonDirectory = import.meta.env.COMMON_BASE_URL;
@ -361,7 +363,7 @@ export default function BSCombo1() {
handleClick(); handleClick();
}, []); }, []);
return ( return (
<Suspense fallback={<div>Loading...</div>}> <Suspense fallback={<CardSkeleton />}>
<> <>
<Messages <Messages
messageType={messageType} messageType={messageType}
@ -381,6 +383,7 @@ export default function BSCombo1() {
<div className="SearchSubnavbar-combo"> <div className="SearchSubnavbar-combo">
<BSC1NavBar /> <BSC1NavBar />
<div className="comboNavbarSubMain"> <div className="comboNavbarSubMain">
<div className="SearchNavMutiple">
{/* Multiple search */} {/* Multiple search */}
<Tooltip title={'Multiple Search'}> <Tooltip title={'Multiple Search'}>
<div className="MultiSearchIconDiv"> <div className="MultiSearchIconDiv">
@ -416,6 +419,7 @@ export default function BSCombo1() {
</div> </div>
</Tooltip> </Tooltip>
)} )}
</div>
{/* <div className="Layout-bill-container" style={{ margin: '0' }}> */} {/* <div className="Layout-bill-container" style={{ margin: '0' }}> */}
<div className="Layout-bill-Subcontainer ComboSubNavbar"> <div className="Layout-bill-Subcontainer ComboSubNavbar">
@ -576,24 +580,17 @@ export default function BSCombo1() {
</div> </div>
)} )}
</div> </div>
{/* {preferenceshortcutkey && (
<div className="keyboardShortcut">
<ShortcutKeyHelper />
</div>)} */}
</div> </div>
</div> </div>
{/* </div> */}
</div> </div>
</div> </div>
<div <div
// className="BSC1-Master" comment by sree here this class name issues
className="ComboScreenPageTable" className="ComboScreenPageTable"
style={{ style={{
height: isMobile ? '56vh' : '70vh', height: isMobile ? '56vh' : '70vh',
overflow: 'hidden', overflow: 'hidden',
}} }}
> >
{/* <div className="BS1ComboTable"> */}
<div <div
className={ className={
ComboSalesBillTable ComboSalesBillTable

23
src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
View File

@ -1,12 +1,4 @@
import { import { useEffect, useState, useMemo, useCallback, lazy } from 'react';
useEffect,
useState,
useMemo,
useCallback,
lazy,
Suspense,
useRef,
} from 'react';
import { useSelector, useDispatch } from 'react-redux'; import { useSelector, useDispatch } from 'react-redux';
import { FaChartLine, FaRupeeSign } from 'react-icons/fa'; import { FaChartLine, FaRupeeSign } from 'react-icons/fa';
import { Badge, Popconfirm, Tooltip } from 'antd'; import { Badge, Popconfirm, Tooltip } from 'antd';
@ -16,7 +8,6 @@ import {
getCardDataWithoutSub, getCardDataWithoutSub,
getCardDataWithoutSubmodule, getCardDataWithoutSubmodule,
getLayoutproductCard, getLayoutproductCard,
getPreferenceData,
getSelectedFavItems, getSelectedFavItems,
GlobalOrderStatus, GlobalOrderStatus,
GlobalOtherSevices, GlobalOtherSevices,
@ -588,7 +579,6 @@ const SalesCountForStandard = React.memo(() => {
}; };
return ( return (
<Suspense fallback={<div>Loading...</div>}>
<div className="NewLayoutBillContainer"> <div className="NewLayoutBillContainer">
<Messages <Messages
messageType={messageType} messageType={messageType}
@ -921,8 +911,7 @@ const SalesCountForStandard = React.memo(() => {
<tr <tr
key={item.OrderId} key={item.OrderId}
style={{ style={{
backgroundColor: backgroundColor: index % 2 === 0 ? '#f7faff' : '#e9f1ff',
index % 2 === 0 ? '#f7faff' : '#e9f1ff',
textAlign: 'center', textAlign: 'center',
transition: 'background 0.3s', transition: 'background 0.3s',
}} }}
@ -1154,8 +1143,7 @@ const SalesCountForStandard = React.memo(() => {
<tr <tr
key={index} key={index}
style={{ style={{
backgroundColor: backgroundColor: index % 2 === 0 ? '#f7faff' : '#ffffff',
index % 2 === 0 ? '#f7faff' : '#ffffff',
transition: 'background 0.3s', transition: 'background 0.3s',
}} }}
onMouseEnter={(e) => onMouseEnter={(e) =>
@ -1291,9 +1279,7 @@ const SalesCountForStandard = React.memo(() => {
onClose={handleModalCancel} onClose={handleModalCancel}
productDetails={modalProductDetails} productDetails={modalProductDetails}
headerData={{ headerData={{
dateTime: dateFormatChange1( dateTime: dateFormatChange1(TableData?.[SelectedIndex]?.CreatedDate),
TableData?.[SelectedIndex]?.CreatedDate
),
fromBranch: TableData?.[SelectedIndex]?.FromBranchName, fromBranch: TableData?.[SelectedIndex]?.FromBranchName,
Dispatch_Id: TableData?.[SelectedIndex]?.DispatchId, Dispatch_Id: TableData?.[SelectedIndex]?.DispatchId,
Created_By: TableData?.[SelectedIndex]?.Created_By, Created_By: TableData?.[SelectedIndex]?.Created_By,
@ -1302,7 +1288,6 @@ const SalesCountForStandard = React.memo(() => {
onSubmit={handleModalSubmit} onSubmit={handleModalSubmit}
/> />
</div> </div>
</Suspense>
); );
}); });

28
src/Pages/DashBoard/RetailDashboard.jsx
View File

@ -1,32 +1,20 @@
import { import { useCallback, useEffect, useRef, useState, lazy } from 'react';
useCallback,
useEffect,
useRef,
useState,
lazy,
Suspense,
} from 'react';
import { useNavigate, useOutletContext } from 'react-router-dom'; import { useNavigate, useOutletContext } from 'react-router-dom';
import { shallowEqual, useDispatch } from 'react-redux'; import { shallowEqual, useDispatch } from 'react-redux';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { DatePicker, Tooltip } from 'antd'; import { DatePicker, Tooltip } from 'antd';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import '../../Styles/DashBoard/RetailDashBoard.scss'; import '../../Styles/DashBoard/RetailDashBoard.scss';
const GraphChart = lazy(() => import('./Chart/GraphChart')); const GraphChart = lazy(() => import('./Chart/GraphChart'));
const TopSellingProductsChart = lazy( const TopSellingProductsChart = lazy(
() => import('./TopSellingProductsChart.jsx') () => import('./TopSellingProductsChart.jsx')
); );
import sandClock from '../../Images/sandClock.webp'; import sandClock from '../../Images/sandClock.webp';
import Add from '../../Images/dashboard/Add.webp'; import Add from '../../Images/dashboard/Add.webp';
import AddPurchase from '../../Images/dashboard/AddPurchase.webp'; import AddPurchase from '../../Images/dashboard/AddPurchase.webp';
import invoice from '../../Images/dashboard/invoice.webp'; import invoice from '../../Images/dashboard/invoice.webp';
import user from '../../Images/dashboard/user.webp'; import user from '../../Images/dashboard/user.webp';
import report from '../../Images/dashboard/report.webp'; import report from '../../Images/dashboard/report.webp';
import { import {
GlobalPricingAppPricingName, GlobalPricingAppPricingName,
StoredSessionData, StoredSessionData,
@ -78,13 +66,11 @@ const DefaultModal = lazy(() =>
default: m.DefaultModal, default: m.DefaultModal,
})) }))
); );
const RadioGrpButton = lazy(() => const RadioGrpButton = lazy(() =>
import('../../Components/Forms/RadioGroup.jsx').then((m) => ({ import('../../Components/Forms/RadioGroup.jsx').then((m) => ({
default: m.RadioGrpButton, default: m.RadioGrpButton,
})) }))
); );
const DropDowns = lazy(() => const DropDowns = lazy(() =>
import('../../Components/Forms/DropDown.jsx').then((m) => ({ import('../../Components/Forms/DropDown.jsx').then((m) => ({
default: m.DropDowns, default: m.DropDowns,
@ -1436,7 +1422,6 @@ const RetailDashboard = () => {
?.toUpperCase()} ?.toUpperCase()}
</div> </div>
{userprofile && ( {userprofile && (
<Suspense fallback={null}>
<BSNavBarUserInfo <BSNavBarUserInfo
isOpen={userprofile} isOpen={userprofile}
divRef={userProfileRef} divRef={userProfileRef}
@ -1447,7 +1432,6 @@ const RetailDashboard = () => {
}} }}
Logout={Logout} Logout={Logout}
/> />
</Suspense>
)} )}
</div> </div>
</div> </div>
@ -1464,7 +1448,6 @@ const RetailDashboard = () => {
{/* Branch Filter Dropdown */} {/* Branch Filter Dropdown */}
{CompBranchData?.length > 1 && selection !== 'top-selling-products' && ( {CompBranchData?.length > 1 && selection !== 'top-selling-products' && (
<div className="branch-filter-dropdown"> <div className="branch-filter-dropdown">
<Suspense fallback={<div>Loading...</div>}>
<DropDowns <DropDowns
options={[ options={[
{ value: 'all', label: 'All Branches' }, { value: 'all', label: 'All Branches' },
@ -1479,7 +1462,6 @@ const RetailDashboard = () => {
defaultValue="all" defaultValue="all"
placeholder="All Branches" placeholder="All Branches"
/> />
</Suspense>
</div> </div>
)} )}
@ -1500,9 +1482,7 @@ const RetailDashboard = () => {
<div className="TotalRevenue"> <div className="TotalRevenue">
<div className="tlxHeader"></div> <div className="tlxHeader"></div>
<div className="TotalRevenue-Graph"> <div className="TotalRevenue-Graph">
<Suspense fallback={<Loader />}>
<GraphChart datasets={datasets} /> <GraphChart datasets={datasets} />
</Suspense>
</div> </div>
</div> </div>
@ -2375,7 +2355,6 @@ const RetailDashboard = () => {
</> </>
) : ( ) : (
<> <>
<Suspense fallback={<Loader />}>
<TopSellingProductsChart <TopSellingProductsChart
dates={dates} dates={dates}
products={products} products={products}
@ -2386,10 +2365,8 @@ const RetailDashboard = () => {
fetchProducts={fetchProducts} fetchProducts={fetchProducts}
initialDate={initialDate} initialDate={initialDate}
/> />
</Suspense>
</> </>
)} )}
<Suspense fallback={null}>
<DefaultModal <DefaultModal
open={modal} open={modal}
title="Authentication" title="Authentication"
@ -2413,7 +2390,6 @@ const RetailDashboard = () => {
/> />
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div className="RadioButton"> <div className="RadioButton">
<Suspense fallback={<div>Loading...</div>}>
<RadioGrpButton <RadioGrpButton
content={[ content={[
{ value: 'O', label: 'OTP' }, { value: 'O', label: 'OTP' },
@ -2423,7 +2399,6 @@ const RetailDashboard = () => {
defaultSelect={SelectType} defaultSelect={SelectType}
onSelectFuntion={(e) => ChangeMethod(e)} onSelectFuntion={(e) => ChangeMethod(e)}
/> />
</Suspense>
</div> </div>
</div> </div>
@ -2478,7 +2453,6 @@ const RetailDashboard = () => {
</div> </div>
</> </>
</DefaultModal> </DefaultModal>
</Suspense>
</div> </div>
); );
}; };

2
src/Pages/DashBoard/TopSellingProductsChart.jsx
View File

@ -341,7 +341,6 @@ const TopSellingProducts = ({
</div> </div>
</div> </div>
<Suspense fallback={<div>Loading...</div>}>
<DropDowns <DropDowns
className={'item-range-dropdown'} className={'item-range-dropdown'}
valueData={page} valueData={page}
@ -364,7 +363,6 @@ const TopSellingProducts = ({
}} }}
isOnchanges={page ? true : false} isOnchanges={page ? true : false}
/> />
</Suspense>
</div> </div>
</div> </div>

34
src/Pages/StockMaster/StockForm.jsx
View File

@ -13,7 +13,15 @@ import {
PlusCircleOutlined, PlusCircleOutlined,
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import { Form, Tooltip, Table, Input, AutoComplete, Switch, Checkbox } from 'antd'; import {
Form,
Tooltip,
Table,
Input,
AutoComplete,
Switch,
Checkbox,
} from 'antd';
import { IoAddCircleSharp } from 'react-icons/io5'; import { IoAddCircleSharp } from 'react-icons/io5';
import { InputField } from '../../Components/Forms/InputField.jsx'; import { InputField } from '../../Components/Forms/InputField.jsx';
import Buttons from '../../Components/Forms/Buttons.jsx'; import Buttons from '../../Components/Forms/Buttons.jsx';
@ -39,7 +47,7 @@ import {
putStockData, putStockData,
} from '../../Features/StockMaster/StockMaster.js'; } from '../../Features/StockMaster/StockMaster.js';
import '../../Styles/Stock/StockMaster.scss'; import '../../Styles/Stock/StockMaster.scss';
import "../../Styles/OverAllStyle/OverAllStyle.scss" import '../../Styles/OverAllStyle/OverAllStyle.scss';
import { import {
getAdmin, getAdmin,
getUomData, getUomData,
@ -708,7 +716,10 @@ const StockForm = ({ formType }) => {
})); }));
const bulkResponse = await dispatch( const bulkResponse = await dispatch(
bulkpostdata({ UploadType: 'Purchase', ProdDetails: newProductsData }) bulkpostdata({
UploadType: 'Purchase',
ProdDetails: newProductsData,
})
).unwrap(); ).unwrap();
if (bulkResponse?.data?.statusCode === 1) { if (bulkResponse?.data?.statusCode === 1) {
@ -3437,11 +3448,12 @@ const StockForm = ({ formType }) => {
/> />
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
{orderType && <Form.Item {orderType && (
name="showAll" <Form.Item name="showAll" valuePropName="checked">
valuePropName="checked" <Tooltip
title="Show all branches and warehouses"
placement="top"
> >
<Tooltip title="Show all branches and warehouses" placement="top">
<span> <span>
<Checkbox <Checkbox
checked={showAllSuppliers} checked={showAllSuppliers}
@ -3449,7 +3461,9 @@ const StockForm = ({ formType }) => {
const checked = e.target.checked; const checked = e.target.checked;
setShowAllSuppliers(checked); setShowAllSuppliers(checked);
setInitialLoad(true); setInitialLoad(true);
getSuplaierApi({ Type: checked ? 'Y' : null }); getSuplaierApi({
Type: checked ? 'Y' : null,
});
}} }}
> >
All All
@ -3457,12 +3471,11 @@ const StockForm = ({ formType }) => {
</span> </span>
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
} )}
</div> </div>
{!selectedSupplierName && ( {!selectedSupplierName && (
<RadioGrpButton <RadioGrpButton
content={[ content={[
{ value: 'own', label: 'Own' }, { value: 'own', label: 'Own' },
{ value: 'paid', label: 'With paid' }, { value: 'paid', label: 'With paid' },
@ -3474,7 +3487,6 @@ const StockForm = ({ formType }) => {
/> />
)} )}
<div className="pe-inward-date"> <div className="pe-inward-date">
<label className="required">Inward Date</label> <label className="required">Inward Date</label>

15
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.scss
View File

@ -3,11 +3,10 @@
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
gap: 0.5rem; gap: 0.5rem;
font-family: 'Poppins'; font-family: "Poppins";
.ant-form{ .ant-form {
line-height: 2.3 !important; line-height: 2.3 !important;
} }
} }
.EditQuantity-Itemname { .EditQuantity-Itemname {
display: flex; display: flex;
@ -21,14 +20,11 @@
.EditQuantity-headingname { .EditQuantity-headingname {
display: flex; display: flex;
align-items: center; align-items: center;
// width: 20rem;
} }
.EditQuantity-headingproductname { .EditQuantity-headingproductname {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
// padding: 1rem;
// width: 25rem;
} }
.EditQuantity-title { .EditQuantity-title {
.formHeader { .formHeader {
@ -52,7 +48,6 @@
} }
.gridEQitem { .gridEQitem {
background-color: rgba(255, 255, 255, 0.8); background-color: rgba(255, 255, 255, 0.8);
// border: 1px solid rgba(0, 0, 0, 0.8);
padding: 5px; padding: 5px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
@ -70,13 +65,11 @@
.grid-item-add { .grid-item-add {
background-color: var(--SELECTED_COLOR); background-color: var(--SELECTED_COLOR);
color: #e1eef1; color: #e1eef1;
// border: 1px solid rgba(0, 0, 0, 0.8);
padding: 8px 5px 5px 5px; padding: 8px 5px 5px 5px;
font-size: 23px; font-size: 23px;
text-align: center; text-align: center;
border-radius: 25px; border-radius: 25px;
margin: 6px; margin: 6px;
// margin-left: 10px;
} }
.EditQuantity-mealicon { .EditQuantity-mealicon {
color: #0268ba; color: #0268ba;
@ -195,7 +188,7 @@
border-radius: 4.982px; border-radius: 4.982px;
padding: 5px 6px; padding: 5px 6px;
height: 2rem; height: 2rem;
font-family: 'Poppins'; font-family: "Poppins";
} }
.SelecBtn { .SelecBtn {
background-color: var(--SELECTED_COLOR); background-color: var(--SELECTED_COLOR);
@ -210,7 +203,7 @@
border-radius: 4.982px; border-radius: 4.982px;
padding: 5px 6px; padding: 5px 6px;
height: 2rem; height: 2rem;
font-family: 'Poppins'; font-family: "Poppins";
} }
.RadioButtons { .RadioButtons {
display: flex; display: flex;

40
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
View File

@ -69,7 +69,7 @@ input::-webkit-inner-spin-button {
.price-button { .price-button {
border-radius: 8px; border-radius: 8px;
border: 0px solid none; border: none;
font-size: 24px; font-size: 24px;
font-weight: 600; font-weight: 600;
background-color: var(--SELECTED_COLOR); background-color: var(--SELECTED_COLOR);
@ -78,6 +78,7 @@ input::-webkit-inner-spin-button {
width: max-content; width: max-content;
padding: 0px 12px; padding: 0px 12px;
cursor: pointer; cursor: pointer;
height: 40px;
} }
.price-button-disabled { .price-button-disabled {
@ -143,7 +144,7 @@ input::-webkit-inner-spin-button {
justify-content: center; justify-content: center;
gap: 0.2rem; gap: 0.2rem;
background-color: #dbdbdb; background-color: #dbdbdb;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
} }
.payment-div-0-userplus { .payment-div-0-userplus {
@ -238,3 +239,38 @@ input::-webkit-inner-spin-button {
.ChairClrGreen { .ChairClrGreen {
color: var(--SELECTED_COLOR); color: var(--SELECTED_COLOR);
} }
.Btn-payment-mode-sel {
background-color: var(--DEFAULT_SELECTED_COLOR);
font-size: 14px;
font-weight: 500;
height: 40px;
width: 75px;
border-radius: 7.2px;
color: #fff;
padding: 3px;
display: flex;
gap: 0.2rem;
align-items: center;
font-family: "Poppins";
justify-content: center;
cursor: pointer;
text-transform: capitalize;
}
.Btn-payment-mode {
background-color: var(--SELECTED_COLOR);
font-size: 14px;
font-weight: 500;
height: 40px;
width: 75px;
border-radius: 7.2px;
color: #fff;
padding: 3px;
display: flex;
gap: 0.2rem;
align-items: center;
font-family: "Poppins";
justify-content: center;
cursor: pointer;
text-transform: capitalize;
}

4
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBillingTable4.scss
View File

@ -89,7 +89,7 @@
.BSBill-Table4 th { .BSBill-Table4 th {
border-spacing: 0; border-spacing: 0;
text-align: center; text-align: center;
font-size: 16px; font-size: 14px;
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
line-height: normal; line-height: normal;
@ -277,6 +277,8 @@
background: var(--SELECTED_COLOR); background: var(--SELECTED_COLOR);
text-align: center; text-align: center;
border: 0; border: 0;
color: #fff;
cursor: pointer;
} }
.Table4-Btn-final-price-disabled { .Table4-Btn-final-price-disabled {

52
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable15.scss
View File

@ -5,24 +5,12 @@
background-color: #fff; background-color: #fff;
width: inherit; width: inherit;
overflow: auto; overflow: auto;
// height: clamp(70vh, 50vh, 40vh);
// height: 85vh;
//vm
height: 80vh; height: 80vh;
} }
.BSBillingTable5-table-master-div-6 { .BSBillingTable5-table-master-div-6 {
//vm
height: 70vh; height: 70vh;
} }
// .BSLayout5-Master .BSBillingTable5-table-master-div {
// height: 91vh !important;
// }
// .BSLayout5-Master .BSBilling4TableCont-default {
// height: 93vh;
// }
.BSLayout5-Master .AddFavList { .BSLayout5-Master .AddFavList {
left: 0; left: 0;
height: 95vh; height: 95vh;
@ -46,11 +34,6 @@
justify-items: center; justify-items: center;
} }
.BSBillingTable5-billtable {
// height:100Vh;
// overflow: auto;
}
.BSC1-Master .BSBillingTable5-billtable { .BSC1-Master .BSBillingTable5-billtable {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
@ -66,7 +49,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
// margin-bottom: 10px;
} }
.BSBillingTable-title { .BSBillingTable-title {
@ -108,7 +90,6 @@
} }
.BSBillingTable5-table-td { .BSBillingTable5-table-td {
// border: 1px solid #dddddd;
border-bottom: 1.9px dashed #000; border-bottom: 1.9px dashed #000;
text-align: left; text-align: left;
padding: 8px; padding: 8px;
@ -119,7 +100,6 @@
} }
.BSBillingTable5-table-th { .BSBillingTable5-table-th {
// border: 1px solid #dddddd;
border-bottom: 1.9px solid #000; border-bottom: 1.9px solid #000;
padding: 10px; padding: 10px;
text-align: center; text-align: center;
@ -130,25 +110,23 @@
} }
.BSBillingTable5-table-notes { .BSBillingTable5-table-notes {
font-size: '14px'; font-size: "14px";
font-weight: 500; font-weight: 500;
} }
.BSBillingTable5-table-cont { .BSBillingTable5-table-cont {
text-align: left; text-align: left;
line-height: 1.5; line-height: 1.5;
font-size: 15px; font-size: 14px;
} }
.BSBillingTable5-table-sub-td { .BSBillingTable5-table-sub-td {
// display: flex;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #52c41a; color: #52c41a;
} }
.BSBillingTable5-table-tr:nth-child(even) { .BSBillingTable5-table-tr:nth-child(even) {
// background-color: #dddddd;
text-align: center; text-align: center;
} }
@ -751,32 +729,6 @@ select:focus-visible {
} }
} }
/* For screens between 768px and 991px (e.g., tablets) */
// @media (min-width: 768px) and (max-width: 991px) {
// .BSBillingTable-oCbtn {
// position: fixed !important;
// z-index: 1;
// }
// .BSBillingTable5-billtable,{
// display: none !important;
// }
// .BSLayout2-bSlayer {
// position: fixed;
// right: 0;
// }
// .BSBIllingTable5-mobscrn {
// position: fixed;
// bottom: 0;
// height: 6rem;
// // width: 100%;
// background-color: #fff;
// }
// }
/* For screens larger than 992px (e.g., desktops) */
@media (min-width: 991px) and (max-width: 1364px) { @media (min-width: 991px) and (max-width: 1364px) {
.BSBillingTable-oCbtn { .BSBillingTable-oCbtn {
position: fixed !important; position: fixed !important;

37
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
View File

@ -15,7 +15,7 @@ input::-webkit-inner-spin-button {
letter-spacing: 0em; letter-spacing: 0em;
text-align: center; text-align: center;
border: none; border: none;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
} }
.BST6Payment-Button-pay { .BST6Payment-Button-pay {
@ -29,7 +29,7 @@ input::-webkit-inner-spin-button {
text-align: center; text-align: center;
border: none; border: none;
cursor: pointer; cursor: pointer;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
} }
.BST6Payment-Button-pay-disabled { .BST6Payment-Button-pay-disabled {
@ -43,7 +43,7 @@ input::-webkit-inner-spin-button {
text-align: center; text-align: center;
border: none; border: none;
cursor: pointer; cursor: pointer;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
pointer-events: none; pointer-events: none;
opacity: 0.5; opacity: 0.5;
} }
@ -64,7 +64,7 @@ input::-webkit-inner-spin-button {
font-weight: 600; font-weight: 600;
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
} }
.BST6Payment-Button-RECIEVED { .BST6Payment-Button-RECIEVED {
@ -73,7 +73,7 @@ input::-webkit-inner-spin-button {
border-radius: 8.3px; border-radius: 8.3px;
border: 0.83px solid #8e8e8e; border: 0.83px solid #8e8e8e;
font-size: 12px; font-size: 12px;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
text-align: center; text-align: center;
} }
@ -83,7 +83,7 @@ input::-webkit-inner-spin-button {
border-radius: 8.3px; border-radius: 8.3px;
border: 0.83px solid #ff4d4f; border: 0.83px solid #ff4d4f;
font-size: 12px; font-size: 12px;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
text-align: center; text-align: center;
} }
@ -97,7 +97,7 @@ input::-webkit-inner-spin-button {
border-radius: 8.3px; border-radius: 8.3px;
border: 0.83px solid #8e8e8e; border: 0.83px solid #8e8e8e;
font-size: 12px; font-size: 12px;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
text-align: center; text-align: center;
} }
@ -123,9 +123,6 @@ input::-webkit-inner-spin-button {
flex-direction: row; flex-direction: row;
gap: 2rem; gap: 2rem;
align-items: center; align-items: center;
// margin-bottom: 15px;
// padding-right: 10px;
// align-items: center;
} }
.BST6Payment-Paydiv { .BST6Payment-Paydiv {
@ -176,7 +173,7 @@ input::-webkit-inner-spin-button {
display: flex; display: flex;
gap: 0.2rem; gap: 0.2rem;
align-items: center; align-items: center;
font-family: 'Poppins'; font-family: "Poppins";
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
text-transform: capitalize; text-transform: capitalize;
@ -207,19 +204,22 @@ input::-webkit-inner-spin-button {
.Btn-payment-mode { .Btn-payment-mode {
background-color: var(--SELECTED_COLOR); background-color: var(--SELECTED_COLOR);
font-size: 14px; font-size: 13px !important;
font-weight: 500; font-weight: 500;
height: 40px; height: 40px;
width: 100px; flex-grow: 1;
flex: 1;
width: max-content !important;
border-radius: 7.2px; border-radius: 7.2px;
color: #fff; color: #fff;
padding: 3px; padding: 3px;
display: flex; display: flex;
gap: 0.2rem; gap: 0.2rem;
align-items: center; align-items: center;
font-family: 'Poppins'; font-family: "Poppins";
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
border: none;
text-transform: capitalize; text-transform: capitalize;
@media (max-width: 992px) { @media (max-width: 992px) {
font-size: 11px; font-size: 11px;
@ -240,20 +240,23 @@ input::-webkit-inner-spin-button {
.Btn-payment-mode-sel { .Btn-payment-mode-sel {
background-color: var(--DEFAULT_SELECTED_COLOR); background-color: var(--DEFAULT_SELECTED_COLOR);
font-size: 14px; font-size: 13px !important;
font-weight: 500; font-weight: 500;
height: 40px; height: 40px;
width: 100px; width: max-content !important;
flex: 1;
flex-grow: 1;
border-radius: 7.2px; border-radius: 7.2px;
color: #fff; color: #fff;
padding: 3px; padding: 3px;
display: flex; display: flex;
gap: 0.2rem; gap: 0.2rem;
align-items: center; align-items: center;
font-family: 'Poppins'; font-family: "Poppins";
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
text-transform: capitalize; text-transform: capitalize;
border: none;
@media (max-width: 992px) { @media (max-width: 992px) {
font-size: 11px; font-size: 11px;
height: 35px; height: 35px;

40
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBillingTable7.scss
View File

@ -13,7 +13,7 @@
// height: 90%; // height: 90%;
} }
.BSTable3_overall-6 { .BSTable3_overall-6 {
height: 71vh ; height: 71vh;
} }
.BSBill-Table7 { .BSBill-Table7 {
@ -45,11 +45,8 @@
.BSBill-Table7 th { .BSBill-Table7 th {
position: sticky; position: sticky;
border-spacing: 0; border-spacing: 0;
// color: black;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
@ -59,10 +56,9 @@
.BSBill-Table7-content { .BSBill-Table7-content {
background-color: rgba(235, 235, 236, 1); background-color: rgba(235, 235, 236, 1);
height: 3rem; height: 3rem;
font-size: 13px;
font-size: 14px;
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 500;
} }
.BSBill-Table7-content-disabled { .BSBill-Table7-content-disabled {
@ -164,9 +160,7 @@
margin: 10px 10px; margin: 10px 10px;
} }
.Table7-customer .Table7-customer .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
.ant-select-single:not(.ant-select-customize-input)
.ant-select-selector {
width: 10rem; width: 10rem;
height: 3rem; height: 3rem;
text-align: center; text-align: center;
@ -178,9 +172,7 @@
font-weight: 600; font-weight: 600;
} }
.Table7-customer .Table7-customer .ant-select-single.ant-select-show-arrow .ant-select-selection-placeholder {
.ant-select-single.ant-select-show-arrow
.ant-select-selection-placeholder {
color: #000; color: #000;
padding-inline-end: 0px !important; padding-inline-end: 0px !important;
} }
@ -274,14 +266,12 @@
} }
.BSBill-Table7 th { .BSBill-Table7 th {
// font-weight: 400 !important;
padding: 2px; padding: 2px;
} }
.BSBill-Table7-content { .BSBill-Table7-content {
font-size: 14px; font-size: 14px;
font-style: normal; font-style: normal;
// font-weight: 400;
} }
.Table7-items { .Table7-items {
@ -327,7 +317,7 @@
.Table7-rate { .Table7-rate {
display: flex; display: flex;
font-family: 'Poppins', sans-serif; font-family: "Poppins", sans-serif;
font-size: 32.203px; font-size: 32.203px;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
@ -347,7 +337,6 @@
.icon-button { .icon-button {
height: 30px; height: 30px;
// width:30px;
border-radius: 30px; border-radius: 30px;
padding: 0px; padding: 0px;
margin: 6px 6px; margin: 6px 6px;
@ -401,11 +390,11 @@
.BSBilling7-icon-flex { .BSBilling7-icon-flex {
display: flex; display: flex;
align-items: center; align-items: center;
div{ div {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
svg{ svg {
margin-top: -7px; margin-top: -7px;
} }
} }
@ -419,13 +408,9 @@
.BSBilling7-vertical-line { .BSBilling7-vertical-line {
width: 1px; width: 1px;
/* Adjust the width as needed */
height: 100%; height: 100%;
/* This will make the line span the entire height of its container */
background-color: #000; background-color: #000;
/* Change the background color to your desired color */
margin: 0 10px; margin: 0 10px;
/* Adjust margin as needed to position the line */
} }
hr.Table7-Dotted-Line1 { hr.Table7-Dotted-Line1 {
@ -478,7 +463,6 @@ hr.Table7-Dotted-Line1 {
} }
.edit-btn-table:focus { .edit-btn-table:focus {
// background-color: #ffdb3a;
background-color: #fff; background-color: #fff;
color: var(--SELECTED_COLOR) !important; color: var(--SELECTED_COLOR) !important;
border: solid 1px var(--SELECTED_COLOR); border: solid 1px var(--SELECTED_COLOR);
@ -514,10 +498,6 @@ hr.Table7-Dotted-Line1 {
justify-content: flex-end; justify-content: flex-end;
} }
.radio-button-group .item {
// width: 100%;
}
.radio-button-group .radio-button { .radio-button-group .radio-button {
position: absolute; position: absolute;
width: 1px; width: 1px;
@ -528,16 +508,14 @@ hr.Table7-Dotted-Line1 {
.radio-button-group .radio-button + label { .radio-button-group .radio-button + label {
padding: 4px 10px; padding: 4px 10px;
cursor: pointer; cursor: pointer;
// border: 1px solid #CCC;
border: none; border: none;
margin-right: -2px; margin-right: -2px;
color: #ffffff; color: #ffffff;
background-color: var(--DEFAULT_SELECTED_COLOR); background-color: var(--DEFAULT_SELECTED_COLOR);
font-family: 'gilroy'; font-family: "gilroy";
font-size: 13px; font-size: 13px;
font-weight: 600; font-weight: 600;
display: block; display: block;
// text-transform: uppercase;
text-align: center; text-align: center;
} }

2
src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
View File

@ -123,6 +123,8 @@
align-items: center; align-items: center;
border: none; border: none;
column-gap: 0rem; column-gap: 0rem;
width: max-content;
height: 2rem;
border-radius: 4.982px; border-radius: 4.982px;
padding: 5px 6px; padding: 5px 6px;
height: 2rem; height: 2rem;

72
src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss
View File

@ -37,7 +37,6 @@
text-align: center; text-align: center;
} }
.BSItemCard-master-container { .BSItemCard-master-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -99,7 +98,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.BSItemCard-itemPrice { .BSItemCard-itemPrice {
color: #52c41a; color: #52c41a;
@ -163,7 +162,6 @@
column-gap: 0.3rem; column-gap: 0.3rem;
row-gap: 0.5rem; row-gap: 0.5rem;
cursor: pointer; cursor: pointer;
// vicky
justify-content: space-around; justify-content: space-around;
} }
@ -241,7 +239,6 @@
column-gap: 0.5rem !important; column-gap: 0.5rem !important;
} }
.ant-modal .ant-modal-content { .ant-modal .ant-modal-content {
padding: 1rem !important; padding: 1rem !important;
} }
@ -269,12 +266,9 @@
.BSItemCard-itemPrice { .BSItemCard-itemPrice {
font-size: 9px !important; font-size: 9px !important;
//nk
width: 60px !important; width: 60px !important;
//
} }
//nk
.qtyUomName-itemCard { .qtyUomName-itemCard {
width: 78px !important; width: 78px !important;
} }
@ -315,9 +309,7 @@
.BSItemCard-master-container { .BSItemCard-master-container {
padding: 0px 0px; padding: 0px 0px;
justify-content: center !important; justify-content: center !important;
// padding-bottom: 10rem !important;
padding-bottom: 1rem !important; padding-bottom: 1rem !important;
// column-gap: 0.1rem !important;
} }
.BSItemCard-container { .BSItemCard-container {
@ -343,12 +335,10 @@
.bs-item-card-masterdiv { .bs-item-card-masterdiv {
height: inherit; height: inherit;
} }
} }
@media (min-width: 500px) and (max-width: 767px) { @media (min-width: 500px) and (max-width: 767px) {
.bs-item-card-masterdiv { .bs-item-card-masterdiv {
// height: 77vh !important;
height: inherit; height: inherit;
} }
@ -362,7 +352,6 @@
@media (min-width: 280px) and (max-width: 499px) { @media (min-width: 280px) and (max-width: 499px) {
.bs-item-card-masterdiv { .bs-item-card-masterdiv {
// height: 60vh !important;
height: inherit; height: inherit;
} }
@ -373,7 +362,6 @@
} }
} }
.QRStockchange-table thead { .QRStockchange-table thead {
position: sticky; position: sticky;
top: 0; top: 0;
@ -405,9 +393,7 @@
} }
.BkPrdCardDeActive { .BkPrdCardDeActive {
// pointer-events: none;
border: 1px solid #f10000; border: 1px solid #f10000;
// border-radius: 8px;
.BSItemCard-container-smallimage { .BSItemCard-container-smallimage {
width: 10.9rem; width: 10.9rem;
} }
@ -440,7 +426,7 @@
padding: 1.8rem 0.5rem; padding: 1.8rem 0.5rem;
column-gap: 0.5rem; column-gap: 0.5rem;
row-gap: 1rem; row-gap: 1rem;
} }
.Brand-Card-modal-table::-webkit-scrollbar { .Brand-Card-modal-table::-webkit-scrollbar {
width: 10px !important; width: 10px !important;
@ -510,7 +496,6 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
column-gap: 0.1rem; column-gap: 0.1rem;
border-radius: 2px; border-radius: 2px;
} }
@ -520,19 +505,6 @@
font-family: "Gilroy"; font-family: "Gilroy";
text-align: center; text-align: center;
} }
//nk
.qtyUomName-itemCard {
font-size: 15px;
font-weight: 600;
font-family: "Gilroy";
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 105px;
}
.qtyprice { .qtyprice {
font-size: 16px; font-size: 16px;
background-color: var(--DEFAULT_SELECTED_COLOR); background-color: var(--DEFAULT_SELECTED_COLOR);
@ -547,6 +519,18 @@
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
} }
//nk
.qtyUomName-itemCard {
font-size: 15px;
font-weight: 600;
font-family: "Gilroy";
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 105px;
}
.Card-modal-table .ant-pagination { .Card-modal-table .ant-pagination {
position: sticky; position: sticky;
bottom: 0; bottom: 0;
@ -816,7 +800,6 @@
.Payment-loader1 { .Payment-loader1 {
.Payment-loader { .Payment-loader {
// column-gap: 1rem;
.contener_mixte { .contener_mixte {
top: 5px; top: 5px;
right: 12rem; right: 12rem;
@ -827,28 +810,26 @@
.EditQuantity-Master { .EditQuantity-Master {
.Re-Print-table { .Re-Print-table {
width: 100% !important; width: 100% !important;
scrollbar-width: none;
}
.ant-table-thead tr {
background-color: #1292ee !important;
} }
} }
.webkit-ul { .webkit-ul {
height: 35vh; height: 35vh;
overflow-y: auto; overflow-y: auto;
/* Firefox */
scrollbar-width: thin; scrollbar-width: thin;
/* Options: auto | thin | none */
scrollbar-color: #c1c1c1 transparent; scrollbar-color: #c1c1c1 transparent;
} }
/* WebKit Browsers: Chrome, Edge, Safari */
.webkit-ul::-webkit-scrollbar { .webkit-ul::-webkit-scrollbar {
width: 25px; width: 25px;
/* Adjust width as needed */
} }
.webkit-ul::-webkit-scrollbar-track { .webkit-ul::-webkit-scrollbar-track {
background: #f0f0f0; background: #f0f0f0;
/* Optional: add contrast to track */
border-radius: 10px; border-radius: 10px;
} }
@ -856,7 +837,6 @@
background-color: #c1c1c1; background-color: #c1c1c1;
border-radius: 10px; border-radius: 10px;
border: 6px solid transparent; border: 6px solid transparent;
/* Adjust for padding inside thumb */
background-clip: content-box; background-clip: content-box;
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
} }
@ -1108,21 +1088,12 @@
} }
.booked-text { .booked-text {
// color: #070;
color: rgb(241, 16, 16); color: rgb(241, 16, 16);
font-weight: 600; font-weight: 600;
cursor: not-allowed !important; cursor: not-allowed !important;
margin-top: 4px; margin-top: 4px;
} }
// .Available-text{
// color: rgb(41, 201, 41);
// font-weight: 600;
// cursor: not-allowed !important;
// margin-top: 4px;
// }
.slot-btn.incart { .slot-btn.incart {
background: #ffe066; background: #ffe066;
color: #222; color: #222;
@ -1687,10 +1658,6 @@
color: #ffffff; color: #ffffff;
border-color: #31a0f0; border-color: #31a0f0;
cursor: not-allowed; cursor: not-allowed;
// &:hover{
// color:#148498;
// background-color: #fff;
// }
} }
&.selected { &.selected {
@ -2254,11 +2221,9 @@
cursor: pointer; cursor: pointer;
height: 270px; height: 270px;
width: 195px; width: 195px;
// background-color: #fff;
border-radius: 0.75rem; border-radius: 0.75rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// justify-content: space-between;
margin-top: 10px; margin-top: 10px;
position: relative; position: relative;
border: 2px solid rgba(0, 0, 0, 0.3); border: 2px solid rgba(0, 0, 0, 0.3);
@ -2266,7 +2231,6 @@
.voiceToTextIcon { .voiceToTextIcon {
position: fixed; position: fixed;
// width: max-content;
top: 7px; top: 7px;
left: 10px; left: 10px;
display: flex; display: flex;

4
src/Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss
View File

@ -9,6 +9,10 @@
.RiVerifiedBadgeFill { .RiVerifiedBadgeFill {
color: #1292ee !important; color: #1292ee !important;
} }
.FaparkingIcon {
width: 32px !important;
height: 32px !important;
}
} }
.BSBillingNav2div2 { .BSBillingNav2div2 {

1
src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
View File

@ -305,6 +305,7 @@
.BSBillingNav-icon { .BSBillingNav-icon {
color: #ffffff !important; color: #ffffff !important;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
width: 30px !important;
&:hover { &:hover {
color: #1292ee !important; color: #1292ee !important;
} }

4
src/Styles/BookingScreen/Template/BSLayout3/BSLayout3.scss
View File

@ -25,11 +25,11 @@
height: 100%; height: 100%;
@media (max-width: 768px) { @media (max-width: 768px) {
top: 2rem; top: 3.5rem;
} }
@media (max-width: 500px) { @media (max-width: 500px) {
top: 2rem; top: 3rem;
} }
} }

56
src/Styles/BookingScreen/Template/BSLayout7/BSC1Search.scss
View File

@ -1,8 +1,4 @@
.BSC1Search-container { .BSC1Search-container {
// display: flex;
// flex-direction: row;
// padding: 0.5rem 0 0 1.5rem;
// gap: 0.5rem;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -143,7 +139,6 @@
scrollbar-width: thin; scrollbar-width: thin;
} }
.ItemQtyCard { .ItemQtyCard {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -195,3 +190,54 @@
flex-direction: column; flex-direction: column;
row-gap: 1rem; row-gap: 1rem;
} }
.qtyDetail {
display: flex;
flex-direction: column;
justify-content: center;
column-gap: 0.1rem;
border-radius: 2px;
}
.qtyUomName {
font-size: 15px;
font-weight: 600;
font-family: "Gilroy";
text-align: center;
}
.qtyprice {
font-size: 16px;
background-color: var(--DEFAULT_SELECTED_COLOR);
color: #fff;
width: 105px;
display: flex;
font-family: var(--PARA_FONT_FAMILY);
justify-content: center;
text-align: center;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
.ItemQtyImgCard {
display: flex;
align-items: center;
justify-content: center;
}
.EditQuantity-heading {
display: flex;
align-items: center;
width: 25rem;
}
.EditQuantity-headingname {
display: flex;
align-items: center;
// width: 20rem;
}
.EditQuantity-headingproductname {
display: flex;
align-items: center;
font-size: 14px;
// padding: 1rem;
// width: 25rem;
}

44
src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss
View File

@ -630,6 +630,22 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
gap: 10px; gap: 10px;
.allpageSettingIcon {
width: 32px;
height: 32px;
background-color: #1292ee !important;
border-radius: 6px;
display: flex;
align-items: center;
justify-content: center;
padding: 5px !important;
color: #fff;
font-size: 25px !important;
svg {
height: 30px !important;
width: 30px !important;
}
}
.comboPrichangeBTN { .comboPrichangeBTN {
width: 32px; width: 32px;
@ -704,23 +720,35 @@
} }
} }
.MultiSearchIconDiv3 { .MultiSearchIconDiv {
background-color: #ffffff; background-color: #1292ee;
color: #1292ee !important; color: #fff !important;
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
width: 32px !important; width: 35px !important;
height: 32px; height: 33px;
padding: 4px; padding: 6px;
svg { svg {
font-size: 22px; font-size: 22px;
width: 32px !important; width: 35px !important;
height: 32px; height: 35px;
display: flex; display: flex;
} }
} }
.AsAmtCombo {
svg {
height: 25px;
}
}
.SearchNavMutiple {
display: flex;
align-items: center;
gap: 0;
width: inherit;
}

68
src/Styles/Stock/StockMaster.scss
View File

@ -2,8 +2,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
// border: 0.3px solid black; width: 100%;
width: 95%;
} }
.product-qty-info { .product-qty-info {
@ -60,9 +59,6 @@
align-items: center; align-items: center;
} }
// .Product-table .ant-table{
// width:90%;
// }
.supplierInfo { .supplierInfo {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -70,12 +66,13 @@
padding: 0.8rem; padding: 0.8rem;
gap: 10px; gap: 10px;
width: 100%; width: 100%;
border-radius: 6px;
} }
.supplierInfo1 { .supplierInfo1 {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
width: 80% !important; width: 100% !important;
gap: 1rem; gap: 1rem;
align-items: flex-start; align-items: flex-start;
@ -133,7 +130,6 @@
.extractor-table { .extractor-table {
overflow: auto; overflow: auto;
scrollbar-width: thin; scrollbar-width: thin;
} }
.extractor-table-red .ant-table-thead { .extractor-table-red .ant-table-thead {
@ -171,21 +167,19 @@
&:hover { &:hover {
background-color: #ff4d4f !important; background-color: #ff4d4f !important;
} }
} }
&.added { &.added {
background-color: #52c41a; background-color: #52c41a;
} }
} }
.product-legend { .product-legend {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
font-family: 'Poppins'; font-family: "Poppins";
margin-bottom: 10px; margin-bottom: 10px;
.legend-item { .legend-item {
@ -209,40 +203,6 @@
} }
} }
// .supplierInfo .ant-select-selector
// {
// width:15rem !important;
// height:3rem !important;
// }
// .supplierInfo :where(.css-dev-only-do-not-override-2i2tap).ant-select.ant-select-in-form-item
// {
// width:15rem !important;
// height:3rem !important;
// }
// .supplierInfo .ant-input{
// width:15rem !important;
// height:3rem !important;
// }
// .invoiceDetails .ant-input{
// width:15rem !important;
// height:3rem !important;
// }
// .invoiceDetails .example{
// width: 15rem ;
// }
// .invoiceDetails .ant-select-selector
// {
// width:15rem !important;
// height:3rem !important;
// }
// .invoiceDetails :where(.css-dev-only-do-not-override-2i2tap).ant-select.ant-select-in-form-item
// {
// width:15rem !important;
// height:3rem !important;
// }
.stockDiv { .stockDiv {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -282,10 +242,6 @@
display: flex; display: flex;
} }
// .formHeader {
// width: -webkit-fill-available;
// }
.header-buttons { .header-buttons {
display: flex; display: flex;
align-items: center; align-items: center;
@ -395,7 +351,6 @@
&:hover { &:hover {
background-color: #ffffff !important; background-color: #ffffff !important;
// font-size: 16px;
height: max-content !important; height: max-content !important;
} }
@ -468,14 +423,6 @@
} }
} }
// .stockDiv {
// .ant-select-arrow {
// top: 70% !important;
// z-index: 2000 !important;
// cursor: pointer !important;
// }
// }
.product-scan { .product-scan {
position: relative; position: relative;
@ -613,7 +560,6 @@
} }
.stock-input { .stock-input {
// width: 100vw;
width: 100%; width: 100%;
} }
} }
@ -900,6 +846,9 @@
.ant-form-item { .ant-form-item {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.float-label {
margin-bottom: 0;
}
} }
@media (max-width: 400px) { @media (max-width: 400px) {
@ -909,3 +858,6 @@
padding-bottom: 8px !important; padding-bottom: 8px !important;
} }
} }
.inputFormSTOCKFORM {
width: 100%;
}

6
src/main.jsx
View File

@ -10,12 +10,6 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
const queryClient = new QueryClient(); const queryClient = new QueryClient();
// Un Command This line when deployed in App Server
window.addEventListener('beforeunload', (e) => {
e.preventDefault();
e.returnValue = '';
});
ReactDOM.createRoot(document.getElementById('root')).render( ReactDOM.createRoot(document.getElementById('root')).render(
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<Provider store={store}> <Provider store={store}>