-
- )}
+ {ProductSearch?.length > 5 &&
+ QuickAdd &&
+ GetmultipleSearchDatas.some((e) => e.toLowerCase() === 'qrcode') && (
+
+
+ )}
{BSComboData == 'Combo1' &&
FeatureAddonData?.FeatureDtls?.find(
(item) => item?.FeatureAddonName?.toLowerCase() === 'weight scale'
) && Product Expires
- - } - open={expModel} - onOk={() => expFun(Item)} - onCancel={() => setexpModel(false)} - okText="Submit" - cancelText="Don't Submit" - >Quantity Expires
- - } - open={expQtyModel} - onOk={() => expQtyFun(qtyExpData)} - onCancel={() => { - (setRepeatedModel(false), setProdexpir(false), setExpQtyModel(false)); - }} - okText="Submit" - cancelText="Don't Submit" - maskTransitionName="" - transitionName="" - >Variant Expires
- - } - open={expVarModel} - onOk={() => expVerFun(VarItem)} - onCancel={() => { - (setexpVarModel(false), setRepeatedModel(false), setProdexpir(false)); - }} - okText="Submit" - cancelText="Don't Submit" - >Stock Expires
- - } - open={expStockModel} - onOk={() => expStockFun(StockItem)} - onCancel={() => { - (setexpStockModel(false), - setRepeatedModel(false), - setProdexpir(false)); - }} - okText="Submit" - cancelText="Don't Submit" - >
-
-
- }
- open={modelstock}
- // width={500}
- footer={null}
- children={
-
+ handleCancel={CloseModal}
+ >
+
+
+ }
+ open={modelstock}
+ // width={500}
+ footer={null}
+ handleCancel={CloseModal1}
+ >
+
+
+
+
+
+
+
+ Item Name:
+
+
+ {qtydata?.ProdName}
+
+ {Object.keys(brandMapping)?.map((brandId) => (
+
+
+
: ''} +
+ ))}
+
+ {Object.keys(brandMapping).length === 0 && (
+
+
+
+ + {' '} + {brandId !== 'null' && brandId !== 'undefined' + ? brandId + : ''} +
+
+ {brandMapping[brandId]?.map((item, index) => (
+
+ {brandId !== 'null' && brandId !== 'undefined' ?
+
+ ))}
+
+ 0 || item?.StockAvailable !== 'Y'
+ ? 'ItemQtyCard'
+ : 'ItemQtyCard-disabled'
+ }
+ onClick={() => VarientFun(item)}
+ >
+
+
+ 
+
+
+
+
+ + {item?.Size + ' ' + item?.UomName} +
+ {returnQtyCount( + item?.ProdId, + item, + CartOrderDetails + ) > 0 || item?.StockAvailable !== 'Y' ? ( ++ ₹ + + { + item?.ProdVariantDetails?.[0]?.StockDetails?.[0] + ?.SellPrice + } +
+ ) : ( + '' + )} +: ''} +
No product details available
+ )} +
+
- }
- handleCancel={CloseModal}
- />
-
+
@@ -5229,150 +4744,28 @@ export default function BSC1Search(props) {
- Item Name:
{qtydata?.ProdName}
- {Object.keys(brandMapping)?.map((brandId) => (
-
-
-
- ) : ( - '' - )} -
- ))}
-
- {Object.keys(brandMapping).length === 0 && (
-
-
-
- - {' '} - {brandId !== 'null' && brandId !== 'undefined' - ? brandId - : ''} -
-
- {brandMapping[brandId]?.map((item, index) => (
-
- {brandId !== 'null' && brandId !== 'undefined' ? (
-
-
- ))}
- 0 || item?.StockAvailable !== 'Y'
- ? 'ItemQtyCard'
- : 'ItemQtyCard-disabled'
- }
- onClick={() => VarientFun(item)}
- >
-
-
-
-
-
-
-
- - {item?.Size + ' ' + item?.UomName} -
- {returnQtyCount( - item?.ProdId, - item, - CartOrderDetails - ) > 0 || item?.StockAvailable !== 'Y' ? ( -- ₹ - - { - item?.ProdVariantDetails?.[0] - ?.StockDetails?.[0]?.SellPrice - } -
- ) : ( - '' - )} -- ) : ( - '' - )} -
No product details available
- )} -
-
-
@@ -5382,54 +4775,51 @@ export default function BSC1Search(props) {
open={ModalVarient}
width={500}
footer={null}
- children={
- {
'customisedbillnumber',
'Do you Want Customised Bill Number?'
)}
- {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
+ {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
{renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')}
{/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */}
@@ -749,7 +749,6 @@ const PreferenceList = () => {
'estimateprintheader',
'Do you want to include a header when printing Estimate bills?'
)}
-
-
+
-
- Item Name:
-
-
+ - {qtydata?.ProdName} -
-
+
- }
- handleCancel={CloseModal1}
- />
+
+
- Item Quantity:
-
-
-
- Item Quantity:
-
-
+ - {qtydata?.ProductDetail?.[QtyIndex]?.Size}{' '} - {onePeiceFlow - ? 'PCS' - : qtydata?.ProductDetail?.[QtyIndex]?.UomName} -
-
+
+ {qtydata?.ProductDetail?.[QtyIndex]?.Size}{' '} + {onePeiceFlow + ? 'PCS' + : qtydata?.ProductDetail?.[QtyIndex]?.UomName} +
-
+
+
- {
const buildInitialValues = () => ({
dashboard: allSettingsMap['dashboard'] === 'Y',
- shortcutkeys:allSettingsMap['shortcutkeys']==="Y",
+ shortcutkeys: allSettingsMap['shortcutkeys'] === 'Y',
autoreceivestock: allSettingsMap['autoreceivestock'] === 'Y',
decimal: allSettingsMap['decimal'] === 'Y',
enabledModules: [
@@ -287,7 +287,7 @@ const PreferenceList = () => {
const key = setting.SettingIdName.toLowerCase();
const boolValues = {
dashboard: values.dashboard,
- shortcutkeys:values.shortcutkeys,
+ shortcutkeys: values.shortcutkeys,
autoreceivestock: values.autoreceivestock,
decimal: values.decimal,
searchfocus: values.searchfocus,
@@ -564,7 +564,7 @@ const PreferenceList = () => {
Sales Page
{renderCheckbox('searchfocus', 'Always focus the search bar?')}
- {renderCheckbox(
+ {renderCheckbox(
'shortcutkeys',
'Would you like to enable the shortcut keys?'
)}
@@ -589,7 +589,7 @@ const PreferenceList = () => {
)}
- {((allSettingsMap['dinein'] !== undefined && dinePreference) ||
+ {((allSettingsMap['dinein'] !== undefined && dinePreference) ||
allSettingsMap['estimation'] !== undefined) && (
-
-
- {/* {`${percentValue}%`} */}
- {value}
-
- );
- };
- const getBenchmarkValue = (maxValue) => {
- if (maxValue <= 0) return 100;
+ // compute sizes based on actual container width
+ // make pie fill a good portion of container (leave some padding)
+ const pieOuterRadius = Math.max(
+ 48,
+ Math.floor(containerWidth * (isNarrow ? 0.36 : 0.28))
+ );
+ const pieInnerRadius = Math.floor(pieOuterRadius * (isNarrow ? 0.5 : 0.55));
- const benchmarks = [
- // Fine granularity for small numbers, coarser for large numbers
- 1, 2, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50,
- 60, 70, 80, 90, 100, 125, 150, 175, 200, 225, 250, 275, 300,
- 350, 400, 450, 500, 600, 700, 800, 900, 1000,
- 1250, 1500, 1750, 2000, 2500, 3000, 3500, 4000, 4500, 5000,
- 6000, 7000, 8000, 9000, 10000, 12500, 15000, 17500, 20000, 25000,
- 30000, 35000, 40000, 45000, 50000, 60000, 70000, 80000, 90000, 100000,
- 125000, 150000, 175000, 200000, 250000, 300000, 350000, 400000, 450000, 500000,
- 600000, 700000, 800000, 900000, 1000000
- ];
+ // height for ResponsiveContainer: tether to containerWidth so chart stays proportional
+ const responsiveHeight = Math.max(
+ 220,
+ Math.floor(containerWidth * (isNarrow ? 0.62 : 0.5))
+ );
- const benchmark = benchmarks.find(b => b >= maxValue);
- return benchmark || Math.ceil(maxValue / 10000) * 10000;
- };
+ // tweak minAngle: small screens should allow smaller minAngle so slices remain visible
+ const minAngle = isNarrow ? 4 : 8;
- const chartData = products?.map(p => ({
- ...p,
- name: p?.ProdName,
- value: metric === 'sales' ? p?.TotalSoldQty : p?.TotalRevenue,
- benchMarkValue: metric === 'sales' ? p?.TotalRevenueCount : p?.TotalRevenueAmount
- }));
+ console.log(pieOuterRadius, 'pieOuterRadius');
- const benchmarkValue = getBenchmarkValue(Math.max(...(chartData?.map(d => d?.benchMarkValue) || [0])));
+ // const COLORS = ['#2563eb', '#7c3aed', '#db2777', '#ea580c', '#16a34a', '#0891b2', '#d97706', '#65a30d', '#4f46e5', '#0d9488'];
+ const COLORS = [
+ '#4f8df5', // lighter blue (was #2563eb)
+ '#9a6df3', // lighter violet (was #7c3aed)
+ '#e95b96', // lighter pink (was #db2777)
+ '#f48b3c', // lighter orange (was #ea580c)
+ '#34c86a', // lighter green (was #16a34a)
+ '#33bcd4', // lighter cyan (was #0891b2)
+ '#e39a1a', // lighter amber (was #d97706)
+ '#8bc329', // lighter lime (was #65a30d)
+ '#6d63ef', // lighter indigo (was #4f46e5)
+ '#35bfa9', // lighter teal (was #0d9488)
+ ];
- return (
-
+
diff --git a/src/Pages/Kiosk/KioskBookingPage.jsx b/src/Pages/Kiosk/KioskBookingPage.jsx
index b224cc0..8313af3 100644
--- a/src/Pages/Kiosk/KioskBookingPage.jsx
+++ b/src/Pages/Kiosk/KioskBookingPage.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import axios from 'axios';
import { Skeleton } from 'antd';
@@ -64,119 +64,7 @@ const KioskBookingPage = () => {
};
useEffect(() => {
- // const fetchData = async () => {
- // const queryParams = await getQueryParams();
-
- // console.log("queryParams", queryParams)
- // if (Object.keys(queryParams)?.length !== 0) {
-
- // console.log("queryParams", queryParams)
- // if(!sessionStorage.getItem('auth')){
- // let data = {
- // username: "1000000001",
- // password: "1234"
- // }
- // const response = await axios.post(`${apiUrlToken}/jwtTokenGenerator`, data, {
- // headers: {
- // 'Content-Type': 'application/json',
- // 'Accept': 'application/json',
- // },
- // });
-
- // const { token } = response?.data;
- // sessionStorage.setItem('auth', token)
- // sessionStore("LoginType","Kiosk")
- // }
- // const MACAddress = queryParams?.MD
- // if (MACAddress) {
- // console.log("MACAddress", MACAddress)
- // setDeviceAddress(MACAddress)
- // setDevicePresent(true)
- // let deviceMACResponse = await dispatch(getDeviceAccess({ DeviceAddress: MACAddress })).unwrap();
- // if (deviceMACResponse?.data?.statusCode == 1 && deviceMACResponse?.data?.data?.length > 0 && deviceMACResponse?.data?.data?.[0]?.KioskStatus === 'Y') {
- // setDeviceAccess(true)
- // let responseData = deviceMACResponse?.data?.data?.[0]
- // responseData?.MobileNo != null && responseData?.MobileNo != undefined && sessionStore("MobileNo", responseData?.MobileNo);
- // responseData?.UserId != null && responseData?.UserId != undefined && sessionStore("UserId", responseData?.UserId);
- // responseData?.UserType != null && responseData?.UserType != undefined && sessionStore("UserType", responseData?.UserType);
- // responseData?.CompId != null && responseData?.CompId != undefined && sessionStore("CompId", responseData?.CompId);
- // responseData?.CompName != null && responseData?.CompName != undefined && sessionStore("CompName", responseData?.CompName);
- // responseData?.AppId != null && responseData?.AppId != undefined && sessionStore("AppId", responseData?.AppId);
- // responseData?.AppName != null && responseData?.AppName != undefined && sessionStore("AppName", responseData?.AppName);
- // responseData?.BranchId != null && responseData?.BranchId != undefined && sessionStore("BranchId", responseData?.BranchId);
- // responseData?.userName != null && responseData?.userName != undefined && sessionStore("userName", responseData?.UserName);
- // responseData?.SessionId != null && responseData?.SessionId != undefined && sessionStore("SessionId", responseData?.SessionId);
- // sessionStore("hasRefreshed", true);
- // dispatch(getKioskTemplate({ CompId: responseData?.CompId, BranchId: responseData?.BranchId, AppId: responseData?.AppId })).unwrap();
- // dispatch(getProductCategories({ CompId: responseData?.CompId, BranchId: responseData?.BranchId, AppId: responseData?.AppId })).unwrap();
- // } else {
- // setDeviceAccess(false)
- // }
- // } else {
- // const MobileNoValue = decryptedValuesFun(queryParams?.MN);
- // const UserIdValue = decryptedValuesFun(queryParams?.UD);
- // const UserTypeValue = decryptedValuesFun(queryParams?.UT);
- // const CompIdValue = decryptedValuesFun(queryParams?.CD);
- // const AppIdValue = decryptedValuesFun(queryParams?.AD);
- // const BranchIdValue = decryptedValuesFun(queryParams?.BD);
- // const OrderIdValue = decryptedValuesFun(queryParams?.OD);
- // const AmountValue = decryptedValuesFun(queryParams?.AM);
- // let CompNameValue = null, AppNameValue = null;
- // if (CompIdValue) {
- // let response = await dispatch(getCompanyData({ CompId: CompIdValue })).unwrap();
- // if (response?.data?.statusCode == 1) {
- // CompNameValue = response?.data?.data?.[0]?.["CompName"];
- // } else {
- // CompNameValue = null;
- // }
- // }
- // if (AppIdValue) {
- // let appResponse = await dispatch(getAllApplications({ AppId: AppIdValue })).unwrap();
- // if (appResponse?.data?.statusCode == 1) {
- // AppNameValue = appResponse?.data?.data?.[0]?.["AppName"];
- // } else {
- // AppNameValue = null;
- // }
- // }
- // let userNameValue = null;
- // if (queryParams?.UN != null && queryParams?.UN != undefined) {
- // userNameValue = decryptedValuesFun(queryParams?.UN);
- // }
- // console.log("queryParams", MobileNoValue, UserIdValue, UserTypeValue, CompIdValue, AppIdValue, BranchIdValue)
- // if (MobileNoValue && UserIdValue && UserTypeValue && CompIdValue && AppIdValue && BranchIdValue) {
- // sessionStore("MobileNo", MobileNoValue);
- // sessionStore("UserId", UserIdValue);
- // sessionStore("UserType", UserTypeValue);
- // sessionStore("CompId", CompIdValue);
- // sessionStore("CompName", CompNameValue);
- // sessionStore("AppId", AppIdValue);
- // sessionStore("AppName", AppNameValue);
- // sessionStore("BranchId", BranchIdValue);
- // if (userNameValue != null) {
- // sessionStore("userName", userNameValue);
- // }
- // dispatch(getKioskTemplate({ CompId: CompIdValue, BranchId: BranchIdValue, AppId: AppIdValue })).unwrap();
- // dispatch(getProductCategories({ CompId: CompIdValue, BranchId: BranchIdValue, AppId: AppIdValue })).unwrap();
- // dispatch(changeKioskPageName('OrderView'))
- // dispatch(changePaymentgatewayRedirect(true))
- // dispatch(changeKioskCustomerMobileNo(MobileNoValue))
- // dispatch(changePGFailedTransId(OrderIdValue))
- // dispatch(changePGFailedAmt(AmountValue))
- // const url = new URL(window.location);
- // url.search = '';
- // window.history.replaceState({}, document.title, url.toString());
- // }
- // else {
- // console.error("One or more decrypted values are null.");
- // }
- // }
-
- // } else {
- // dispatch(getKioskTemplate({ CompId: CompId, BranchId: BranchId, AppId: AppId })).unwrap();
- // dispatch(getProductCategories({ CompId: CompId, BranchId: BranchId, AppId: AppId })).unwrap();
- // }
- // }
fetchData();
}, []);
diff --git a/src/Pages/Offer/Offer/OfferList.scss b/src/Pages/Offer/Offer/OfferList.scss
index 5751a44..90098fd 100644
--- a/src/Pages/Offer/Offer/OfferList.scss
+++ b/src/Pages/Offer/Offer/OfferList.scss
@@ -1,9 +1,9 @@
.OfferList-Master {
- padding: 20px;
+ padding: 0;
background: #fff;
min-height: 100vh;
width: 100%;
- margin: 0 0 1rem 1rem;
+ margin: 0 0 0 0;
overflow: auto;
margin-bottom: 2rem;
border-radius: 12px;
@@ -477,6 +477,12 @@
font-size: 14px;
color: #878787;
}
+ .ant-input-affix-wrapper {
+ width: 250px !important;
+ }
+ .ant-input {
+ padding: 3px 14px 9px 11px !important;
+ }
}
// Table Styles
diff --git a/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx b/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
index aeff985..1135c62 100644
--- a/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
+++ b/src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
@@ -1156,6 +1156,7 @@ const PaymentDetailsList = () => {
flexWrap: 'wrap',
alignItems: 'flex-start',
gap: '1rem',
+ display: 'flex',
}}
>
-
@@ -2448,106 +2367,110 @@ const RetailDashboard = () => {
) : (
<>
-
-
- Item Name:
-
-
+ handleCancel={CloseVarientModal}
+ >
+ - {qtydata?.ProdName} -
-
+
+ {
const AllCategoryDatas = useSelector(GlobalCategorieData, shallowEqual);
const AllsubcatgoryDatas = useSelector(GlobalSubcategorieData, shallowEqual);
const RetailWSSalesType = useSelector(GlobalRetailWSSalesType, shallowEqual);
- // const CustDetails = SelectedCust ? SelectedCust : AddCustomerDetails?.[0];
- const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
+
const GPreOrderList = useSelector(GlobalPreOrderList, shallowEqual);
const [modelQty, setModelQty] = useState(false);
const [modelstock, setModelstock] = useState(false);
const [ModalVarient, setModalVarient] = useState(false);
const [QtyIndex, setQtyIndex] = useState(0);
const [VarientIndex, setVarientIndex] = useState(0);
- const [expModel, setexpModel] = useState(false);
const [prodexpir, setProdexpir] = useState(false);
- const [expVarModel, setexpVarModel] = useState(false);
- const [expStockModel, setexpStockModel] = useState(false);
const [initialRun, setInitialRun] = useState(false);
const [Item, setItem] = useState();
const [VarItem, setVarItem] = useState(0);
@@ -246,7 +238,10 @@ const BSItemCard = (props) => {
SelectedGlobalCardColorDetail,
shallowEqual
);
- const GetmultipleSearchDatas = useSelector(GlobalGetmultipleSearchDatas, shallowEqual)
+ const GetmultipleSearchDatas = useSelector(
+ GlobalGetmultipleSearchDatas,
+ shallowEqual
+ );
const SelectedCardFont = useSelector(SelectedGlobalCardFont, shallowEqual);
const CartOrderDetails = useSelector(GlobalOrderCardDetails, shallowEqual);
const SelectedDatas = useSelector(GlobalSelectedDatas, shallowEqual);
@@ -254,7 +249,7 @@ const BSItemCard = (props) => {
const WSProductdata = useSelector(GlobalWSProduct, shallowEqual);
const NewQrProductData = useSelector(GlobalNewQrProduct, shallowEqual);
const ReportholdData = useSelector(GlobalReorderHoldDetails, shallowEqual);
- console.log(GetmultipleSearchDatas, "GetmultipleSearchDatas")
+ console.log(GetmultipleSearchDatas, 'GetmultipleSearchDatas');
const ReorderProductData = useSelector(
GlobalReorderProductDetails,
shallowEqual
@@ -285,12 +280,11 @@ const BSItemCard = (props) => {
const [QuickAdd, setQuickAdd] = useState(true);
const [onePeiceFlow, setOnePeiceFlow] = useState(false);
const [BillOrderPre, setBillOrderPre] = useState();
- const [expQtyModel, setExpQtyModel] = useState(false);
const [qtyExpData, setQtyExpData] = useState();
const OrderOfferDetail = useSelector(Global_OrderOfferDetail);
- const [freeProductsOffers, setfreeProductsOffers] = useState([]);
+ // const [freeProductsOffers, setfreeProductsOffers] = useState([]);
const [screenWidth, setScreenWidth] = useState(window.innerWidth);
- const [screenHeight, setScreenHeight] = useState(window.innerHeight);
+ // const [screenHeight, setScreenHeight] = useState(window.innerHeight);
const ProdCat = useSelector(GlobalProductCategorie, shallowEqual);
const paymentloader = useSelector(GlobalPayementloader, shallowEqual);
const SessionData = useSelector(StoredSessionData, shallowEqual);
@@ -318,6 +312,13 @@ const BSItemCard = (props) => {
const triggerOfferFree = useSelector(GlobalTriggerOfferFree);
const productCardTrigger = useSelector(GlobalProductCardTrigger);
const appPreferences = useSelector(ApplicationPreferences);
+ const [expireModal, setExpireModal] = useState({
+ open: false,
+ title: '',
+ onOk: null,
+ onCancel: null,
+ });
+
const salespagefields = appPreferences?.find(
(pref) => pref?.PreferredCatName === 'Sales Page Fields'
)?.PreferenceCatDetails;
@@ -326,7 +327,7 @@ const BSItemCard = (props) => {
type?.PreferredSubCatName?.toLowerCase() === 'available date' &&
type?.PreferredStatus === 'Y'
);
- console.log(AvailableDate, salespagefields, 'Available Date');
+
const SingleMember = salespagefields?.find(
(type) =>
type?.PreferredSubCatName?.toLowerCase() === 'single member' &&
@@ -617,7 +618,7 @@ const BSItemCard = (props) => {
WithoutTaxRate:
availableFreeQty * item.OrderRate -
(availableFreeQty * item.OrderRate * item.TaxPercentage) /
- 100,
+ 100,
Offer: availableFreeQty * item.OrderRate,
};
@@ -666,7 +667,7 @@ const BSItemCard = (props) => {
((existingPaidItem.OrderQty + excessQty) *
item.OrderRate *
item.TaxPercentage) /
- 100,
+ 100,
};
ModifiedData.push(mergedPaidItem);
@@ -701,7 +702,7 @@ const BSItemCard = (props) => {
data?.InwardDtlId === item?.InwardDtlId &&
data?.ProdId === item?.ProdId &&
data?.OfferMessage?.[0]?.OfferId ===
- item?.OfferMessage?.[0]?.OfferId
+ item?.OfferMessage?.[0]?.OfferId
);
if (isAlreadyExists !== -1) {
@@ -721,11 +722,11 @@ const BSItemCard = (props) => {
).toFixed(2),
WithoutTaxRate:
(ModifiedData[isAlreadyExists].OrderQty + item.OrderQty) *
- item.OrderRate -
+ item.OrderRate -
((ModifiedData[isAlreadyExists].OrderQty + item.OrderQty) *
item.OrderRate *
item.TaxPercentage) /
- 100,
+ 100,
Offer:
(ModifiedData[isAlreadyExists].OrderQty + item.OrderQty) *
item.OrderRate,
@@ -751,10 +752,10 @@ const BSItemCard = (props) => {
const appliedOfferAlreadyExists = AppliedOffers.findIndex(
(offer) =>
offer?.FreeProductsList?.FreeProdId ===
- matchingFreeProduct?.FreeProdId &&
+ matchingFreeProduct?.FreeProdId &&
offer?.TableName === matchingFreeProduct?.TableName &&
offer?.TableUniqueName ===
- matchingFreeProduct?.TableUniqueName &&
+ matchingFreeProduct?.TableUniqueName &&
offer?.OfferId === matchingFreeProduct?.OfferId &&
offer?.OfferMode === matchingFreeProduct?.OfferMode &&
offer?.FreeProductsList?.ProdVariantDetails?.[0]
@@ -934,6 +935,19 @@ const BSItemCard = (props) => {
};
}
+ const openExpireModal = ({ title, onOk, onCancel }) => {
+ setExpireModal({
+ open: true,
+ title,
+ onOk,
+ onCancel,
+ });
+ };
+
+ const closeExpireModal = () => {
+ setExpireModal((prev) => ({ ...prev, open: false }));
+ };
+
// Usage example:
// const result = handleLoyaltyFreeProducts(orderCardDtls, freeProdDtls);
// console.log(result.ModifiedData);
@@ -941,13 +955,9 @@ const BSItemCard = (props) => {
// console.log(result.AppliedOffers);
async function getOffers() {
- let response = await dispatch(
+ await dispatch(
getOfferinBooking({ AppId: AppId, CompId: CompId, BranchId: BranchId })
).unwrap();
-
- if (response?.data?.statusCode == 1) {
- let expiredProd = response?.data?.data;
- }
}
useEffect(() => {
@@ -968,7 +978,7 @@ const BSItemCard = (props) => {
if (TableName === 'BuyXGetXOffers') return true;
}
);
- setfreeProductsOffers(filteredOffers);
+ // setfreeProductsOffers(filteredOffers);
getOffers();
}, [OrderOfferDetail]);
@@ -982,12 +992,7 @@ const BSItemCard = (props) => {
});
}
}, [SelectedCardFont]);
- // const cardData = !globalAccessForOthers
- // ? CardAccess
- // ? SelectedDatas
- // : ItemCard?.length == 0 ? noSubcatCardData : ItemCard
- // : "";
- //mohan 18-04-2025
+
const cardData = !globalAccessForOthers
? CardAccess
? SelectedDatas?.length > 1
@@ -996,7 +1001,7 @@ const BSItemCard = (props) => {
? []
: SelectedDatas
: ItemCard?.length == 0 ||
- (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
+ (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
? noSubcatCardData
: ItemCard
: '';
@@ -1029,7 +1034,7 @@ const BSItemCard = (props) => {
useEffect(() => {
if (AppId && CompId && BranchId) {
fetchedit();
- GetmultipleSearchData()
+ GetmultipleSearchData();
}
// dispatch(changepreOrder(false)); Commented to Add Normal Produts After Adding the Combo Pack !!!!!! Dont Touch Without Shifayath Permission
@@ -1043,10 +1048,9 @@ const BSItemCard = (props) => {
};
try {
- const response = await dispatch(getmultipleSearch(data))
-
+ const response = await dispatch(getmultipleSearch(data));
} catch (error) {
- console.error("Get Search Terms Error:", error);
+ console.error('Get Search Terms Error:', error);
}
};
@@ -1065,9 +1069,10 @@ const BSItemCard = (props) => {
setNoSubcatCardData();
}
- if (ProductSearch?.length > 5 && GetmultipleSearchDatas.some(
- e => e.toLowerCase() === "qrcode"
- )) {
+ if (
+ ProductSearch?.length > 5 &&
+ GetmultipleSearchDatas.some((e) => e.toLowerCase() === 'qrcode')
+ ) {
setQuickAdd(true);
}
}, [ProductSearch, GetmultipleSearchDatas]);
@@ -1101,14 +1106,14 @@ const BSItemCard = (props) => {
ProdSubCat: ProdSubCat,
...(AvailableDate && selectedDate
? {
- date: Array.isArray(selectedDate)
- ? selectedDate
- .map((d) => (d?.format ? d.format('YYYY-MM-DD') : d))
- .join(',')
- : selectedDate?.format
- ? selectedDate.format('YYYY-MM-DD')
- : selectedDate,
- }
+ date: Array.isArray(selectedDate)
+ ? selectedDate
+ .map((d) => (d?.format ? d.format('YYYY-MM-DD') : d))
+ .join(',')
+ : selectedDate?.format
+ ? selectedDate.format('YYYY-MM-DD')
+ : selectedDate,
+ }
: {}),
};
//mohan
@@ -1155,14 +1160,14 @@ const BSItemCard = (props) => {
prodCat: ProdCat,
...(AvailableDate && selectedDate
? {
- date: Array.isArray(selectedDate)
- ? selectedDate
- .map((d) => (d?.format ? d.format('YYYY-MM-DD') : d))
- .join(',')
- : selectedDate?.format
- ? selectedDate.format('YYYY-MM-DD')
- : selectedDate,
- }
+ date: Array.isArray(selectedDate)
+ ? selectedDate
+ .map((d) => (d?.format ? d.format('YYYY-MM-DD') : d))
+ .join(',')
+ : selectedDate?.format
+ ? selectedDate.format('YYYY-MM-DD')
+ : selectedDate,
+ }
: {}),
};
@@ -1180,13 +1185,6 @@ const BSItemCard = (props) => {
if (tempconfigdata?.data?.statusCode == 1) {
setConfigDataList(tempconfigdata?.data?.data);
- let configdata = tempconfigdata?.data?.data;
- let checkName = BookingTypeBoth ? 'DineIn,TakeAway' : BookingType;
-
- let filterconfigdata = configdata?.find(
- (a) => a?.ConfigName === checkName
- );
- // setSelectedBookingType(filterconfigdata?.ConfigId);
}
};
@@ -1220,7 +1218,10 @@ const BSItemCard = (props) => {
useEffect(() => {
if (ItemCard?.[0]?.QrBasedSearch === 'Y') {
if (ItemCard?.[0]?.OverAllExpStatus == 'Y' && ExpiredProduct) {
- setexpModel(true);
+ openExpireModal({
+ title: 'Product Expires',
+ onOk: () => expFun(Item),
+ });
setItem(ItemCard?.[0]);
} else {
setQtydata(ItemCard?.[0]);
@@ -1228,7 +1229,10 @@ const BSItemCard = (props) => {
}
} else if (ItemCard?.[0]?.OnePcQRBased === 'Y') {
if (ItemCard?.[0]?.OverAllExpStatus == 'Y' && ExpiredProduct) {
- setexpModel(true);
+ openExpireModal({
+ title: 'Product Expires',
+ onOk: () => expFun(Item),
+ });
setItem(ItemCard?.[0]);
setOnePeiceFlow(true);
} else {
@@ -1320,14 +1324,6 @@ const BSItemCard = (props) => {
)?.SettingValue === 'Y';
setExpiredProduct(expiredDate);
};
- const to12Hour = (timeStr) => {
- if (!timeStr) return '';
- let [h, m] = timeStr.split(':');
- h = parseInt(h, 10);
- const suffix = h >= 12 ? 'PM' : 'AM';
- h = h % 12 || 12; // 0 → 12
- return `${h}${suffix}`;
- };
const CloseModal = () => {
setModelQty(false);
@@ -1376,13 +1372,13 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1391,9 +1387,9 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -1435,11 +1431,11 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
+ ?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
- ?.StockDetails?.[0]?.SellPrice &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
+ ?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1448,9 +1444,9 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -1489,55 +1485,6 @@ const BSItemCard = (props) => {
}
};
- // const Stockfun = (index) => {
- // setVarientIndex(index.key)
- // let count = qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]?.StockDetails?.length;
- // if (StockPreferenceDetail?.SettingValue === "Y") {
- // if (count > 1) {
- // if (qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]?.OverAllExpStatus == 'N') {
- // setModalVarient(false)
- // setModelstock(true)
- // setVarItem(index.key)
- // }
- // else if (qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]?.OverAllExpStatus == 'Y') {
- // if (prodexpir) {
- // setRepeatedModel(true)
- // setModalVarient(false)
- // setModelstock(true)
- // setVarItem(index.key)
- // }
- // else {
- // setexpVarModel(true);
- // setVarItem(index.key)
- // }
- // }
- // // setVarientIndex(index.key)
- // }
- // else {
- // if (qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]?.OverAllExpStatus == 'N') {
- // dataTransfer(qtydata, QtyIndex, index.key, 0);
- // setModelQty(false)
- // setVarItem(index.key)
- // }
- // else if (qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]?.OverAllExpStatus == 'Y') {
- // if (prodexpir) {
- // setProdexpir(false)
- // setRepeatedModel(true)
- // dataTransfer(qtydata, QtyIndex, index.key, 0);
- // setModelQty(false)
- // setVarItem(index.key)
- // }
- // else{
- // setexpVarModel(true);
- // setVarItem(index.key)
- // }
- // }
- // }
- // } else {
- // dataTransfer(qtydata, QtyIndex, index.key, 0);
- // setModelQty(false)
- // }
- // }
const Stockfun = (index) => {
setVarientIndex(index.key);
const variantDetails =
@@ -1562,7 +1509,14 @@ const BSItemCard = (props) => {
}
} else if (overallExpStatus === 'Y' && ExpiredProduct) {
setVarItem(index.key);
- setexpVarModel(true);
+ openExpireModal({
+ title: 'Variant Expires',
+ onOk: () => expVerFun(VarItem),
+ onCancel: () => {
+ setRepeatedModel(false);
+ setProdexpir(false);
+ },
+ });
}
} else {
if (
@@ -1573,13 +1527,13 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1587,11 +1541,11 @@ const BSItemCard = (props) => {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -1638,7 +1592,14 @@ const BSItemCard = (props) => {
}
} else if (overallExpStatus === 'Y' && ExpiredProduct) {
setVarItem(index.key);
- setexpVarModel(true);
+ openExpireModal({
+ title: 'Variant Expires',
+ onOk: () => expVerFun(VarItem),
+ onCancel: () => {
+ setRepeatedModel(false);
+ setProdexpir(false);
+ },
+ });
return;
}
}
@@ -1652,13 +1613,13 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1667,9 +1628,9 @@ const BSItemCard = (props) => {
(cartItem) =>
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
- index.key
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
+ index.key
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -1695,16 +1656,6 @@ const BSItemCard = (props) => {
dataTransfer(qtydata, QtyIndex, index.key, 0, onePeiceFlow);
}
} else {
- // if (Isincart && Isincart?.StockAvailable === 'Y') {
- // if (Isincart?.BalanceQty > Isincart?.OrderQty) {
- // dataTransfer(qtydata, QtyIndex, index.key, 0, onePeiceFlow);
- // } else {
- // dataTransfer(qtydata, QtyIndex, index.key, 1, onePeiceFlow);
- // }
- // } else {
- // dataTransfer(qtydata, QtyIndex, index.key, 0, onePeiceFlow);
- // }
-
const findNextAvailableStockIndex = (
stockDetails,
CartOrderDetails,
@@ -1770,7 +1721,14 @@ const BSItemCard = (props) => {
}
} else if (overallExpStatus === 'Y' && ExpiredProduct) {
setVarItem(index.key);
- setexpVarModel(true);
+ openExpireModal({
+ title: 'Variant Expires',
+ onOk: () => expVerFun(VarItem),
+ onCancel: () => {
+ setRepeatedModel(false);
+ setProdexpir(false);
+ },
+ });
return;
}
setModelQty(false);
@@ -1782,7 +1740,14 @@ const BSItemCard = (props) => {
(item) => item.OverAllExpStatus === 'Y'
);
if (QtyExpire && ExpiredProduct) {
- setExpQtyModel(true);
+ openExpireModal({
+ title: 'Quantity Expires',
+ onOk: () => expQtyFun(qtyExpData),
+ onCancel: () => {
+ setRepeatedModel(false);
+ (setProdexpir(false), closeExpireModal());
+ },
+ });
setQtyExpData(index);
} else {
const selectedProIndex = qtydata?.ProductDetail?.findIndex(
@@ -1833,15 +1798,15 @@ const BSItemCard = (props) => {
let Isincart = CartOrderDetails?.find(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1849,11 +1814,11 @@ const BSItemCard = (props) => {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -1932,15 +1897,15 @@ const BSItemCard = (props) => {
let Isincart = CartOrderDetails?.find(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
cartItem?.OrderRate ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.SellPrice &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.SellPrice &&
!cartItem?.SalesId
);
@@ -1948,11 +1913,11 @@ const BSItemCard = (props) => {
let Isincartonepc = CartOrderDetails?.filter(
(cartItem) =>
cartItem?.ProdId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
cartItem?.InwardDtlId ===
- qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
- item?.VarientIndex
- ]?.StockDetails?.[0]?.InwardDtlId &&
+ qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
+ item?.VarientIndex
+ ]?.StockDetails?.[0]?.InwardDtlId &&
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
!cartItem?.SalesId
);
@@ -2048,7 +2013,14 @@ const BSItemCard = (props) => {
} else if (overallExpStatus === 'Y' && repeatedModel) {
dataTransfer(qtydata, QtyIndex, VarientIndex, item.key, onePeiceFlow);
} else {
- setexpStockModel(true);
+ openExpireModal({
+ title: 'Stock Expires',
+ onOk: () => expStockFun(StockItem),
+ onCancel: () => {
+ setRepeatedModel(false);
+ setProdexpir(false);
+ },
+ });
setStockItem(item.key);
}
}
@@ -2057,178 +2029,9 @@ const BSItemCard = (props) => {
setRepeatedModel(false);
};
- const pressTimer = useRef(null);
- const isLongPress = useRef(false);
const [priceChangeProduct, setPriceChangeProduct] = useState([]);
const [productPriceChange, setProductPriceChange] = useState(false);
- const handleMouseDownItemCard = (e, item) => {
- isLongPress.current = false;
-
- pressTimer.current = setTimeout(() => {
- if (
- !(
- (item?.OverAllQty !== undefined && !preferenceSingleSales
- ? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
- : returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )) > 0 ||
- item?.ProductDetail?.some((item) => item?.StockAvailable !== 'Y')
- )
- ) {
- e.stopPropagation();
- } else {
- isLongPress.current = true;
- handleLongPress(item);
- }
- }, 1000); // Adjust duration as needed
- };
-
- const handleMouseUpItemCard = (e, item, check) => {
- clearTimeout(pressTimer.current);
-
- if (!isLongPress.current) {
- // Your existing onClick logic
- if (
- !(
- (item?.OverAllQty !== undefined && !preferenceSingleSales
- ? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
- : returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )) > 0 ||
- item?.ProductDetail?.some((item) => item?.StockAvailable !== 'Y')
- )
- ) {
- e.stopPropagation();
- } else {
- if (check && !e.target.closest('.card4Main-onepiece')) {
- CardOnclick(
- item,
- item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
- );
- } else if (!check) {
- CardOnclick(
- item,
- item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
- );
- }
- }
- }
-
- isLongPress.current = false;
- };
-
- const handleMouseLeave = () => {
- clearTimeout(pressTimer.current);
- isLongPress.current = false;
- };
-
- // Mobile - Touch Start
- const handleTouchStartItemCard = (e, item) => {
- e.preventDefault();
- isLongPress.current = false;
-
- pressTimer.current = setTimeout(() => {
- if (
- !(
- (item?.OverAllQty !== undefined && !preferenceSingleSales
- ? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
- : returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )) > 0 ||
- item?.ProductDetail?.some((item) => item?.StockAvailable !== 'Y')
- )
- ) {
- e.stopPropagation();
- } else {
- isLongPress.current = true;
- handleLongPress(item);
- }
- }, 1000);
- };
-
- // Mobile - Touch End
- const handleTouchEndItemCard = (e, item, check = false) => {
- e.preventDefault();
- clearTimeout(pressTimer.current);
-
- if (!isLongPress.current) {
- // Same logic as mouse up
- if (
- !(
- (item?.OverAllQty !== undefined && !preferenceSingleSales
- ? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
- : returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )) > 0 ||
- item?.ProductDetail?.some((item) => item?.StockAvailable !== 'Y')
- )
- ) {
- e.stopPropagation();
- } else {
- if (check && !e.target.closest('.card4Main-onepiece')) {
- CardOnclick(
- item,
- item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
- );
- } else if (!check) {
- CardOnclick(
- item,
- item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
- );
- }
- }
- }
-
- isLongPress.current = false;
- };
-
- // Mobile - Touch Cancel (when interrupted)
- const handleTouchCancelItemCard = () => {
- clearTimeout(pressTimer.current);
- isLongPress.current = false;
- };
-
- const handleLongPress = (item) => {
- console.log('Long press triggered for:', item);
- setPriceChangeProduct([item]);
- setProductPriceChange(true);
- // Add your long press logic here
- // For example: open a context menu, show options, etc.
- };
-
const CardOnclick = async (item, Parameter) => {
setOnePeiceFlow(Parameter === 'OnePeiceProduct');
@@ -2248,7 +2051,10 @@ const BSItemCard = (props) => {
Parameter === 'OnePeiceProduct' ? transformedItem : item;
setQtydata(modiffiedData);
if (modiffiedData.OverAllExpStatus === 'Y' && ExpiredProduct) {
- setexpModel(true);
+ openExpireModal({
+ title: 'Product Expires',
+ onOk: () => expFun(modiffiedData),
+ });
setItem(modiffiedData);
} else if (modiffiedData) {
setQtydata(modiffiedData);
@@ -2359,28 +2165,15 @@ const BSItemCard = (props) => {
const isExistsInFreeProdList = hasOffer
? FreeProdList?.filter(
- (f) =>
- f?.FreeProdId === item?.ProdId &&
- f?.ProdVariantDetails?.some((variant) =>
- variant?.StockDetails?.some(
- (stock) => stock?.FreeInwardDtlId === item?.InwardDtlId
- )
- ) &&
- f?.RemainingQty > 0
- )
- : [];
-
- const freeProductAvailableForThisItem = hasOffer
- ? OverAllproductBasedOfferDatas?.ProdDtl?.filter(
- (o) =>
- o?.ProdId === item?.ProdId &&
- o?.ProdVariantDetails?.some((variant) =>
- variant?.StockDetails?.some(
- (stock) =>
- stock?.InwardDtlId === item?.InwardDtlId && o?.MinQty > 0
- )
- )
- )
+ (f) =>
+ f?.FreeProdId === item?.ProdId &&
+ f?.ProdVariantDetails?.some((variant) =>
+ variant?.StockDetails?.some(
+ (stock) => stock?.FreeInwardDtlId === item?.InwardDtlId
+ )
+ ) &&
+ f?.RemainingQty > 0
+ )
: [];
const calculateTaxAmounts = (qty, rate, taxPercentage) => {
@@ -2447,9 +2240,10 @@ const BSItemCard = (props) => {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
);
@@ -2460,9 +2254,10 @@ const BSItemCard = (props) => {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
);
@@ -2476,9 +2271,10 @@ const BSItemCard = (props) => {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
)
@@ -2491,9 +2287,10 @@ const BSItemCard = (props) => {
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B'
? true
: cartItem?.OfferMode !== 'B') &&
- cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
- cartItem?.OfferMode !== 'O' &&
- cartItem?.OfferMode !== 'L'
+ cartItem?.OfferMode !== 'P' &&
+ cartItem?.OfferMode !== 'C' &&
+ cartItem?.OfferMode !== 'O' &&
+ cartItem?.OfferMode !== 'L'
? true
: cartItem?.Offer === 0)
)
@@ -2514,8 +2311,8 @@ const BSItemCard = (props) => {
isItemInCart,
item?.OtherProduct === 'Others' || item?.ScaleType === 'weight'
? (
- (item?.OrderQty || 0) + parseFloat(isItemInCart?.OrderQty)
- )?.toFixed(3)
+ (item?.OrderQty || 0) + parseFloat(isItemInCart?.OrderQty)
+ )?.toFixed(3)
: null
);
const updatedData = addFirst
@@ -2541,8 +2338,8 @@ const BSItemCard = (props) => {
isItemInCartHold,
item?.OtherProduct === 'Others' || item?.ScaleType === 'weight'
? (
- (item?.OrderQty || 0) + parseFloat(isItemInCartHold?.OrderQty)
- )?.toFixed(3)
+ (item?.OrderQty || 0) + parseFloat(isItemInCartHold?.OrderQty)
+ )?.toFixed(3)
: null
);
const updatedData = addFirst
@@ -2769,14 +2566,14 @@ const BSItemCard = (props) => {
updatedCartData = cartData.map((item, idx) =>
idx === indexToCheck
? {
- ...item,
- Offer: null,
- OfferMessage: undefined,
- OfferMode: undefined,
- OfferModeType: false,
- OfferType: undefined,
- OfferValue: null,
- }
+ ...item,
+ Offer: null,
+ OfferMessage: undefined,
+ OfferMode: undefined,
+ OfferModeType: false,
+ OfferType: undefined,
+ OfferValue: null,
+ }
: item
);
}
@@ -2825,9 +2622,12 @@ const BSItemCard = (props) => {
const UpdatedCartItemWithOffer = {
...item,
- Offer: (sameProduct || bestOffer?.OfferMode === 'I' || bestOffer?.OfferMode === 'Q')
- ? (bestOffer?.OfferAmount || item.Offer)
- : (item.Offer || bestOffer?.OfferAmount),
+ Offer:
+ sameProduct ||
+ bestOffer?.OfferMode === 'I' ||
+ bestOffer?.OfferMode === 'Q'
+ ? bestOffer?.OfferAmount || item.Offer
+ : item.Offer || bestOffer?.OfferAmount,
OfferType: item?.OfferType || bestOffer?.OfferType,
OfferMessage: item?.OfferMessage || bestOffer?.OfferMessage,
OfferMode: item?.OfferMode || bestOffer?.OfferMode,
@@ -2842,9 +2642,10 @@ const BSItemCard = (props) => {
((c?.OfferModeType && c?.OfferMode === 'B'
? true
: c?.OfferMode !== 'B') &&
- c?.OfferMode !== 'P' && c?.OfferMode !== 'C' &&
- c?.OfferMode !== 'O' &&
- c?.OfferMode !== 'L'
+ c?.OfferMode !== 'P' &&
+ c?.OfferMode !== 'C' &&
+ c?.OfferMode !== 'O' &&
+ c?.OfferMode !== 'L'
? true
: c?.Offer === 0);
@@ -3159,7 +2960,6 @@ const BSItemCard = (props) => {
};
});
- console.log(Postdata, 'Postdata');
const response = await dispatch(
bulkpostdata({ ProdDetails: Postdata })
).unwrap();
@@ -3232,10 +3032,10 @@ const BSItemCard = (props) => {
return FreeProdList.map((f, i) =>
i === index
? {
- ...existing,
- ...newFreeProd,
- ProdVariantDetails: existing.ProdVariantDetails,
- }
+ ...existing,
+ ...newFreeProd,
+ ProdVariantDetails: existing.ProdVariantDetails,
+ }
: f
);
} else {
@@ -3305,7 +3105,7 @@ const BSItemCard = (props) => {
const cycleSize = buyQty + getQty;
const fullCycles = Math.floor(
freeCartItem?.reduce((acc, fc) => acc + (fc?.OrderQty || 0), 0) /
- cycleSize
+ cycleSize
);
const totalFreeQty = fullCycles * getQty;
@@ -3863,7 +3663,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0);
}
- } catch (_) { }
+ } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdName === ProdName
);
@@ -4064,7 +3864,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0);
}
- } catch (_) { }
+ } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return (
@@ -4100,7 +3900,7 @@ const BSItemCard = (props) => {
}, 0);
totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
- } catch (_) { }
+ } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if (
parseInt(ItemQuantity) >
@@ -4186,7 +3986,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0);
}
- } catch (_) { }
+ } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId);
let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => {
return (
@@ -4225,7 +4025,7 @@ const BSItemCard = (props) => {
}, 0);
totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
- } catch (_) { }
+ } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if (
parseInt(ItemQuantity) >
@@ -4317,7 +4117,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0);
}
- } catch (_) { }
+ } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
);
@@ -4360,7 +4160,7 @@ const BSItemCard = (props) => {
}, 0);
totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
- } catch (_) { }
+ } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if (
@@ -4444,7 +4244,7 @@ const BSItemCard = (props) => {
parseInt(totalSelectedProductQty || 0) +
parseInt(reorderComboConsumed || 0);
}
- } catch (_) { }
+ } catch (_) {}
let getCurrentProdDtl = orderDetails?.filter(
(a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId
);
@@ -4491,7 +4291,7 @@ const BSItemCard = (props) => {
}, 0);
totalOrderQty =
parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0);
- } catch (_) { }
+ } catch (_) {}
let OverallProdQty = totalOrderQty - totalSelectedProductQty;
if (
@@ -4669,7 +4469,7 @@ const BSItemCard = (props) => {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -4699,7 +4499,7 @@ const BSItemCard = (props) => {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -4729,7 +4529,7 @@ const BSItemCard = (props) => {
0 ||
- record.StockCount === 'Stock Not Maintained'
+ record.StockCount === 'Stock Not Maintained'
? { color: '#000', cursor: 'pointer' }
: { color: '#f49898', cursor: 'not-allowed' }
}
@@ -4904,17 +4704,17 @@ const BSItemCard = (props) => {
qtydata?.ProductDetail?.[QtyIndex]?.StockAvailable === 'Y'
? onePeiceFlow
? returnVariantStock(
- qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
- item?.OverAllPcs,
- CartOrderDetails,
- item?.ProdVariantName
- )
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
+ item?.OverAllPcs,
+ CartOrderDetails,
+ item?.ProdVariantName
+ )
: returnVariantStock(
- qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
- item?.OverAllQty,
- CartOrderDetails,
- item?.ProdVariantName
- )
+ qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item?.ProdVariantName
+ )
: 'Stock Not Maintained',
VariantAvailableFrom: item?.AvailableFrom,
VariantAvailableTo: item?.AvailableTo,
@@ -4936,20 +4736,20 @@ const BSItemCard = (props) => {
'Batch No': item?.BatchRef,
StockCount: onePeiceFlow
? returnCountStock(
- item?.ProdId,
- item?.OverAllPcs,
- CartOrderDetails,
- item?.InwardDtlId,
- 'Y'
- )
+ item?.ProdId,
+ item?.OverAllPcs,
+ CartOrderDetails,
+ item?.InwardDtlId,
+ 'Y'
+ )
: returnCountStock(
- item?.ProdId,
- item?.BalanceQty,
- CartOrderDetails,
- item?.InwardDtlId,
- 'N',
- item?.OverAllPcs
- ),
+ item?.ProdId,
+ item?.BalanceQty,
+ CartOrderDetails,
+ item?.InwardDtlId,
+ 'N',
+ item?.OverAllPcs
+ ),
'Stock Date': ExtractDateFormate(item?.InwardDate),
Price: onePeiceFlow ? item?.OnePcsPrice : item?.SellPrice,
ExpDate:
@@ -5321,6 +5121,7 @@ const BSItemCard = (props) => {
}, []);
const expFun = (item) => {
+ console.log(item, 'itemitemitemitemitemitemitemitem');
let count = item?.ProductDetail?.length;
if (count > 1) {
Quantity();
@@ -5328,7 +5129,8 @@ const BSItemCard = (props) => {
setVarItem(0);
SingleQuantity(item, onePeiceFlow);
}
- setexpModel(false);
+
+ closeExpireModal();
setProdexpir(true);
setQtydata(item);
};
@@ -5434,7 +5236,7 @@ const BSItemCard = (props) => {
setQtyIndex(selectedProIndex);
setRepeatedModel(true);
- setExpQtyModel(false);
+ closeExpireModal();
};
const expVerFun = (item) => {
@@ -5451,12 +5253,12 @@ const BSItemCard = (props) => {
setModelQty(false);
setSelectedBrand('Others');
}
- setexpVarModel(false);
+ closeExpireModal();
};
const expStockFun = (item) => {
dataTransfer(qtydata, QtyIndex, VarientIndex, item, onePeiceFlow);
- setexpStockModel(false);
+ closeExpireModal();
};
const getMaxBrandWidth = () => {
@@ -5488,18 +5290,6 @@ const BSItemCard = (props) => {
};
}, []);
- useEffect(() => {
- function handleResize() {
- setScreenHeight(window.innerHeight);
- }
-
- window.addEventListener('resize', handleResize);
-
- return () => {
- window.removeEventListener('resize', handleResize);
- };
- }, []);
-
// Example usage for checking the length of 'ProdVariantDetails'
const widthBasedOnProdVariantDetails = getMaxBrandWidth();
const ExpDate = useSelector(GlobalExpDateforHeight);
@@ -6109,9 +5899,9 @@ const BSItemCard = (props) => {
allProducts.forEach((product) => {
const brandName =
product.BrandName &&
- product.BrandName !== 'null' &&
- product.BrandName !== 'undefined' &&
- product.BrandName.trim() !== ''
+ product.BrandName !== 'null' &&
+ product.BrandName !== 'undefined' &&
+ product.BrandName.trim() !== ''
? product.BrandName
: 'Others';
@@ -6145,13 +5935,13 @@ const BSItemCard = (props) => {
const result = prodname
? (cardData || [])?.filter(
- (item) =>
- normalize(item.ProdName).includes(normalize(prodname)) ||
- normalize(item.ProdCatName).includes(normalize(prodname)) ||
- item.ProductDetail?.some((detail) =>
- normalize(detail.ProdName).includes(normalize(prodname))
- )
- )
+ (item) =>
+ normalize(item.ProdName).includes(normalize(prodname)) ||
+ normalize(item.ProdCatName).includes(normalize(prodname)) ||
+ item.ProductDetail?.some((detail) =>
+ normalize(detail.ProdName).includes(normalize(prodname))
+ )
+ )
: cardData;
console.log(prodQty, 'cardDatacardData', result, prodname);
@@ -6171,8 +5961,8 @@ const BSItemCard = (props) => {
CardOnclick(
result?.[0],
result?.[0]?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
+ preferenceSingleSales &&
+ 'OnePeiceProduct'
);
// AddOrderDetails2(result?.[0])
} else if (item?.OverAllQty < prodQty) {
@@ -6231,8 +6021,8 @@ const BSItemCard = (props) => {
zIndex: '12',
top:
templateData?.BookingLayout?.[0] === 'Layout5' ||
- templateData?.BookingLayout?.[0] === 'Layout4' ||
- templateData?.BookingLayout?.[0] === 'Layout6'
+ templateData?.BookingLayout?.[0] === 'Layout4' ||
+ templateData?.BookingLayout?.[0] === 'Layout6'
? '2.5rem'
: '',
}}
@@ -6311,21 +6101,21 @@ const BSItemCard = (props) => {
}}
className={
(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails,
- item?.OverAllPcs
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item?.OverAllPcs
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
- item?.ProductDetail?.some(
- (item) => item?.StockAvailable !== 'Y'
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
+ item?.ProductDetail?.some(
+ (item) => item?.StockAvailable !== 'Y'
+ )
? 'BkPrdCardActive'
: 'BkPrdCardDeActive'
}
@@ -6363,39 +6153,39 @@ const BSItemCard = (props) => {
cardFunction?.Background &&
(SelectedCardColor
? SelectedCardColor?.[
- 'BackgroundColor'
- ]
+ 'BackgroundColor'
+ ]
: ''),
padding:
!cardFunction?.ImageUp &&
- !cardFunction?.ImageDown
+ !cardFunction?.ImageDown
? cardFunction?.SmallImage &&
- '5px 9px'
+ '5px 9px'
: '8px 2px',
flexDirection:
cardFunction?.ImageRight &&
- 'row-reverse'
+ 'row-reverse'
? cardFunction?.ImageRight &&
- 'row-reverse'
+ 'row-reverse'
: cardFunction?.ImageUp && 'column'
? cardFunction?.ImageUp &&
- 'column'
+ 'column'
: cardFunction?.ImageDown &&
- 'column-reverse'
+ 'column-reverse'
? cardFunction?.ImageDown &&
- 'column-reverse'
+ 'column-reverse'
: cardFunction?.ImageLeft &&
- 'row',
+ 'row',
borderRadius:
cardFunction?.EdgeCurve && '6px',
width:
!cardFunction?.ImageUp &&
- !cardFunction?.ImageDown &&
- !cardFunction?.BigImage &&
- !cardFunction?.ImageRight &&
- cardFunction?.SmallImage &&
- (cardFunction?.ImageUp ||
- cardFunction?.ImageDown)
+ !cardFunction?.ImageDown &&
+ !cardFunction?.BigImage &&
+ !cardFunction?.ImageRight &&
+ cardFunction?.SmallImage &&
+ (cardFunction?.ImageUp ||
+ cardFunction?.ImageDown)
? '6rem'
: cardFunction?.BigImage && '9rem',
height:
@@ -6428,19 +6218,19 @@ const BSItemCard = (props) => {
if (
!(
(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
item?.ProductDetail?.some(
(item) =>
item?.StockAvailable !== 'Y'
@@ -6452,8 +6242,8 @@ const BSItemCard = (props) => {
CardOnclick(
item,
item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
+ preferenceSingleSales &&
+ 'OnePeiceProduct'
);
}
}}
@@ -6462,39 +6252,39 @@ const BSItemCard = (props) => {
>
{(cardFunction?.BigImage ||
cardFunction?.SmallImage) && (
-
- )}
+ ? item?.ProductDetail?.[0]
+ ?.ProdLogo
+ : defaultimage
+ }
+ alt=""
+ />
+ )}
+
+
{isMobile && screenWidth <= 768 && (
+
- Item Name:
-
-
-
- Item Quantity:
-
-
+ - {qtydata?.ProductDetail?.[QtyIndex]?.Size}{' '} - {onePeiceFlow - ? 'PCS' - : qtydata?.ProductDetail?.[QtyIndex]?.UomName} -
-
+
{qtydata?.ProdName}
-
- }
- handleCancel={CloseVarientModal}
- />
+
+
+
+ Item Quantity:
+
+
+ {qtydata?.ProductDetail?.[QtyIndex]?.Size}{' '} + {onePeiceFlow + ? 'PCS' + : qtydata?.ProductDetail?.[QtyIndex]?.UomName} +
+
+
+ {
cardFunction?.Background &&
(SelectedCardColor
? SelectedCardColor?.[
- 'BackgroundColor'
- ]
+ 'BackgroundColor'
+ ]
: ''),
position: !cardFunction?.BigImage
@@ -6528,7 +6318,7 @@ const BSItemCard = (props) => {
height: cardFunction?.SmallImage
? '5.5rem'
: !cardFunction?.BigImage &&
- '5.5rem',
+ '5.5rem',
alignItems:
!cardFunction?.BigImage &&
!cardFunction?.SmallImage &&
@@ -6551,11 +6341,11 @@ const BSItemCard = (props) => {
'uppercase',
width: !cardFunction?.SmallImage
? cardFunction?.BigImage &&
- '120px'
+ '120px'
: cardFunction?.SmallImage &&
- !cardFunction?.ImageUp &&
- !cardFunction?.ImageDown &&
- '85px',
+ !cardFunction?.ImageUp &&
+ !cardFunction?.ImageDown &&
+ '85px',
// Width: cardFunction?.BigImage && "70px",
fontSize:
!cardFunction?.BigImage &&
@@ -6577,24 +6367,24 @@ const BSItemCard = (props) => {
>
{item?.ProdName}{' '}
{(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails,
- item
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
- item?.ProductDetail?.some(
- (item) =>
- item?.StockAvailable !== 'Y'
- ) ? (
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
+ item?.ProductDetail?.some(
+ (item) =>
+ item?.StockAvailable !== 'Y'
+ ) ? (
''
) : (
@@ -2418,28 +2359,6 @@ const RetailDashboard = () => {
No Low Stock Product
)}
-
- {/* {
fontSize:
!cardFunction?.SmallImage
? cardFunction?.BigImage &&
- '12px'
+ '12px'
: '12px',
textAlign: 'center',
lineHeight: '2',
@@ -6633,8 +6423,8 @@ const BSItemCard = (props) => {
: '',
color: SelectedCardColor
? SelectedCardColor?.[
- 'FontColor'
- ]
+ 'FontColor'
+ ]
: '',
}}
>
@@ -6682,19 +6472,19 @@ const BSItemCard = (props) => {
count={
!preferenceSingleSales
? returnCount(
- item
- ?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
+ item
+ ?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails
+ )
: returnOnepcCount(
- item
- ?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )
+ item
+ ?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ )
}
overflowCount={10000}
>
@@ -6746,14 +6536,14 @@ const BSItemCard = (props) => {
item?.OverAllPcs,
CartOrderDetails
) > 0 ||
- item?.ProductDetail?.some(
- (product) =>
- product?.StockAvailable !==
- 'Y'
- )
+ item?.ProductDetail?.some(
+ (product) =>
+ product?.StockAvailable !==
+ 'Y'
+ )
? cardFunction?.Background
? SelectedCardColor?.BackgroundColor ||
- '#000000'
+ '#000000'
: '#fff'
: '#ff4d4f',
}}
@@ -6795,39 +6585,39 @@ const BSItemCard = (props) => {
cardFunction?.Background &&
(SelectedCardColor
? SelectedCardColor?.[
- 'BackgroundColor'
- ]
+ 'BackgroundColor'
+ ]
: ''),
padding:
!cardFunction?.ImageUp &&
- !cardFunction?.ImageDown
+ !cardFunction?.ImageDown
? cardFunction?.SmallImage &&
- '5px 9px'
+ '5px 9px'
: '8px 2px',
flexDirection:
cardFunction?.ImageRight &&
- 'row-reverse'
+ 'row-reverse'
? cardFunction?.ImageRight &&
- 'row-reverse'
+ 'row-reverse'
: cardFunction?.ImageUp && 'column'
? cardFunction?.ImageUp &&
- 'column'
+ 'column'
: cardFunction?.ImageDown &&
- 'column-reverse'
+ 'column-reverse'
? cardFunction?.ImageDown &&
- 'column-reverse'
+ 'column-reverse'
: cardFunction?.ImageLeft &&
- 'row',
+ 'row',
borderRadius:
cardFunction?.EdgeCurve && '6px',
width:
!cardFunction?.ImageUp &&
- !cardFunction?.ImageDown &&
- !cardFunction?.BigImage &&
- !cardFunction?.ImageRight &&
- cardFunction?.SmallImage &&
- (cardFunction?.ImageUp ||
- cardFunction?.ImageDown)
+ !cardFunction?.ImageDown &&
+ !cardFunction?.BigImage &&
+ !cardFunction?.ImageRight &&
+ cardFunction?.SmallImage &&
+ (cardFunction?.ImageUp ||
+ cardFunction?.ImageDown)
? '6rem'
: cardFunction?.BigImage && '9rem',
height:
@@ -6845,19 +6635,19 @@ const BSItemCard = (props) => {
if (
!(
(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
item?.ProductDetail?.some(
(item) =>
item?.StockAvailable !== 'Y'
@@ -6869,48 +6659,48 @@ const BSItemCard = (props) => {
CardOnclick(
item,
item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
+ preferenceSingleSales &&
+ 'OnePeiceProduct'
);
}
}}
- // data-aos="zoom-in" data-aos-duration="600"
+ // data-aos="zoom-in" data-aos-duration="600"
>
{(cardFunction?.BigImage ||
cardFunction?.SmallImage) && (
-
- )}
+ ? item?.ProductDetail?.[0]
+ ?.ProdLogo
+ : defaultimage
+ }
+ alt=""
+ />
+ )}
{
cardFunction?.Background &&
(SelectedCardColor
? SelectedCardColor?.[
- 'BackgroundColor'
- ]
+ 'BackgroundColor'
+ ]
: ''),
position: !cardFunction?.BigImage
@@ -6944,7 +6734,7 @@ const BSItemCard = (props) => {
height: cardFunction?.SmallImage
? '5.5rem'
: !cardFunction?.BigImage &&
- '4.5rem',
+ '4.5rem',
alignItems:
!cardFunction?.BigImage &&
!cardFunction?.SmallImage &&
@@ -6964,11 +6754,11 @@ const BSItemCard = (props) => {
'uppercase',
width: !cardFunction?.SmallImage
? cardFunction?.BigImage &&
- '120px'
+ '120px'
: cardFunction?.SmallImage &&
- !cardFunction?.ImageUp &&
- !cardFunction?.ImageDown &&
- '85px',
+ !cardFunction?.ImageUp &&
+ !cardFunction?.ImageDown &&
+ '85px',
// Width: cardFunction?.BigImage && "70px",
fontSize:
!cardFunction?.BigImage &&
@@ -6990,24 +6780,24 @@ const BSItemCard = (props) => {
>
{item?.ProdName}{' '}
{(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails,
- item
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
- item?.ProductDetail?.some(
- (item) =>
- item?.StockAvailable !== 'Y'
- ) ? (
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
+ item?.ProductDetail?.some(
+ (item) =>
+ item?.StockAvailable !== 'Y'
+ ) ? (
''
) : (
{selection === 'dashboard' ? (
@@ -1553,7 +1492,9 @@ const RetailDashboard = () => {
{ fontSize: !cardFunction?.SmallImage ? cardFunction?.BigImage && - '12px' + '12px' : '12px', textAlign: 'center', lineHeight: '2', @@ -7046,8 +6836,8 @@ const BSItemCard = (props) => { : '', color: SelectedCardColor ? SelectedCardColor?.[ - 'FontColor' - ] + 'FontColor' + ] : '', }} > @@ -7092,19 +6882,19 @@ const BSItemCard = (props) => { count={ !preferenceSingleSales ? returnCount( - item - ?.ProductDetail?.[0] - ?.ProdName, - item?.OverAllQty, - CartOrderDetails - ) + item + ?.ProductDetail?.[0] + ?.ProdName, + item?.OverAllQty, + CartOrderDetails + ) : returnOnepcCount( - item - ?.ProductDetail?.[0] - ?.ProdName, - item?.OverAllPcs, - CartOrderDetails - ) + item + ?.ProductDetail?.[0] + ?.ProdName, + item?.OverAllPcs, + CartOrderDetails + ) } overflowCount={10000} > @@ -7155,14 +6945,14 @@ const BSItemCard = (props) => { item?.OverAllPcs, CartOrderDetails ) > 0 || - item?.ProductDetail?.some( - (product) => - product?.StockAvailable !== - 'Y' - ) + item?.ProductDetail?.some( + (product) => + product?.StockAvailable !== + 'Y' + ) ? cardFunction?.Background ? SelectedCardColor?.BackgroundColor || - '#000000' + '#000000' : '#fff' : '#ff4d4f', }} @@ -7177,21 +6967,21 @@ const BSItemCard = (props) => {
0) ||
- item?.ProductDetail?.some(
- (item) => item?.StockAvailable !== 'Y'
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
+ item?.ProductDetail?.some(
+ (item) => item?.StockAvailable !== 'Y'
+ )
? 'card4Main card4Main-active'
: 'card4Main card4Main-deactive'
}
@@ -7214,17 +7004,17 @@ const BSItemCard = (props) => {
if (
!(
(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
item?.ProductDetail?.some(
(item) => item?.StockAvailable !== 'Y'
)
@@ -7239,8 +7029,8 @@ const BSItemCard = (props) => {
CardOnclick(
item,
item?.OnePcsAvailable === 'Y' &&
- preferenceSingleSales &&
- 'OnePeiceProduct'
+ preferenceSingleSales &&
+ 'OnePeiceProduct'
);
// This will trigger if you're clicking outside the "One Piece" button
}
@@ -7282,7 +7072,7 @@ const BSItemCard = (props) => {
height={60}
src={
item?.ProductDetail?.[0]?.ProdLogo ===
- ''
+ ''
? defaultimage
: item?.ProductDetail?.[0]?.ProdLogo
? item?.ProductDetail?.[0]?.ProdLogo
@@ -7297,21 +7087,21 @@ const BSItemCard = (props) => {
{item?.ProdName}
{(item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails,
- item
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
- item?.ProductDetail?.some(
- (item) => item?.StockAvailable !== 'Y'
- ) ? (
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
+ item?.ProductDetail?.some(
+ (item) => item?.StockAvailable !== 'Y'
+ ) ? (
''
) : (
{((item?.OverAllQty !== undefined &&
- !preferenceSingleSales
+ !preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllQty,
- CartOrderDetails,
- item
- )
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails,
+ item
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- ) > 0) ||
+ item?.ProductDetail?.[0]?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ ) > 0) ||
item?.ProductDetail?.some(
(item) => item?.StockAvailable !== 'Y'
)) && (
- { )}
-
{/* Stock Count Badge */}
@@ -7377,17 +7167,17 @@ const BSItemCard = (props) => {
count={
!preferenceSingleSales
? returnCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllQty,
- CartOrderDetails
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllQty,
+ CartOrderDetails
+ )
: returnOnepcCount(
- item?.ProductDetail?.[0]
- ?.ProdName,
- item?.OverAllPcs,
- CartOrderDetails
- )
+ item?.ProductDetail?.[0]
+ ?.ProdName,
+ item?.OverAllPcs,
+ CartOrderDetails
+ )
}
overflowCount={10000}
>
@@ -7436,13 +7226,13 @@ const BSItemCard = (props) => {
item?.OverAllPcs,
CartOrderDetails
) > 0 ||
- item?.ProductDetail?.some(
- (product) =>
- product?.StockAvailable !== 'Y'
- )
+ item?.ProductDetail?.some(
+ (product) =>
+ product?.StockAvailable !== 'Y'
+ )
? cardFunction?.Background
? SelectedCardColor?.BackgroundColor ||
- '#000000'
+ '#000000'
: '#fff'
: '#ff4d4f',
}}
@@ -7458,64 +7248,62 @@ const BSItemCard = (props) => {
- )
-
-
- : ProductSearch?.length > 5 && GetmultipleSearchDatas.some(
- e => e.toLowerCase() === "qrcode"
+ ) : ProductSearch?.length > 5 &&
+ GetmultipleSearchDatas.some(
+ (e) => e.toLowerCase() === 'qrcode'
) &&
- (cardData?.length == 0 || cardData == undefined) ? (
-
- ₹ {ItemSellingPrice(item)}
-
-
-
- <>
- ({ItemSize(item)} {ItemUomName(item)})
-
-
+
+
+ )}
+ ₹ {ItemSellingPrice(item)}
- )}
+
+
+ <>
+ ({ItemSize(item)} {ItemUomName(item)})
+
+
+
- {/* cardData mohan 18-04-2025 */}
-
- ) : (
- <>
-
-
+
+ );
+};
+
+export default ExpireConfirmModal;
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SalesPrintSize.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SalesPrintSize.jsx
index d60d19e..5e4a320 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SalesPrintSize.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SalesPrintSize.jsx
@@ -1,436 +1,488 @@
-import { Switch, Tooltip } from "antd"
-import { useDispatch } from "react-redux";
-import { changeBillName, changeNotes, changeSelectedAmount, changeSelectedDiscount, changeSelectedHsnCode, changeSelectedItem, changeSelectedMRP, changeSelectedprintStyle, changeSelectedQrcode, changeSelectedQuantity, changeSelectedRate, changeSelectedSignature, changeSelectedSlNo, changeSelectedtermsAndConditions, changeSignatureImage, changethemeFormat, getPrintSelectionComponentData, putPrintSelectionComponentData, changeSelectedPrintdummyData } from "../../../../Features/ThemeChange/ThemeChange";
-import { useEffect, useState, useMemo, useCallback } from "react";
-import { InfoCircleOutlined, UploadOutlined, PlusOutlined, MinusCircleOutlined, ArrowRightOutlined, EditFilled, DeleteFilled } from '@ant-design/icons';
-import { getSession } from "../../../../Services/Others";
-import Buttons from "../../../../Components/Forms/Buttons";
-import { Messages } from "../../../../Components/Notifications/Messages";
-
+import { Switch, Tooltip } from 'antd';
+import { useDispatch } from 'react-redux';
+import {
+ changeBillName,
+ changeNotes,
+ changeSelectedAmount,
+ changeSelectedDiscount,
+ changeSelectedHsnCode,
+ changeSelectedItem,
+ changeSelectedMRP,
+ changeSelectedprintStyle,
+ changeSelectedQrcode,
+ changeSelectedQuantity,
+ changeSelectedRate,
+ changeSelectedSignature,
+ changeSelectedSlNo,
+ changeSelectedtermsAndConditions,
+ changeSignatureImage,
+ changethemeFormat,
+ getPrintSelectionComponentData,
+ putPrintSelectionComponentData,
+ changeSelectedPrintdummyData,
+} from '../../../../Features/ThemeChange/ThemeChange';
+import { useEffect, useState, useMemo, useCallback } from 'react';
+import {
+ InfoCircleOutlined,
+ UploadOutlined,
+ PlusOutlined,
+ MinusCircleOutlined,
+ ArrowRightOutlined,
+ EditFilled,
+ DeleteFilled,
+} from '@ant-design/icons';
+import { getSession } from '../../../../Services/Others';
+import Buttons from '../../../../Components/Forms/Buttons';
+import { Messages } from '../../../../Components/Notifications/Messages';
const SalesPrintSize = ({ onSettingsChange, closeModel }) => {
- const CompId = getSession("CompId")
- const BranchId = getSession("BranchId")
- const AppId = getSession("AppId")
- const UserId = getSession('UserId');
- const dispatch = useDispatch()
+ const CompId = getSession('CompId');
+ const BranchId = getSession('BranchId');
+ const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+ const dispatch = useDispatch();
- const [PrintType, setPrintType] = useState(false);
- const [PageSize, setPageSize] = useState(false);
- // const [PrintTemplates, setPrintTemplates] = useState([])
- const [SizeOptionData, setSizeOptionData] = useState([])
- const [selectedTemplate, setSelectedTemplate] = useState(null)
- const [messageType, setMessageType] = useState('')
- const [messageData, setMessageData] = useState('')
- console.log(selectedTemplate, 'selectedTemplate');
+ const [PrintType, setPrintType] = useState(false);
+ const [PageSize, setPageSize] = useState(false);
+ // const [PrintTemplates, setPrintTemplates] = useState([])
+ const [SizeOptionData, setSizeOptionData] = useState([]);
+ const [selectedTemplate, setSelectedTemplate] = useState(null);
+ const [messageType, setMessageType] = useState('');
+ const [messageData, setMessageData] = useState('');
+ console.log(selectedTemplate, 'selectedTemplate');
+ // Memoized values for better performance
+ const currentPrintType = useMemo(() => {
+ if (selectedTemplate) {
+ return selectedTemplate.PrintType === 'S' ? true : false;
+ }
+ return PrintType;
+ }, [selectedTemplate, PrintType]);
- // Memoized values for better performance
- const currentPrintType = useMemo(() => {
- if (selectedTemplate) {
- return selectedTemplate.PrintType === 'S' ? true : false;
- }
- return PrintType;
- }, [selectedTemplate, PrintType]);
+ const currentPageSize = useMemo(() => {
+ if (selectedTemplate) {
+ return selectedTemplate.PageSize === 'A5' ? true : false;
+ }
+ return PageSize;
+ }, [selectedTemplate, PageSize]);
- const currentPageSize = useMemo(() => {
- if (selectedTemplate) {
- return selectedTemplate.PageSize === 'A5' ? true : false;
- }
- return PageSize;
- }, [selectedTemplate, PageSize]);
+ // Get the actual values to pass to parent component
+ const getPrintTypeValue = () => {
+ if (selectedTemplate) {
+ return selectedTemplate.PrintType;
+ }
+ return PrintType ? 'S' : 'C';
+ };
- // Get the actual values to pass to parent component
- const getPrintTypeValue = () => {
- if (selectedTemplate) {
- return selectedTemplate.PrintType;
- }
- return PrintType ? 'S' : 'C';
- };
+ const getPageSizeValue = () => {
+ if (selectedTemplate) {
+ return selectedTemplate.PageSize;
+ }
+ return PageSize ? 'A5' : 'A4';
+ };
- const getPageSizeValue = () => {
- if (selectedTemplate) {
- return selectedTemplate.PageSize;
- }
- return PageSize ? 'A5' : 'A4';
- };
+ useEffect(() => {
+ printsyleget();
+ }, []);
- useEffect(() => {
- printsyleget()
- }, [])
+ // Auto-select default template when data loads
+ useEffect(() => {
+ if (SizeOptionData.length > 0) {
+ const defaultTemplate = SizeOptionData.find(
+ (template) => template.SetasDefault === 'Y'
+ );
+ if (defaultTemplate) {
+ handleTemplateSelect(defaultTemplate);
+ }
+ }
+ }, [SizeOptionData]);
- // Auto-select default template when data loads
- useEffect(() => {
- if (SizeOptionData.length > 0) {
- const defaultTemplate = SizeOptionData.find(template => template.SetasDefault === "Y");
- if (defaultTemplate) {
- handleTemplateSelect(defaultTemplate);
- }
- }
- }, [SizeOptionData]);
+ const handleTemplateSelect = (template) => {
+ setSelectedTemplate(template);
+ setPrintType(template.PrintType === 'S');
+ setPageSize(template.PageSize === 'A5');
+ stylePreview(template);
- const handleTemplateSelect = (template) => {
- setSelectedTemplate(template);
- setPrintType(template.PrintType === 'S');
- setPageSize(template.PageSize === 'A5');
- stylePreview(template);
+ // Immediately pass the template settings
+ if (onSettingsChange && typeof onSettingsChange === 'function') {
+ const currentSettings = {
+ PrintType: template.PrintType,
+ PageSize: template.PageSize,
+ selectedTemplate: template,
+ };
+ console.log('Template Selected - Settings:', currentSettings);
+ onSettingsChange(currentSettings);
+ }
+ };
- // Immediately pass the template settings
- if (onSettingsChange && typeof onSettingsChange === 'function') {
- const currentSettings = {
- PrintType: template.PrintType,
- PageSize: template.PageSize,
- selectedTemplate: template
- };
- console.log('Template Selected - Settings:', currentSettings);
- onSettingsChange(currentSettings);
- }
- };
+ const onChangeToggle = async (e) => {
+ setPrintType(e);
+ await dispatch(changethemeFormat(e));
- const onChangeToggle = async (e) => {
- setPrintType(e);
- await dispatch(changethemeFormat(e));
+ // If a template is selected, update it
+ if (selectedTemplate) {
+ const updatedTemplate = {
+ ...selectedTemplate,
+ PrintType: e ? 'S' : 'C',
+ };
+ setSelectedTemplate(updatedTemplate);
- // If a template is selected, update it
- if (selectedTemplate) {
- const updatedTemplate = {
- ...selectedTemplate,
- PrintType: e ? 'S' : 'C'
- };
- setSelectedTemplate(updatedTemplate);
-
- // Immediately pass updated settings
- if (onSettingsChange && typeof onSettingsChange === 'function') {
- const currentSettings = {
- PrintType: updatedTemplate.PrintType,
- PageSize: updatedTemplate.PageSize,
- selectedTemplate: updatedTemplate
- };
- onSettingsChange(currentSettings);
- }
- }
- };
-
- const onChangepageSize = async (e) => {
- setPageSize(e);
-
- // If a template is selected, update it
- if (selectedTemplate) {
- const updatedTemplate = {
- ...selectedTemplate,
- PageSize: e ? 'A5' : 'A4'
- };
- setSelectedTemplate(updatedTemplate);
- if (onSettingsChange && typeof onSettingsChange === 'function') {
- const currentSettings = {
- PrintType: updatedTemplate.PrintType,
- PageSize: updatedTemplate.PageSize,
- selectedTemplate: updatedTemplate
- };
- onSettingsChange(currentSettings);
- }
- }
- };
-
- const stylePreview = async (template) => {
- if (!template) return;
-
- const { StyleId, StyleName, PrintType: printType, PageSize, Notes, PrintHdrName, Signature, TermsandConditions, OptionDetails } = template;
-
- const helperFunction = (param) => {
- return OptionDetails.some(
- (item) => item.ConfigName === param
- )
- }
-
- dispatch(changeSelectedSlNo(helperFunction('Sl.No')));
- dispatch(changeSelectedItem(helperFunction('Item')));
- dispatch(changeSelectedMRP(helperFunction('MRP')));
- dispatch(changeSelectedDiscount(helperFunction('Discount')));
- dispatch(changeSelectedQuantity(helperFunction('Quantity')));
- dispatch(changeSelectedRate(helperFunction('Rate')));
- dispatch(changeSelectedAmount(helperFunction('Amount')));
- dispatch(changeSelectedHsnCode(helperFunction('HsnCode')));
- dispatch(changeSelectedQrcode(helperFunction('Qrcode')));
- dispatch(changeSelectedSignature(helperFunction('signature')));
- dispatch(changeSelectedtermsAndConditions(helperFunction('terms&conditions')));
- dispatch(changeNotes(helperFunction('Notes')));
- dispatch(changeSignatureImage(Signature));
- dispatch(changeBillName(PrintHdrName));
- dispatch(changeSelectedprintStyle({
- ConfigId: StyleId,
- ConfigName: StyleName,
- }));
- };
-
- const printsyleget = async () => {
- try {
- const Data = { AppId, CompId, BranchId };
- let response = await dispatch(getPrintSelectionComponentData(Data)).unwrap();
-
- if (response?.data?.statusCode === 1) {
- // const salesTemplates = response.data.data?.flatMap(template =>
- // (template.ComponentDetails || []).filter(comp => comp.PrintTypeName === "Sales" && comp.SetasDefault === "Y")
- // );
- // setPrintTemplates(salesTemplates);
-
- let TableData = response?.data?.data?.[0]?.ComponentDetails.map(
- (item) => ({
- ActiveStatus: 'A',
- OptionDetails: item.FieldDetails,
- StyleId: item.StyleId,
- SetasDefault: item.SetasDefault,
- SetasDefaultInvoice: item.SetasDefaultInvoice,
- StyleName: item.StyleName,
- Signature: item.Signature,
- PrintType: item.PrintType,
- PrintHdrName: item.PrintHdrName,
- Notes: item?.Notes,
- PageSize: item?.PageSize,
- PrintTypeId: item?.PrintTypeId,
- TermsandConditions: (item?.TermsandConditions
- ? item?.TermsandConditions
- : []
- )?.map((tc) => tc?.TermsandConditions),
- })
- )?.sort((a, b) => {
- if ((a.StyleName || '') === 'A4Standard') return 1;
- if ((b.StyleName || '') === 'A4Standard') return -1;
- const isA4orA5 = (name) => /A4|A5/i.test(name);
- const nameA = a.StyleName || '';
- const nameB = b.StyleName || '';
- if (isA4orA5(nameA) && !isA4orA5(nameB)) return 1;
- if (!isA4orA5(nameA) && isA4orA5(nameB)) return -1;
- const numA = parseInt(nameA.match(/\d+/)?.[0]) || 0;
- const numB = parseInt(nameB.match(/\d+/)?.[0]) || 0;
- return numA - numB;
- });
- setSizeOptionData(TableData);
- }
- } catch (error) {
- console.error('Error fetching print styles:', error);
- }
- };
-
- // Log current values for debugging
- console.log('Current PrintType:', getPrintTypeValue());
- console.log('Current PageSize:', getPageSizeValue());
- console.log('Selected Template:', selectedTemplate);
-
- useEffect(() => {
+ // Immediately pass updated settings
+ if (onSettingsChange && typeof onSettingsChange === 'function') {
const currentSettings = {
- PrintType: getPrintTypeValue(),
- PageSize: getPageSizeValue(),
- selectedTemplate
+ PrintType: updatedTemplate.PrintType,
+ PageSize: updatedTemplate.PageSize,
+ selectedTemplate: updatedTemplate,
};
- console.log('Current Print Settings:', currentSettings);
+ onSettingsChange(currentSettings);
+ }
+ }
+ };
- // Call the callback if provided
- if (onSettingsChange && typeof onSettingsChange === 'function') {
- onSettingsChange(currentSettings);
- }
- }, [selectedTemplate, PrintType, PageSize]); // Removed onSettingsChange from dependencies
+ const onChangepageSize = async (e) => {
+ setPageSize(e);
- // Also pass data when component mounts and when selectedTemplate changes
- useEffect(() => {
- if (selectedTemplate && onSettingsChange && typeof onSettingsChange === 'function') {
- const currentSettings = {
- PrintType: selectedTemplate.PrintType,
- PageSize: selectedTemplate.PageSize,
- selectedTemplate
- };
- console.log('Template-based Print Settings:', currentSettings);
- onSettingsChange(currentSettings);
- }
- }, [selectedTemplate]);
+ // If a template is selected, update it
+ if (selectedTemplate) {
+ const updatedTemplate = {
+ ...selectedTemplate,
+ PageSize: e ? 'A5' : 'A4',
+ };
+ setSelectedTemplate(updatedTemplate);
+ if (onSettingsChange && typeof onSettingsChange === 'function') {
+ const currentSettings = {
+ PrintType: updatedTemplate.PrintType,
+ PageSize: updatedTemplate.PageSize,
+ selectedTemplate: updatedTemplate,
+ };
+ onSettingsChange(currentSettings);
+ }
+ }
+ };
- const onfinish = async (values) => {
- try {
- if (!SizeOptionData || SizeOptionData.length === 0) {
- setMessageType('error');
- setMessageData('Please Setup the Screen');
- return;
- }
+ const stylePreview = async (template) => {
+ if (!template) return;
- if (!selectedTemplate) {
- setMessageType('error');
- setMessageData('Please select a template first');
- return;
- }
+ const {
+ StyleId,
+ StyleName,
+ PrintType: printType,
+ PageSize,
+ Notes,
+ PrintHdrName,
+ Signature,
+ TermsandConditions,
+ OptionDetails,
+ } = template;
-
- const currentPrintType = getPrintTypeValue(); // 'S' or 'C'
- const currentPageSize = getPageSizeValue(); // 'A4' or 'A5'
-
- // Only one "Sales" style should have SetasDefault: "Y"
- const updatedTemplates = SizeOptionData.map((item) => {
- if (
- (item.PrintType === "Sales" || item.PrintType === "S")
- ) {
- return {
- ...item,
- SetasDefault:
- item.StyleId === selectedTemplate.StyleId ? "Y" : "N",
- };
- }
- return item;
- });
-
- let TemplateDetails = updatedTemplates.map((item) => {
- const isSelectedTemplate = item.StyleId === selectedTemplate.StyleId;
-
- return {
- SizeId: null,
- StyleId: item.StyleId,
- SetasDefault: item.SetasDefault,
- SetasDefaultInvoice: item.SetasDefaultInvoice,
- PrintTypeId: item?.PrintTypeId,
- SizeDetails: item.OptionDetails.map((opt) => ({
- OptionId: opt.ConfigId,
- })),
- ...(item?.TermsandConditions?.length > 0
- ? {
- PrintTermsandConditions: (item?.TermsandConditions
- ? item?.TermsandConditions
- : []
- )?.map((tc) => ({
- TermsandConditions: tc,
- })),
- }
- : {}),
- ...(item?.Notes ? { Notes: item.Notes } : {}),
- PageSize: isSelectedTemplate ? currentPageSize : item?.PageSize,
- ...(item?.PrintHdrName ? { PrintHdrName: item.PrintHdrName } : {}),
- ...(item?.Signature ? { Signature: item?.Signature } : {}),
- PrintType: isSelectedTemplate ? currentPrintType : item?.PrintType,
- };
- });
-
- const Data = {
- CompId: CompId,
- BranchId: BranchId,
- AppId: AppId,
- TemplateDetails: TemplateDetails,
- CreatedBy: UserId,
- };
-
- // console.log('API Request Data:', Data);
-
- const response = await dispatch(
- putPrintSelectionComponentData(Data)
- ).unwrap();
-
- if (response?.data?.statusCode === 1) {
- dispatch(changeSelectedPrintdummyData(false));
- await printsyleget();
- setMessageType('success');
- setMessageData(response?.data?.response);
- if (closeModel) {
- closeModel();
- }
- }
- } catch (error) {
- console.error('Error setting default template:', error);
- setMessageType('error');
- setMessageData('Failed to set default template');
- }
+ const helperFunction = (param) => {
+ return OptionDetails.some((item) => item.ConfigName === param);
};
- const onComplete = useCallback(() => {
- setMessageData(null);
- setMessageType(null);
- }, []);
+ dispatch(changeSelectedSlNo(helperFunction('Sl.No')));
+ dispatch(changeSelectedItem(helperFunction('Item')));
+ dispatch(changeSelectedMRP(helperFunction('MRP')));
+ dispatch(changeSelectedDiscount(helperFunction('Discount')));
+ dispatch(changeSelectedQuantity(helperFunction('Quantity')));
+ dispatch(changeSelectedRate(helperFunction('Rate')));
+ dispatch(changeSelectedAmount(helperFunction('Amount')));
+ dispatch(changeSelectedHsnCode(helperFunction('HsnCode')));
+ dispatch(changeSelectedQrcode(helperFunction('Qrcode')));
+ dispatch(changeSelectedSignature(helperFunction('signature')));
+ dispatch(
+ changeSelectedtermsAndConditions(helperFunction('terms&conditions'))
+ );
+ dispatch(changeNotes(helperFunction('Notes')));
+ dispatch(changeSignatureImage(Signature));
+ dispatch(changeBillName(PrintHdrName));
+ dispatch(
+ changeSelectedprintStyle({
+ ConfigId: StyleId,
+ ConfigName: StyleName,
+ })
+ );
+ };
- return (
- {
defaultValue="all"
placeholder="All Branches"
/>
+
)}
@@ -1537,14 +1484,6 @@ const RetailDashboard = () => {
className="datepickerDashboardrange"
inputReadOnly={true}
/>
- {/*
-
);
}
-const { RangePicker } = DatePicker;
+
const BsBookingitemCard = (props) => {
const voiceTriggerRef = useRef(null);
const unsubscribeRef = useRef(null);
@@ -191,14 +171,10 @@ const BsBookingitemCard = (props) => {
const handleDecline = async (item) => {
await decline(item, setPreviousdataLength);
};
- const handleClearAll = async () => {
- await clearAllItems();
- };
- const Clearall = async () => {
- await handleClearAll();
- };
- const [form] = Form.useForm();
+
+
+
const cardFunction = props?.cardFunctionality;
// const applyOffer = useApplyOfferto_CardDetail();
const preferenceDatas = useSelector(PreferenceData, shallowEqual);
diff --git a/src/Pages/BookingScreen/Components/BookingFunctionality/ExpireConfirmModal.jsx b/src/Pages/BookingScreen/Components/BookingFunctionality/ExpireConfirmModal.jsx
new file mode 100644
index 0000000..7bd2f3d
--- /dev/null
+++ b/src/Pages/BookingScreen/Components/BookingFunctionality/ExpireConfirmModal.jsx
@@ -0,0 +1,30 @@
+import { Modal } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+
+const ExpireConfirmModal = ({
+ open,
+ title,
+ onOk,
+ onCancel,
+ okText = 'Submit',
+ cancelText = "Don't Submit",
+}) => {
+ return (
+
-
diff --git a/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx b/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx
index cd14777..2755054 100644
--- a/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx
+++ b/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx
@@ -1,19 +1,15 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import moment from 'moment';
-import { App, Badge, DatePicker, Modal, Tooltip, Form, message } from 'antd';
-import { GoTriangleRight } from 'react-icons/go';
+import { Badge, DatePicker, Modal, Tooltip, message } from 'antd';
import { ExclamationCircleOutlined, PlusOutlined } from '@ant-design/icons';
import defaultimage from '../../../../Images/defaultItemImg.png';
import FormHeader from '../../../PageComponents/FormHeader';
import {
- GlobalPricingAppPricingName,
SelectedGlobalCardColorDetail,
SelectedGlobalCardFont,
StoredSessionData,
getTemplateData,
} from '../../../../Features/ThemeChange/ThemeChange';
-import { Tables } from '../../../../Components/Tables/Table';
import {
GlobalProductSubCategorie,
GlobalItemCard,
@@ -107,26 +103,13 @@ import { v4 as uuidv4 } from 'uuid';
// Dummy SortableCard component
import { useSortable } from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
-import HuggingFaceVoiceForm from '../../../VoiceToText/VoiceToText.jsx';
import VoiceToTextItemCard from '../../../VoiceToText/VoiceToTextItemCard.jsx';
import { ExtractDateFormate } from '../../../../Services/Others.js';
import {
- changeFreeProductForLoyalty,
- ChangeFreeProductList,
- ChangeFullFreeProductList,
changeFullOfferAppliedProducts,
- ChangeOfferAppliedProducts,
- changeOfferAppliedProductsForLoyalty,
changeOfferAppliedProductsForMembership,
- changeTriggerOfferFree,
- getOfferinBooking,
- GlobalFreeProdList,
- GlobalOfferAppliedProducts,
- GlobalOverAllOfferAmt,
- GlobalTriggerOfferFree,
- RemoveOfferAppliedProduct,
+ GlobalOfferAppliedProducts
} from '../../../../Features/Offer/Offernew/BookingOffernew.js';
-import { validateOffers } from './ValidateOffer.jsx';
import { useSaleswiseOfferWatcher } from './SalesWiseOffer.jsx';
import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin.js';
import { useDateStore } from '../../../../Features/BookingScreen/BookingData/DateStore.js';
@@ -137,10 +120,7 @@ import dayjs from 'dayjs';
import BSCustomerSelect from '../UtillComponents/BSSelectCustomer.jsx';
import BSNavBarAddUser from '../UtillComponents/BSNavBarAddUser.jsx';
import { FaAngleLeft, FaAngleRight } from 'react-icons/fa';
-
import useRemoveFromCart from './RemoveFromCartFunction.jsx';
-
-import { IoIosAdd } from 'react-icons/io';
import { LuMinus } from 'react-icons/lu';
import BranchName from '../../Template/BranchName.jsx';
import { FiPlus } from 'react-icons/fi';
@@ -179,7 +159,7 @@ export function SortableCard({ id, children, item }) {
-
-
-
-
-
-
-
-
-
-
-
+ (cardData?.length == 0 || cardData == undefined) ? (
+
+ {/* cardData mohan 18-04-2025 */}
+
+ ) : (
+ <>
+
+
+
+ )}
{paymentloader === true && (
-
+
-
- )}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- }
- open={expStockModel}
- onOk={() => expStockFun(StockItem)}
- onCancel={() => {
- (setexpStockModel(false),
- setRepeatedModel(false),
- setProdexpir(false));
- }}
- okText="Submit"
- cancelText="Don't Submit"
- maskTransitionName=""
- transitionName=""
- >
+ />
)}
{modelQty && (
@@ -7923,16 +7623,16 @@ const BSItemCard = (props) => {
]?.ProdVariantName?.toLowerCase()?.includes(
'variant'
) && (
-
- (
- {
- qtydata?.ProductDetail?.[QtyIndex]
- ?.ProdVariantDetails?.[VarientIndex]
- ?.ProdVariantName
- }
- ){' '}
-
- )}
+
+ (
+ {
+ qtydata?.ProductDetail?.[QtyIndex]
+ ?.ProdVariantDetails?.[VarientIndex]
+ ?.ProdVariantName
+ }
+ ){' '}
+
+ )}
-
+ {
+ expireModal.onOk?.();
+ closeExpireModal();
}}
- okText="Submit"
- cancelText="Don't Submit"
- maskTransitionName=""
- transitionName=""
- >
- )}
-
- {expVarModel && (
-
-
- }
- open={expVarModel}
- onOk={() => expVerFun(VarItem)}
onCancel={() => {
- (setexpVarModel(false),
- setRepeatedModel(false),
- setProdexpir(false));
+ expireModal.onCancel?.();
+ closeExpireModal();
}}
- okText="Submit"
- cancelText="Don't Submit"
- maskTransitionName=""
- transitionName=""
- >
- )}
- {expStockModel && (
-
+
-
- }
- open={expQtyModel}
- onOk={() => expQtyFun(qtyExpData)}
- onCancel={() => {
- (setRepeatedModel(false),
- setProdexpir(false),
- setExpQtyModel(false));
+ {expireModal?.open && (
+
+
-
- }
- open={expModel}
- onOk={() => expFun(Item)}
- onCancel={() => setexpModel(false)}
- okText="Submit"
- cancelText="Don't Submit"
- maskTransitionName="" // Remove animation for the mask
- transitionName=""
- >
- )}
-
- {expQtyModel && (
-
+
-
-
+
- {expModel && (
-
+
-
-
+
+
-
-
+
+
{' '} @@ -7532,107 +7320,19 @@ const BSItemCard = (props) => {
-
-
-
- Product Expires
-Quantity Expires
-Variant Expires
-Stock Expires
-
+
+ {title}
+
-
@@ -1511,6 +1456,7 @@ const RetailDashboard = () => {
{/* Branch Filter Dropdown */}
{CompBranchData?.length > 1 && selection !== 'top-selling-products' && (
-
- Print : {selectedTemplate?.StyleName}
-
-
-
-
- {(
-
-
-
-
- Customized
-
-
-
-
-
-
-
-
- )}
-
- {currentPrintType && (
-
-
- A4
-
- )}
-
-
- // handleMouseOver(e, point)}
- // onMouseOut={handleMouseOut}
- // />
- //
- // {formatValue(point.value)} ({item.date})
- //
- //
- // );
- // });
- // };
const renderDots = (data, color) => {
const reversedData = [...data].reverse();
@@ -507,7 +478,7 @@ const GraphChart = ({ datasets }) => {
{
}}
Logout={Logout}
/>
+
)}
+
+ );
+};
+
+export default SalesPrintSize;
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
index f01016d..6be8c8e 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
@@ -1,215 +1,215 @@
-import { ArrowRightOutlined } from "@ant-design/icons";
-import Buttons from "../../../../Components/Forms/Buttons";
-import { gettableData, postPreferenceAppNames } from "../../../../Features/PreferenceMaster/PreferenceMaster";
-import { getSession } from "../../../../Services/Others";
-import { useDispatch } from "react-redux";
-import { useEffect, useState } from "react";
-import { getPreferenceData } from "../../../../Features/BookingScreen/BookingData/BookingData";
-import { Messages } from "../../../../Components/Notifications/Messages";
-import { changeSelectedPrintdummyData } from "../../../../Features/ThemeChange/ThemeChange";
+import { ArrowRightOutlined } from '@ant-design/icons';
+import Buttons from '../../../../Components/Forms/Buttons';
+import {
+ gettableData,
+ postPreferenceAppNames,
+} from '../../../../Features/PreferenceMaster/PreferenceMaster';
+import { getSession } from '../../../../Services/Others';
+import { useDispatch } from 'react-redux';
+import { useEffect, useState } from 'react';
+import { getPreferenceData } from '../../../../Features/BookingScreen/BookingData/BookingData';
+import { Messages } from '../../../../Components/Notifications/Messages';
+import { changeSelectedPrintdummyData } from '../../../../Features/ThemeChange/ThemeChange';
const SelectPrintMode = ({ closeModel }) => {
- const CompId = getSession("CompId");
- const BranchId = getSession("BranchId");
- const AppId = getSession("AppId");
- const UserId = getSession("UserId");
- const dispatch = useDispatch();
+ const CompId = getSession('CompId');
+ const BranchId = getSession('BranchId');
+ const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+ const dispatch = useDispatch();
- const [modes, setModes] = useState([]);
- const [selected, setSelected] = useState({
- whatsapp: false,
- sms: false,
- print: false,
- email: false
+ const [modes, setModes] = useState([]);
+ const [selected, setSelected] = useState({
+ whatsapp: false,
+ sms: false,
+ print: false,
+ email: false,
+ });
+ const [messageType, setMessageType] = useState('');
+ const [messageData, setMessageData] = useState('');
+
+ console.log(selected, 'selected');
+
+ useEffect(() => {
+ fetchTableData();
+ }, []);
+
+ const fetchTableData = async () => {
+ const response = await dispatch(
+ gettableData({ CompId, BranchId, AppId })
+ ).unwrap();
+
+ const data = response?.data?.data?.[0]?.SettingDtlDetails || [];
+ console.log(data, 'datadata');
+
+ setModes(data);
+
+ // Pre-fill checkboxes from API data
+ setSelected({
+ whatsapp: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'whatsapp' &&
+ i.SettingValue === 'Y'
+ ),
+ sms: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'sms' &&
+ i.SettingValue === 'Y'
+ ),
+ print: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'print' &&
+ i.SettingValue === 'Y'
+ ),
+ email: !!data.find(
+ (i) =>
+ i.SettingIdName?.trim()?.toLowerCase() === 'email' &&
+ i.SettingValue === 'Y'
+ ),
});
- const [messageType, setMessageType] = useState("");
- const [messageData, setMessageData] = useState("");
+ };
- console.log(selected, 'selected');
+ const handleChange = (key) => {
+ setSelected((prev) => ({
+ ...prev,
+ [key]: !prev[key],
+ }));
+ };
+ const handleSave = async () => {
+ const allowed = ['whatsapp', 'sms', 'print', 'email'];
- useEffect(() => {
- fetchTableData();
- }, []);
+ const updatedSettings = modes.map((item) => {
+ const name = item.SettingIdName?.trim()?.toLowerCase();
- const fetchTableData = async () => {
-
- const response = await dispatch(
- gettableData({ CompId, BranchId, AppId })
- ).unwrap();
-
- const data = response?.data?.data?.[0]?.SettingDtlDetails || [];
- console.log(data, 'datadata');
-
- setModes(data);
-
- // Pre-fill checkboxes from API data
- setSelected({
- whatsapp: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "whatsapp" &&
- i.SettingValue === "Y"
- ),
- sms: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "sms" &&
- i.SettingValue === "Y"
- ),
- print: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "print" &&
- i.SettingValue === "Y"
- ),
- email: !!data.find(
- (i) =>
- i.SettingIdName?.trim()?.toLowerCase() === "email" &&
- i.SettingValue === "Y"
- )
- });
-
- };
-
- const handleChange = (key) => {
- setSelected((prev) => ({
- ...prev,
- [key]: !prev[key]
- }));
-
-
- };
-
-
- const handleSave = async () => {
- const allowed = ["whatsapp", "sms", "print", "email"];
-
- const updatedSettings = modes.map((item) => {
- const name = item.SettingIdName?.trim()?.toLowerCase();
-
- if (allowed?.includes(name)) {
- return {
- ...item,
- SettingValue: selected[name] ? "Y" : "N"
- };
- }
-
- return item;
-
- });
-
- const payload = {
- CompId,
- BranchId,
- CreatedBy: UserId,
- AppId,
- SettingDtlDetails: updatedSettings
+ if (allowed?.includes(name)) {
+ return {
+ ...item,
+ SettingValue: selected[name] ? 'Y' : 'N',
};
+ }
- console.log(payload, "payload to send");
+ return item;
+ });
- try {
- const response = await dispatch(postPreferenceAppNames(payload)).unwrap();
-
- if (response?.data?.statusCode === 1) {
- setMessageType("success");
- setMessageData("Printer settings saved successfully.");
- dispatch(changeSelectedPrintdummyData(false));
- await updatePreference();
- closeModel()
- } else {
- setMessageType("error");
- setMessageData(response?.data?.message || "Failed to save printer settings.");
- }
- } catch (error) {
- console.error("Error while saving:", error);
- }
+ const payload = {
+ CompId,
+ BranchId,
+ CreatedBy: UserId,
+ AppId,
+ SettingDtlDetails: updatedSettings,
};
- const updatePreference = async () => {
- await dispatch(getPreferenceData({ CompId, BranchId, AppId }));
+ console.log(payload, 'payload to send');
+
+ try {
+ const response = await dispatch(postPreferenceAppNames(payload)).unwrap();
+
+ if (response?.data?.statusCode === 1) {
+ setMessageType('success');
+ setMessageData('Printer settings saved successfully.');
+ dispatch(changeSelectedPrintdummyData(false));
+ await updatePreference();
+ closeModel();
+ } else {
+ setMessageType('error');
+ setMessageData(
+ response?.data?.message || 'Failed to save printer settings.'
+ );
+ }
+ } catch (error) {
+ console.error('Error while saving:', error);
}
+ };
- return (
-
+
+ Print : {selectedTemplate?.StyleName}
+
+
+
+
+ {
+
- )
-}
-export default SalesPrintSize
\ No newline at end of file
+
+
+ Customized
+
+
+
+
+
+
+
+ }
+ {currentPrintType && (
+
+
+ A4
+
+ )}
+
+
+
- {
- setMessageData(null);
- setMessageType(null);
- }}
- />
-
+ );
};
export default SelectPrintMode;
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
index 820889d..058627f 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
@@ -282,6 +282,7 @@ const TaxInvoice = ({
paginatedChunks.push(chunk);
}
}
+ console.log(paginatedChunks, "paginatedChunks")
const lastChunkRows =
paginatedChunks.length > 0
@@ -878,7 +879,7 @@ const TaxInvoice = ({
>
{Number(
table2Data?.OrderType !== 'E'
- ? item.Rate - item.ProdTaxAmt
+ ? item.Rate - (item?.SinglePc === 'Y' ? (item?.TaxAmt / item?.SalesQty) : item.ProdTaxAmt)
: item.Rate || 0
).toLocaleString('en-IN', {
minimumFractionDigits: 2,
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx
index 20b63d1..7559f21 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/OtherServicePrintStyle1.jsx
@@ -1,120 +1,47 @@
-import React from "react";
+
import { useDispatch, useSelector } from "react-redux";
import {
- dateFormatChange1,
- extractLastNumber,
- extractLastNumberOrderId,
+ dateFormatChange1
} from "../../../../Services/Others";
import {
- GlobalprintSlNo,
- GlobalprintItem,
- GlobalprintMRP,
- GlobalprintDiscount,
- GlobalprintQuantity,
- GlobalprintRate,
- GlobalprintAmount,
- GlobalprintHsnCode,
- GlobalprintQrcodet,
GlobalPritdummyData,
changeReprintDataFound,
- GloabalFieldDetails,
- GlobalprintSignature,
- GlobalprinttermsAndConditions,
- GlobalSignatureImage,
- Globalnotes,
- GlobalthemeFormat,
- GlobalBillName,
} from "../../../../Features/ThemeChange/ThemeChange";
import "../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss";
import QRCode from "react-qr-code";
-import { GlobalUpiIDprint } from "../../../../Features/BookingScreen/BookingData/BookingData";
-import signature from "../../../../Images/signatureimage.jpg"
import { ApplicationPreferences } from "../../../../Features/BrachLogin/BranchLogin";
const OtherServicePrintStyle1 = ({
- index,
- totalQuantityFilter,
- Date1,
- CashierName,
- totalQuantity,
- OrderDetailGST,
- OrderDetailIGST,
- OrderDetailVAT,
+
table2Data,
- UpiId,
PaymentStatus,
- PrintLogo,
- PrintGreeting,
printDatas,
}) => {
const dispatch = useDispatch();
- const GlobalUpiID = useSelector(GlobalUpiIDprint);
- const FieldDetails = useSelector(GloabalFieldDetails);
- const SLNO = FieldDetails?.["Sl.No"];
- const Item = FieldDetails?.["Item"];
- const MRP = FieldDetails?.["MRP"];
- const Discount = FieldDetails?.["Discount"];
- const Quantity = FieldDetails?.["Quantity"];
- const Rate = FieldDetails?.["Rate"];
- const Amount = FieldDetails?.["Amount"];
- const HsnCode = FieldDetails?.["HsnCode"];
- const Qrcodet = FieldDetails?.["Qrcode"];
- const GlobalSlNo = useSelector(GlobalprintSlNo);
- const GlobalItem = useSelector(GlobalprintItem);
- const GlobalMRP = useSelector(GlobalprintMRP);
- const GlobalDiscount = useSelector(GlobalprintDiscount);
- const GlobalQuantity = useSelector(GlobalprintQuantity);
- const GlobalRate = useSelector(GlobalprintRate);
- const GlobalAmount = useSelector(GlobalprintAmount);
- const GlobalHsnCode = useSelector(GlobalprintHsnCode);
- const GlobalQrcodet = useSelector(GlobalprintQrcodet);
+
const GlobaldummyData = useSelector(GlobalPritdummyData);
- const GlobalSignature = useSelector(GlobalprintSignature);
- const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
- const GlobalSignatureImages = useSelector(GlobalSignatureImage);
- const GlobalIsnotes = useSelector(Globalnotes);
- const GlobalthemeFormatr = useSelector(GlobalthemeFormat)
- const GlobalBilltext = useSelector(GlobalBillName)
+
const appPreferences = useSelector(ApplicationPreferences);
const bookingTypePreference = appPreferences?.find((preference) => preference?.PreferredCatName === 'Booking Type')?.PreferenceCatDetails
- const dinePreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "dine in" && type?.PreferredStatus === 'Y')
+
const takeAwayPreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "take away" && type?.PreferredStatus === 'Y')
const keysLength = Object.keys(table2Data ?? {}).length;
- let TermsAndConditions = printDatas?.TermsandConditions
- let SignatureImg = printDatas?.Signature
- let Notestext = printDatas?.Notes
- let BillName = printDatas?.PrintHdrName
+
let FormatTheme = printDatas?.PrintType == "S" ? true : false
let PageSize = printDatas?.PageSize
- const Signature = FieldDetails?.["signature"];
- const TermsnAdCondition = FieldDetails?.["terms&conditions"];
+
console.log("table2Datatable2Datatable2Datatable2Data", table2Data,table2Data?.[0]?.BranchName );
if (keysLength > 0) {
dispatch(changeReprintDataFound(true));
}
- const currentDate = new Date();
- const day = currentDate.getDate().toString().padStart(2, "0");
- const monthNames = [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec",
- ];
- const monthIndex = currentDate.getMonth();
- const year = currentDate.getFullYear().toString().slice(-2);
+
+
+
const formattedDate =dateFormatChange1(table2Data?.[0]?.CreatedDate);
// `${day}-${monthNames[monthIndex]}-${year}`;
@@ -125,37 +52,13 @@ console.log("table2Datatable2Datatable2Datatable2Data", table2Data,table2Data?.[
const DineInData = table2Data?.productDetails?.filter(
(item) => item.BookingTypeName?.toLowerCase() === "dine in"
);
- let PaymentStatusSuccess = PaymentStatus?.filter(
- (ps) => ps.PaymentStatus === "S"
- );
- const TakeawayTotal = TakeawayData?.reduce(
- (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
- 0
- );
- const DineInTotal = DineInData?.reduce(
- (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
- 0
- );
- const aggregatedPayments = PaymentStatusSuccess?.reduce(
- (acc, paymentdata) => {
- const paymentType = paymentdata?.PaymentTypeName;
- const amount = Number(paymentdata?.Amount);
- if (acc[paymentType]) {
- acc[paymentType] += amount;
- } else {
- acc[paymentType] = amount;
- }
- return acc;
- },
- {}
- );
- const productsData = table2Data?.productDetails || [];
+
const offers = table2Data?.OrderOfferDetails || [];
- let TotalOfferAmount = 0;
+
// Calculate SalesWiseOffers total amount
offers.forEach(offer => {
@@ -163,19 +66,9 @@ console.log("table2Datatable2Datatable2Datatable2Data", table2Data,table2Data?.[
TotalOfferAmount += offer.OfferAmount;
}
});
- const hasMappedOffer = offers.some(offer =>
- ["ItemWiseOffers", "BundleOffers", "QuantityWiseOffers"].includes(offer.TableName)
- );
+
- if (hasMappedOffer) {
-
- const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type != "C" ? item.OfferAmt : item.OfferValue || 0), 0);
- TotalOfferAmount += productTotal;
- } else {
- const Combothere = productsData?.filter(item => item?.Type == "C")
- const CombothereTotal = Combothere?.reduce((acc, item) => acc + (item.OfferValue || 0), 0);
- TotalOfferAmount += CombothereTotal;
- }
+
const products = [
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
index 4ff7674..36b226a 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
@@ -40,7 +40,6 @@ import {
} from '../../../../Features/BookingScreen/BookingData/BookingData';
import signature from '../../../../Images/signatureimage.jpg';
import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin';
-import { settingDataSelector } from '../../../../Features/PreferenceMaster/PreferenceMaster';
import Logo from '../../../../Images/Logo.jpg';
const PrintStyle1 = ({
index,
diff --git a/src/Pages/DashBoard/Chart/GraphChart.jsx b/src/Pages/DashBoard/Chart/GraphChart.jsx
index 73eec74..96e2875 100644
--- a/src/Pages/DashBoard/Chart/GraphChart.jsx
+++ b/src/Pages/DashBoard/Chart/GraphChart.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
import { Tooltip } from 'antd';
import './GraphChart.scss'; // For styling
import TooltipWrapper from '../../../Components/Tooltip/Tooltip';
@@ -206,36 +206,7 @@ const GraphChart = ({ datasets }) => {
.join(' ');
};
- // const renderDots = (data, color) => {
- // const maxValue = Math.max(...data.map(item => item.value));
- // const svgHeight = 200;
- // const svgWidth = 400;
- // const gap = svgWidth / (data.length - 1);
- // return data.map((point, index) => {
- // const x = index * gap;
- // const y = svgHeight - (point.value / maxValue) * svgHeight;
-
- // return (
- // - Select Print Mode -
+ const updatePreference = async () => { + await dispatch(getPreferenceData({ CompId, BranchId, AppId })); + }; -
-
+ return (
+
- );
+
+ {
+ setMessageData(null);
+ setMessageType(null);
+ }}
+ />
+
- + Select Print Mode +
- +
+
-
+
-
-
+
+
+
-
-
+
+
- {Array.from({ length: 7 }, (_, i) => {
+ {Array.from({ length: 8 }, (_, i) => {
const date = new Date();
date.setDate(date.getDate() - i);
return (
diff --git a/src/Pages/DashBoard/Chart/GraphChart.scss b/src/Pages/DashBoard/Chart/GraphChart.scss
index f38181c..68680bd 100644
--- a/src/Pages/DashBoard/Chart/GraphChart.scss
+++ b/src/Pages/DashBoard/Chart/GraphChart.scss
@@ -73,7 +73,7 @@
width: inherit;
margin-top: 10px;
.labelss {
- font-size: 11px;
+ font-size: 10px;
font-family: 'Poppins';
color: #000000;
font-weight: 400;
diff --git a/src/Pages/DashBoard/PieChart.jsx b/src/Pages/DashBoard/PieChart.jsx
index 781822a..3a2d650 100644
--- a/src/Pages/DashBoard/PieChart.jsx
+++ b/src/Pages/DashBoard/PieChart.jsx
@@ -1,93 +1,4 @@
-// import React, { useEffect, useRef, useState } from 'react';
-// import Highcharts from 'highcharts';
-// import HighchartsReact from 'highcharts-react-official';
-// import "./PieChart.scss"
-// const DynamicPieChart = ({ chartData }) => {
-// const [overallValue, setOverallValue] = useState(0);
-// const chartRef = useRef();
-
-// useEffect(() => {
-// if (chartRef.current && chartData) {
-// const chart = chartRef.current.chart;
-// chart.series[0].setData(chartData);
-// const sum = chartData.reduce((total, dataPoint) => total + dataPoint.y, 0);
-// setOverallValue(sum);
-
-// // Update the chart title to include the overall value
-// chart.setTitle({ text: `Overall Amount: ${sum}` });
-// }
-// }, [chartData]);
-
-// return (
-//
{userprofile && (
+
-//
-// );
-// };
-
-// export default DynamicPieChart;
-
-// import React, { useEffect, useRef, useState } from 'react';
-// import Highcharts from 'highcharts';
-// import HighchartsReact from 'highcharts-react-official';
-// import "./PieChart.scss"
-// const DynamicPieChart = ({ chartData }) => {
-// const [overallValue, setOverallValue] = useState(0);
-// const chartRef = useRef();
-
-// useEffect(() => {
-// if (chartRef.current && chartData) {
-// const chart = chartRef.current.chart;
-// chart.series[0].setData(chartData);
-// const sum = chartData.reduce((total, dataPoint) => total + dataPoint.y, 0);
-// setOverallValue(sum);
-
-// // Update the chart title to include the overall value
-// chart.setTitle({ text: `Overall Amount: ${sum}` });
-// }
-// }, [chartData]);
-
-// return (
-//
-//
-// );
-// };
-
-// export default DynamicPieChart;
-
-// create by sree
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import Highcharts from 'highcharts';
import HighchartsReact from 'highcharts-react-official';
import './PieChart.scss';
@@ -105,16 +16,25 @@ const DynamicPieChart = ({ chartData }) => {
);
if (!chartData?.length) {
- return No Data Found
;
+ return (
+
+ No Data Found
+
+ );
}
return (
diff --git a/src/Pages/DashBoard/RetailDashboard.jsx b/src/Pages/DashBoard/RetailDashboard.jsx
index f677240..b38fb69 100644
--- a/src/Pages/DashBoard/RetailDashboard.jsx
+++ b/src/Pages/DashBoard/RetailDashboard.jsx
@@ -1,28 +1,26 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import '../../Styles/DashBoard/RetailDashBoard.scss';
-import GraphChart from './Chart/GraphChart';
-import { DatePicker, Space, Tooltip } from 'antd';
-import dayjs from 'dayjs';
-import { IoMdRefresh } from 'react-icons/io';
-import { CiShop } from 'react-icons/ci';
-import { FiMenu } from 'react-icons/fi';
-import PozoMind from '../../Images/pozologowhite.svg';
+import { useCallback, useEffect, useRef, useState,lazy, Suspense } from 'react';
import { useNavigate, useOutletContext } from 'react-router-dom';
-import CalendarDropdown from '../../Components/CalendarDropdown';
-import { MdKeyboardArrowDown } from 'react-icons/md';
-import { IoMdNotificationsOutline } from 'react-icons/io';
-import {
- getdashboard,
- getdashboarddate,
- getpreOrderDashBoard,
- getSalesHdr,
- getTopSellingCustomers,
-} from '../../Features/RetailDashboard/Dashboard.js';
-import { FaTimesCircle } from 'react-icons/fa';
+import { shallowEqual, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
+
+import { DatePicker, Tooltip } from 'antd';
+import dayjs from 'dayjs';
+
+import '../../Styles/DashBoard/RetailDashBoard.scss';
+
+const GraphChart = lazy(() => import('./Chart/GraphChart'));
+const TopSellingProductsChart = lazy(
+ () => import('./TopSellingProductsChart.jsx')
+);
+
import sandClock from '../../Images/sandClock.png';
+import Add from '../../Images/dashboard/Add.png';
+import AddPurchase from '../../Images/dashboard/AddPurchase.png';
+import invoice from '../../Images/dashboard/invoice.png';
+import user from '../../Images/dashboard/user.jpg';
+import report from '../../Images/dashboard/report.png';
+
import {
- FeatureAddon,
- getTemplate,
GlobalPricingAppPricingName,
StoredSessionData,
} from '../../Features/ThemeChange/ThemeChange.js';
@@ -31,15 +29,20 @@ import {
getAppSubscriptionDate,
getPreferenceData,
} from '../../Features/BookingScreen/BookingData/BookingData.js';
+import {
+ getdashboard,
+ getdashboarddate,
+ getpreOrderDashBoard,
+ getSalesHdr,
+ getTopSellingCustomers,
+} from '../../Features/RetailDashboard/Dashboard.js';
import {
clearSession,
- dateFormatChange,
encryptedValuesUrlFun,
ExtractDateFormate,
getSession,
} from '../../Services/Others';
-import { shallowEqual, useDispatch } from 'react-redux';
-import { useSelector } from 'react-redux';
+
import {
getAllprodIds,
getExpireProductsList,
@@ -58,28 +61,36 @@ import {
PUTLoginuser,
} from '../../Features/BrachLogin/BranchLogin.js';
import { getPurchasedAppDetails } from '../../Features/BookingScreen/Pricing/Pricing.js';
-import Add from '../../Images/dashboard/Add.png';
-import AddPurchase from '../../Images/dashboard/AddPurchase.png';
-import invoice from '../../Images/dashboard/invoice.png';
-import user from '../../Images/dashboard/user.jpg';
-import report from '../../Images/dashboard/report.png';
-import Calendar from '../../Components/Calendar/Calendar';
-import { PiSignOut } from 'react-icons/pi';
-import BSNavBarUserInfo from '../BookingScreen/Components/BSNavbar/BSNavBarUserInfo';
-import { DefaultModal } from '../../Components/Modal/DefaultModal';
-import { RadioGrpButton } from '../../Components/Forms/RadioGroup.jsx';
-import { DropDowns } from '../../Components/Forms/DropDown.jsx';
+
+const BSNavBarUserInfo = lazy(() =>
+ import('../BookingScreen/Components/BSNavbar/BSNavBarUserInfo')
+);
+const DefaultModal = lazy(() =>
+ import('../../Components/Modal/DefaultModal').then((m) => ({
+ default: m.DefaultModal,
+ }))
+);
+
+const RadioGrpButton = lazy(() =>
+ import('../../Components/Forms/RadioGroup.jsx').then((m) => ({
+ default: m.RadioGrpButton,
+ }))
+);
+
+const DropDowns = lazy(() =>
+ import('../../Components/Forms/DropDown.jsx').then((m) => ({
+ default: m.DropDowns,
+ }))
+);
import {
ChangeRedirectStatus,
getEmpAccess,
GlobalRedirectStatus,
} from '../../Features/AppPage/CenterPage.js';
import { UserDataBasedOnBranchId } from '../../Features/Reports/Reports.js';
-import { gettableData } from '../../Features/PreferenceMaster/PreferenceMaster.js';
import Loader from '../../Components/Loader/Loader.jsx';
import { getUserProfile } from '../../Features/UserAccount/userData.js';
-import TopSellingProductsChart from './TopSellingProductsChart.jsx';
import { Messages } from '../../Components/Notifications/Messages.jsx';
const commonUrl = import.meta.env.ENV_COMMON_BASE_URL;
@@ -97,7 +108,6 @@ const RetailDashboard = () => {
const navigate = useNavigate();
const dispatch = useDispatch();
const { RangePicker } = DatePicker;
- const [selectedTab, setSelectedTab] = useState('dashboard');
const tabs = [
{ value: 'dashboard', label: 'Dashboard' },
{ value: 'top-selling-products', label: 'Top Selling Products' },
@@ -116,16 +126,7 @@ const RetailDashboard = () => {
]);
const [ismounted, setIsmounted] = useState(true);
const [customerPendingBalance, setcustomerPendingBalance] = useState([]);
- console.log(PricingAppPricingName, 'PricingAppPricingName');
- // const {
- // AppId: appId,
- // CompId: compId,
- // BranchId: branchId,
- // } = SessionData || {};
- // console.log(appId, compId, branchId, 'SessionData');
- const [range1, setRange1] = useState('today');
- const [range2, setRange2] = useState('today');
- const [range3, setRange3] = useState('today');
+
const [userprofile, setUserprofile] = useState(false);
const userProfileRef = useRef(null);
@@ -142,7 +143,6 @@ const RetailDashboard = () => {
const [totalPages, setTotalPages] = useState(0);
const [loading, setLoading] = useState(false);
const [products, setProducts] = useState([]);
- console.log(selection, 'selection');
const [CompBranchData, setCompBranchData] = useState();
const [EmpAcces, setEmpAccess] = useState();
const [seletedBranchData, setseletedBranchData] = useState(BranchId);
@@ -151,7 +151,6 @@ const RetailDashboard = () => {
BrLength == 1 ? null : 'all'
);
const [ApiData, setApiData] = useState([]);
- console.log(CompBranchData, 'CompBranchData');
const [Zero, SetZero] = useState(false);
const [ResponseData, setResponseData] = useState();
const [DateApiData, setDateApiData] = useState([]);
@@ -216,18 +215,7 @@ const RetailDashboard = () => {
type?.PreferredStatus === 'Y'
);
const timerDuration = 30;
- let EndDate = AppDetails?.[0]?.ValidityEnd;
- const isoDate = EndDate; // <-- July 24
- const date = new Date(isoDate);
-
- const options = { year: 'numeric', month: 'long', day: 'numeric' };
- const formatted = date.toLocaleDateString('en-US', options);
-
- // "July 24, 2025"
-
- console.log(expiredList, lowStockList, 'lowStockList');
- console.log(TopSellingCus, preorderData, 'preorderData');
let DineInData =
ApiData?.[0]?.ChartDtl?.map((item) => {
return {
@@ -441,10 +429,6 @@ const RetailDashboard = () => {
if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
const remaining = res?.data?.data?.[0];
- // let RemainingDays = expData?.RemainingDays;
- // let RemainingHours=expData?.RemainingHours;
- // let RemainingMinutes=expData?.RemainingMinutes;
- // let RemainingSeconds=expData?.RemainingSeconds
const now = new Date();
@@ -1075,39 +1059,6 @@ const RetailDashboard = () => {
getSalesHdrFn();
};
- // Function to aggregate data from multiple branches
- const aggregateBranchData = (branchDataArray) => {
- const aggregated = {
- DineInOrderCount: 0,
- TakeAwayOrderCount: 0,
- SelfTakeAwayOrderCount: 0,
- OverAllSalesAmt: 0,
- OverAllDineInAmount: 0,
- OverAllTakeAwayAmount: 0,
- ChartDtl: [],
- };
-
- branchDataArray.forEach((branchData) => {
- if (branchData) {
- aggregated.DineInOrderCount += branchData.DineInOrderCount || 0;
- aggregated.TakeAwayOrderCount += branchData.TakeAwayOrderCount || 0;
- aggregated.SelfTakeAwayOrderCount +=
- branchData.SelfTakeAwayOrderCount || 0;
- aggregated.OverAllSalesAmt += branchData.OverAllSalesAmt || 0;
- aggregated.OverAllDineInAmount += branchData.OverAllDineInAmount || 0;
- aggregated.OverAllTakeAwayAmount +=
- branchData.OverAllTakeAwayAmount || 0;
-
- // Merge chart data (you might want to customize this based on your needs)
- if (branchData.ChartDtl && branchData.ChartDtl.length > 0) {
- aggregated.ChartDtl = aggregated.ChartDtl.concat(branchData.ChartDtl);
- }
- }
- });
-
- return aggregated;
- };
-
// Helper functions for fetching data from all branches
const getpreOrderDashBoardFnAllBranches = async (FromDate, ToDate) => {
if (!CompBranchData || CompBranchData.length === 0) return;
@@ -1284,14 +1235,6 @@ const RetailDashboard = () => {
setApiData([]);
}
- // const allBranchData = await Promise.all(allBranchPromises);
-
- // // Aggregate the data from all branches
- // const aggregatedData = aggregateBranchData(allBranchData);
- // setDateApiData([aggregatedData]);
- // setApiData([aggregatedData]);
- // setPiedat([aggregatedData]);
-
// Also refresh other data for all branches with date range
getpreOrderDashBoardFnAllBranches(fromDate, toDate);
getTopBuyingCustomersAllBranches(fromDate, toDate);
@@ -1477,6 +1420,7 @@ const RetailDashboard = () => {
?.toUpperCase()}
+ Loading...
}>
-
*/}
- {' '}
-
- 10sec auto refresh
-
-
-
- 2
-
-
-
- Cotton Blend Mandarin Collar Self One Design Kurta
-
- 4
-
-
*/}
- {/* 3
-
-
-
- Cotton Blend Mandarin Collar Self One Design Kurta
-
- 1
-
- View All
-
*/}
- ({
- value: option?.UserId,
- label: option?.UserName,
- }))}
- label={}
- className="field-DropDown"
- onChangeFunction={(e) => UserDropDownChange(e)}
- isOnchanges={selectedUserData ? true : false}
- valueData={selectedUserData}
- disabled={disabled}
- />
-
);
};
diff --git a/src/Pages/DashBoard/TopSellingProductsChart.jsx b/src/Pages/DashBoard/TopSellingProductsChart.jsx
index 28d81d9..cb8ca69 100644
--- a/src/Pages/DashBoard/TopSellingProductsChart.jsx
+++ b/src/Pages/DashBoard/TopSellingProductsChart.jsx
@@ -1,525 +1,561 @@
-import { useState, useEffect, useRef, useLayoutEffect, useMemo } from 'react';
-import { BarChart, Bar, PieChart, Pie, Cell, XAxis, YAxis, CartesianGrid, Legend, Tooltip, ResponsiveContainer } from 'recharts';
-import { TrendingUp, Package, IndianRupee, ChevronLeft, ChevronRight } from 'lucide-react';
+import {
+ useState,
+ useEffect,
+ useRef,
+ useLayoutEffect,
+ useMemo,
+ lazy,
+ Suspense,
+} from 'react';
+import { PieChart, Pie, Cell, Tooltip, ResponsiveContainer } from 'recharts';
+import { TrendingUp, Package, IndianRupee } from 'lucide-react';
import './TopSellingProductsChart.scss';
import { useDispatch } from 'react-redux';
-import { getTopSellingProduct } from '../../Features/ProductPage/ProductPage';
import { getSession } from '../../Services/Others';
import { changeBreadCrumb } from '../../Features/AppPage/CenterPage';
-import { Switch, DatePicker } from 'antd';
-import moment from 'moment';
-import dayjs from 'dayjs';
-import { DropDowns } from '../../Components/Forms/DropDown';
-const { RangePicker } = DatePicker;
+import dayjs from 'dayjs';
+
+const DropDowns = lazy(() =>
+ import('../../Components/Forms/DropDown').then((module) => ({
+ default: module.DropDowns,
+ }))
+);
const subDirectory = import.meta.env.BASE_URL;
const items = [
- {
- name: 'Home',
- link: `${subDirectory}app-page/home`,
- },
+ {
+ name: 'Home',
+ link: `${subDirectory}app-page/home`,
+ },
];
-const TopSellingProducts = ({ dates = [null, null], products = [], loading = false, totalPages, page = 1, setPage = () => { }, fetchProducts = () => { }, initialDate = true }) => {
+const TopSellingProducts = ({
+ dates = [null, null],
+ products = [],
+ loading = false,
+ totalPages,
+ page = 1,
+ setPage = () => {},
+ fetchProducts = () => {},
+ initialDate = true,
+}) => {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = today.getMonth();
- const today = new Date();
- const year = today.getFullYear();
- const month = today.getMonth();
+ const formatDate = (date) =>
+ `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
- const formatDate = (date) =>
- `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+ const intialFromDate = `${year}-${String(month + 1).padStart(2, '0')}-01`;
+ const intialToDate = formatDate(today);
- const intialFromDate = `${year}-${String(month + 1).padStart(2, '0')}-01`;
- const intialToDate = formatDate(today);
+ const dispatch = useDispatch();
- const dispatch = useDispatch();
+ const AppId = getSession('AppId');
+ const CompId = getSession('CompId');
+ const BranchId = getSession('BranchId');
- const AppId = getSession('AppId');
- const CompId = getSession('CompId');
- const BranchId = getSession('BranchId');
+ const [chartType, setChartType] = useState('bar');
+ const [metric, setMetric] = useState('sales');
+ const chartWrapperRef = useRef(null);
+ const [containerWidth, setContainerWidth] = useState(800); // fallback
+ const [windowWidth, setWindowWidth] = useState(window.innerWidth);
+ const [hoveredItem, setHoveredItem] = useState(null);
+ const [mousePosition, setMousePosition] = useState({ x: 0, y: 0 });
- const [chartType, setChartType] = useState('bar');
- const [metric, setMetric] = useState('sales');
- const chartWrapperRef = useRef(null);
- const [containerWidth, setContainerWidth] = useState(800); // fallback
- const [windowWidth, setWindowWidth] = useState(window.innerWidth);
- const [hoveredItem, setHoveredItem] = useState(null);
- const [mousePosition, setMousePosition] = useState({ x: 0, y: 0 });
- const startIndex = (page - 1) * 10;
+ console.log(products?.[0]?.TotalCount, 'products');
- console.log(products?.[0]?.TotalCount, "products")
+ const options = useMemo(() => {
+ const total = products?.[0]?.TotalCount || 0;
+ const perPage = 10;
- const options = useMemo(() => {
- const total = products?.[0]?.TotalCount || 0;
- const perPage = 10;
+ const totalPages = Math.ceil(total / perPage);
- const totalPages = Math.ceil(total / perPage);
+ const arr = [];
- const arr = [];
+ for (let page = 1; page <= totalPages; page++) {
+ const start = (page - 1) * perPage + 1;
+ const end = Math.min(page * perPage, total);
- for (let page = 1; page <= totalPages; page++) {
- const start = (page - 1) * perPage + 1;
- const end = Math.min(page * perPage, total);
-
- arr.push({
- label: `${start}-${end}`,
- value: page
- });
- }
-
- return arr;
- }, [products?.[0]?.TotalCount]);
-
- useLayoutEffect(() => {
- if (!chartWrapperRef.current) return;
- const el = chartWrapperRef.current;
-
- // set initial width
- setContainerWidth(el.clientWidth || 800);
-
- // ResizeObserver to update container width precisely
- const ro = new ResizeObserver(entries => {
- for (const entry of entries) {
- const w = Math.floor(entry.contentRect.width);
- if (w && w !== containerWidth) setContainerWidth(w);
- }
- });
- ro.observe(el);
-
- return () => ro.disconnect();
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [chartWrapperRef.current]);
- // breakpoints
- const mobileBreakpoint = 430; // you said < 430px is problematic
- const isNarrow = containerWidth <= mobileBreakpoint;
-
- // compute sizes based on actual container width
- // make pie fill a good portion of container (leave some padding)
- const pieOuterRadius = Math.max(48, Math.floor(containerWidth * (isNarrow ? 0.36 : 0.28)));
- const pieInnerRadius = Math.floor(pieOuterRadius * (isNarrow ? 0.5 : 0.55));
-
- // height for ResponsiveContainer: tether to containerWidth so chart stays proportional
- const responsiveHeight = Math.max(220, Math.floor(containerWidth * (isNarrow ? 0.62 : 0.5)));
-
- // tweak minAngle: small screens should allow smaller minAngle so slices remain visible
- const minAngle = isNarrow ? 4 : 8;
-
-
- console.log(pieOuterRadius, "pieOuterRadius")
-
- // const COLORS = ['#2563eb', '#7c3aed', '#db2777', '#ea580c', '#16a34a', '#0891b2', '#d97706', '#65a30d', '#4f46e5', '#0d9488'];
- const COLORS = [
- '#4f8df5', // lighter blue (was #2563eb)
- '#9a6df3', // lighter violet (was #7c3aed)
- '#e95b96', // lighter pink (was #db2777)
- '#f48b3c', // lighter orange (was #ea580c)
- '#34c86a', // lighter green (was #16a34a)
- '#33bcd4', // lighter cyan (was #0891b2)
- '#e39a1a', // lighter amber (was #d97706)
- '#8bc329', // lighter lime (was #65a30d)
- '#6d63ef', // lighter indigo (was #4f46e5)
- '#35bfa9' // lighter teal (was #0d9488)
- ];
-
- useEffect(() => {
- try {
- dispatch(changeBreadCrumb({ items: items }));
- } catch (error) {
- console.log(error?.message, 'error displaying breadcrumbs');
- }
- }, []);
-
- const handlePageChange = (data) => {
- setPage(prev => prev + data)
+ arr.push({
+ label: `${start}-${end}`,
+ value: page,
+ });
}
- const CustomTooltip = ({ active, payload }) => {
- if (active && payload && payload?.[0]) {
- const product = payload?.[0]?.payload;
- return (
-
-
-
- {pinInput && (
-
- ChangeMethod(e)}
- />
-
-
- {[0, 1, 2, 3].map((i) => (
- (inputRefs.current[i] = el)}
- className="inputNumber"
- type="text"
- inputMode="numeric"
- pattern="[0-9]"
- maxLength={1}
- onChange={(e) => handleChange(i, e)}
- onKeyDown={(e) => handleKeyDown(i, e)}
- style={{
- textAlign: 'center',
- width: '40px',
- fontSize: '20px',
- }}
- />
- ))}
-
- )}
-
-
-
+ >
+ <>
+
+
+
+
+ ({
+ value: option?.UserId,
+ label: option?.UserName,
+ }))}
+ label={}
+ className="field-DropDown"
+ onChangeFunction={(e) => UserDropDownChange(e)}
+ isOnchanges={selectedUserData ? true : false}
+ valueData={selectedUserData}
+ disabled={disabled}
+ />
+
-
- }
- />
+
+ {pinInput && (
+
+ ChangeMethod(e)}
+ />
+
+ Loading...
}>
+
+ {[0, 1, 2, 3].map((i) => (
+ (inputRefs.current[i] = el)}
+ className="inputNumber"
+ type="text"
+ inputMode="numeric"
+ pattern="[0-9]"
+ maxLength={1}
+ onChange={(e) => handleChange(i, e)}
+ onKeyDown={(e) => handleKeyDown(i, e)}
+ style={{
+ textAlign: 'center',
+ width: '40px',
+ fontSize: '20px',
+ }}
+ />
+ ))}
+
+ )}
+
+
+
+
+
-
- );
- }
- return null;
- };
+ return arr;
+ }, [products?.[0]?.TotalCount]);
- const renderPercentInside = ({
- cx, cy, midAngle, innerRadius, outerRadius, percent, value
- }) => {
- const percentValue = Math.round(percent * 100);
- // hide labels for very small percentages on narrow screens
- if (percentValue < (isNarrow ? 3 : 2)) return null;
+ useLayoutEffect(() => {
+ if (!chartWrapperRef.current) return;
+ const el = chartWrapperRef.current;
- const RADIAN = Math.PI / 180;
- // place label inside slice (closer to inner radius on narrow screens)
- const radius = innerRadius + (outerRadius - innerRadius) * (isNarrow ? 0.55 : 0.6);
+ // set initial width
+ setContainerWidth(el.clientWidth || 800);
- const x = cx + radius * Math.cos(-midAngle * RADIAN);
- const y = cy + radius * Math.sin(-midAngle * RADIAN);
+ // ResizeObserver to update container width precisely
+ const ro = new ResizeObserver((entries) => {
+ for (const entry of entries) {
+ const w = Math.floor(entry.contentRect.width);
+ if (w && w !== containerWidth) setContainerWidth(w);
+ }
+ });
+ ro.observe(el);
- const fontSize = isNarrow ? 10 : 12;
+ return () => ro.disconnect();
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [chartWrapperRef.current]);
+ // breakpoints
+ const mobileBreakpoint = 430; // you said < 430px is problematic
+ const isNarrow = containerWidth <= mobileBreakpoint;
- // choose contrasting color: white usually works on colored slices
- return (
- {product?.ProdName} - {product?.UOMName}
- {(product?.BrandName) ?Brand: {product?.BrandName}
: null} -
-
- Variants:
- {product?.variantDetails?.map((variant, idx) => ( -
- {variant?.ProdVariantName}:
-
- {variant?.SalesCount} sold | ₹{variant?.Revenue}
-
-
- ))}
-
-
-
- Total Sales:
- {product?.TotalSoldQty}
-
-
- Total Revenue:
- ₹{product?.TotalRevenue}
-
-
-
)}
-
- {/* Header */}
- {/*
+ {/* {`${percentValue}%`} */}
+ {value}
+
);
+ };
+ const getBenchmarkValue = (maxValue) => {
+ if (maxValue <= 0) return 100;
+
+ const benchmarks = [
+ // Fine granularity for small numbers, coarser for large numbers
+ 1, 2, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80, 90, 100, 125,
+ 150, 175, 200, 225, 250, 275, 300, 350, 400, 450, 500, 600, 700, 800, 900,
+ 1000, 1250, 1500, 1750, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 6000,
+ 7000, 8000, 9000, 10000, 12500, 15000, 17500, 20000, 25000, 30000, 35000,
+ 40000, 45000, 50000, 60000, 70000, 80000, 90000, 100000, 125000, 150000,
+ 175000, 200000, 250000, 300000, 350000, 400000, 450000, 500000, 600000,
+ 700000, 800000, 900000, 1000000,
+ ];
+
+ const benchmark = benchmarks.find((b) => b >= maxValue);
+ return benchmark || Math.ceil(maxValue / 10000) * 10000;
+ };
+
+ const chartData = products?.map((p) => ({
+ ...p,
+ name: p?.ProdName,
+ value: metric === 'sales' ? p?.TotalSoldQty : p?.TotalRevenue,
+ benchMarkValue:
+ metric === 'sales' ? p?.TotalRevenueCount : p?.TotalRevenueAmount,
+ }));
+
+ const benchmarkValue = getBenchmarkValue(
+ Math.max(...(chartData?.map((d) => d?.benchMarkValue) || [0]))
+ );
+
+ return (
+
+ );
};
-export default TopSellingProducts;
\ No newline at end of file
+export default TopSellingProducts;
diff --git a/src/Pages/DeliveryChallan/DeliveryChallan.scss b/src/Pages/DeliveryChallan/DeliveryChallan.scss
index 7adb85d..0818c13 100644
--- a/src/Pages/DeliveryChallan/DeliveryChallan.scss
+++ b/src/Pages/DeliveryChallan/DeliveryChallan.scss
@@ -4,7 +4,7 @@
flex-wrap: wrap;
gap: 1rem;
- .ant-input-affix-wrapper>input.ant-input {
+ .ant-input-affix-wrapper > input.ant-input {
padding: 4px 1px !important;
padding-top: 1rem !important;
}
@@ -61,6 +61,10 @@
.DeliveryChallan-inputForm .ant-table-content {
width: 70vw;
}
+.DeliveryChallan-inputForm .ant-table-thead tr {
+ background-color: #2c88ee !important;
+
+ }
.DeliveryChallan-inputForm {
display: flex;
@@ -107,8 +111,8 @@
// right: 100px;
}
-.ant-table-wrapper .ant-table-tbody>tr.ant-table-row:hover>td,
-.ant-table-wrapper .ant-table-tbody>tr>th.ant-table-cell-row-hover>td.ant-table-cell-row-hover {
+.ant-table-wrapper .ant-table-tbody > tr.ant-table-row:hover > td,
+.ant-table-wrapper .ant-table-tbody > tr > th.ant-table-cell-row-hover > td.ant-table-cell-row-hover {
background: rgb(224, 223, 223) !important;
font-size: unset !important;
transition-duration: 0.4s !important;
@@ -129,7 +133,6 @@
}
.Deliverychallan-table {
-
// width: 70px;
.ant-table table {
border-spacing: 0px;
@@ -138,4 +141,8 @@
.ant-table-wrapper table {
width: 84% !important;
}
+}
+.product-scan .sales-quotation{
+ display: flex;
+
}
\ No newline at end of file
diff --git a/src/Pages/DeliveryChallan/Deliverychallan.jsx b/src/Pages/DeliveryChallan/Deliverychallan.jsx
index 20a8ac9..e851d21 100644
--- a/src/Pages/DeliveryChallan/Deliverychallan.jsx
+++ b/src/Pages/DeliveryChallan/Deliverychallan.jsx
@@ -61,6 +61,7 @@ import { useSelector } from 'react-redux';
import { getPrintSelectionComponentData } from '../../Features/ThemeChange/ThemeChange.js';
import { DCPDFMobilePrint } from './DCPDFMobilePrint.js';
import { isMobile } from 'react-device-detect';
+
const DeliveryChellanForm = () => {
const { SadminuserAccess } = useAuth();
diff --git a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
index b023641..46669ca 100644
--- a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
+++ b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoice.scss
@@ -24,6 +24,9 @@
vertical-align: middle;
height: 35px;
}
+ .ant-table-thead tr {
+ background-color: #2c88ee !important;
+ }
}
.dc-to-invoice-payment-mode {
@@ -46,4 +49,16 @@
margin: 0px 2rem;
gap: 10px;
padding-top: 0;
-}
\ No newline at end of file
+}
+
+.delivery-challan-to-invoice-form {
+ width: 100%;
+}
+
+.DCformDivAnt {
+ display: flex;
+ align-items: flex-start;
+ gap: 1rem;
+ justify-content: flex-start;
+ flex-direction: column;
+}
diff --git a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
index 59131d3..259458b 100644
--- a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
+++ b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceForm.jsx
@@ -342,7 +342,7 @@ const DeliveryChallanToInvoiceForm = () => {
-
*/}
+ useEffect(() => {
+ try {
+ dispatch(changeBreadCrumb({ items: items }));
+ } catch (error) {
+ console.log(error?.message, 'error displaying breadcrumbs');
+ }
+ }, []);
-
- {/* Stats Cards */}
- Top Selling Products
-
- current && current > moment().endOf('day')}
- onChange={async (dates) => {
- setDates(dates);
- const FromDate = dates?.[0]?.format('YYYY-MM-DD') || intialFromDate;
- const ToDate = dates?.[1]?.format('YYYY-MM-DD') || intialToDate;
- await fetchProducts({ AppId, CompId, BranchId, FromDate, ToDate, pageNumber: 1 });
- setPage(1);
- }}
- value={dates}
- />
-
- Date Range :
-
-
-
- {/* Controls */}
-
-
-
-
-
-
- Total Products
-{products?.length}
-
-
-
-
-
-
- Total Sales
-- {products?.reduce((sum, p) => sum + (p?.TotalSoldQty || 0), 0)} -
-
-
-
-
-
-
- Total Revenue
-- ₹{products?.reduce((sum, p) => sum + (p?.TotalRevenue || 0), 0)?.toFixed(2)} -
-
-
-
- {((initialDate ? true : (!dates && !dates?.[0] && !dates?.[1])) && intialFromDate && intialToDate) &&
- {
- setPage(value);
- const FromDate = dates?.[0]?.format('YYYY-MM-DD') || intialFromDate;
- const ToDate = dates?.[1]?.format('YYYY-MM-DD') || intialToDate;
- await fetchProducts({ AppId, CompId, BranchId, FromDate, ToDate, pageNumber: value });
- }}
- isOnchanges={page ? true : false}
- />
-
-
-
-
- setMetric('sales')}
- className={`btn-metric ${metric === 'sales' ? 'active' : ''}`}
- >
-
- setMetric('revenue')}
- className={`btn-metric ${metric === 'revenue' ? 'active' : ''}`}
- >
-
-
- {/* setChartType(checked ? 'bar' : 'pie')}
- checkedChildren="Bar Chart"
- unCheckedChildren="Pie Chart"
- className="bar-pie-switch"
- value={chartType === 'bar' ? true : false}
- /> */}
-
- {/* {(dates?.[0] && dates?.[1]) && (
- setChartType('bar')}
- className={`btn-chart-type ${chartType === 'bar' ? 'active' : ''}`}
- >
- Bar Chart
-
- setChartType('pie')}
- className={`btn-chart-type ${chartType === 'pie' ? 'active' : ''}`}
- >
- Pie Chart
-
-
-
-
- )} */}
-
- {`${dates[0]?.format('DD/MMM/YYYY') || intialFromDate} - ${dates[1]?.format('DD/MMM/YYYY') || intialToDate}`}
- {`${dayjs(intialFromDate)?.format('DD/MMM/YYYY')} - ${dayjs(intialToDate)?.format('DD/MMM/YYYY')}`}
}
-
-
-
- {/* Chart */}
-
+ const CustomTooltip = ({ active, payload }) => {
+ if (active && payload && payload?.[0]) {
+ const product = payload?.[0]?.payload;
+ return (
+
-
-
-
-
- {loading && products?.length === 0 ? (
- with this */
- /* PIE + RIGHT-LEGEND: replace the existing pie rendering */
-
-
-
-
-
- ) : chartData?.length === 0 ? (
-
- No data available
-
- ) : (
- <>
- {chartType === 'bar' ? (
-
-
- ) : (
- /* Replace your existing
-
-
- {chartData?.length > 0 ? (
- <>
- {chartData?.map((item, index) => (
-
- {[
- 0,
- Math.round(benchmarkValue * 0.25),
- Math.round(benchmarkValue * 0.5),
- Math.round(benchmarkValue * 0.75),
- benchmarkValue
- ].map((num, i) => (
-
-
-
-
-
- ))}
- {num}
- {
- setHoveredItem(item);
- setMousePosition({ x: e.clientX, y: e.clientY });
- }}
- // style={{}}
- onMouseLeave={() => setHoveredItem(null)}
- onMouseMove={(e) => setMousePosition({ x: e.clientX, y: e.clientY })}
- >
-
- ))}
-
-
- ) : (
- {`#${(index + 1) + ((page - 1) * 10)}`}{item?.name}
-
-
-
-
-
- {/* {((item?.value / Math.max(...chartData.map(d => d?.value))) * 100).toFixed(1)}% */}
-
-
- {item?.value}
-
-
- )}
-
-
- No Data
- 0
-
-
-
- )}
-
-
- )}
-
-
-
-
- {chartData.map((entry, index) => (
- |
- ))}
-
-
-
-
-
-
- {(() => {
- const total = chartData.reduce((s, d) => s + (Number(d?.value || 0)), 0) || 1;
- return chartData.map((d, i) => {
- const color = COLORS[i % COLORS.length];
- const value = Number(d?.value || 0);
- const percent = total ? ((value / total) * 100) : 0;
- return (
-
-
-
-
- );
- });
- })()}
-
-
- {d?.name}
-
- {value}
- {percent.toFixed(2)}%
-
-
+
+ );
+ }
+ return null;
+ };
+
+ const renderPercentInside = ({
+ cx,
+ cy,
+ midAngle,
+ innerRadius,
+ outerRadius,
+ percent,
+ value,
+ }) => {
+ const percentValue = Math.round(percent * 100);
+ // hide labels for very small percentages on narrow screens
+ if (percentValue < (isNarrow ? 3 : 2)) return null;
+
+ const RADIAN = Math.PI / 180;
+ // place label inside slice (closer to inner radius on narrow screens)
+ const radius =
+ innerRadius + (outerRadius - innerRadius) * (isNarrow ? 0.55 : 0.6);
+
+ const x = cx + radius * Math.cos(-midAngle * RADIAN);
+ const y = cy + radius * Math.sin(-midAngle * RADIAN);
+
+ const fontSize = isNarrow ? 10 : 12;
+
+ // choose contrasting color: white usually works on colored slices
+ return (
+ + {product?.ProdName} - {product?.UOMName} +
+ {product?.BrandName ? ( +Brand: {product?.BrandName}
+ ) : null} +
+
+ Variants:
+ {product?.variantDetails?.map((variant, idx) => ( +
+
+ {variant?.ProdVariantName}:
+
+
+ {variant?.SalesCount} sold | ₹{variant?.Revenue}
+
+
+ ))}
+
+
+ Total Sales:
+ {product?.TotalSoldQty}
- {hoveredItem && (
-
-
- )}
+
+ Total Revenue:
+ ₹{product?.TotalRevenue}
+
+
+
+ {hoveredItem && (
+
+ {/* Stats Cards */}
+
+
+ {(initialDate ? true : !dates && !dates?.[0] && !dates?.[1]) &&
+ intialFromDate &&
+ intialToDate && (
+
+
+
+ {/* Controls */}
+
+
+
+
+
+
+ Total Products
+{products?.length}
+
+
+
+
+
+
+ Total Sales
++ {products?.reduce( + (sum, p) => sum + (p?.TotalSoldQty || 0), + 0 + )} +
+
+
+
+
+
+
+ Total Revenue
++ ₹ + {products + ?.reduce((sum, p) => sum + (p?.TotalRevenue || 0), 0) + ?.toFixed(2)} +
+
+ {
+ setPage(value);
+ const FromDate =
+ dates?.[0]?.format('YYYY-MM-DD') || intialFromDate;
+ const ToDate =
+ dates?.[1]?.format('YYYY-MM-DD') || intialToDate;
+ await fetchProducts({
+ AppId,
+ CompId,
+ BranchId,
+ FromDate,
+ ToDate,
+ pageNumber: value,
+ });
+ }}
+ isOnchanges={page ? true : false}
+ />
+
+
+
+ Loading...
}>
+
+
+ setMetric('sales')}
+ className={`btn-metric ${metric === 'sales' ? 'active' : ''}`}
+ >
+
+ setMetric('revenue')}
+ className={`btn-metric ${metric === 'revenue' ? 'active' : ''}`}
+ >
+
+
+
+
+ setChartType('bar')}
+ className={`btn-chart-type ${chartType === 'bar' ? 'active' : ''}`}
+ >
+ Bar Chart
+
+ setChartType('pie')}
+ className={`btn-chart-type ${chartType === 'pie' ? 'active' : ''}`}
+ >
+ Pie Chart
+
+ {`${dayjs(intialFromDate)?.format('DD/MMM/YYYY')} - ${dayjs(intialToDate)?.format('DD/MMM/YYYY')}`}
+ )}
+
+
+ {/* Chart */}
+
+
+
+
+ {loading && products?.length === 0 ? (
+ with this */
+ /* PIE + RIGHT-LEGEND: replace the existing pie rendering */
+
+
+
+
+ ) : chartData?.length === 0 ? (
+ No data available
+ ) : (
+ <>
+ {chartType === 'bar' ? (
+
+
+ ) : (
+ /* Replace your existing
+
+
+ {chartData?.length > 0 ? (
+ <>
+ {chartData?.map((item, index) => (
+
+ {[
+ 0,
+ Math.round(benchmarkValue * 0.25),
+ Math.round(benchmarkValue * 0.5),
+ Math.round(benchmarkValue * 0.75),
+ benchmarkValue,
+ ].map((num, i) => (
+
+
+
+
+
+ ))}
+ {num}
+ {
+ setHoveredItem(item);
+ setMousePosition({
+ x: e.clientX,
+ y: e.clientY,
+ });
+ }}
+ // style={{}}
+ onMouseLeave={() => setHoveredItem(null)}
+ onMouseMove={(e) =>
+ setMousePosition({ x: e.clientX, y: e.clientY })
+ }
+ >
+
+ ))}
+
+ ) : (
+
+ {`#${index + 1 + (page - 1) * 10}`}
+ {item?.name}
+
+
+
+
+
+ {/* {((item?.value / Math.max(...chartData.map(d => d?.value))) * 100).toFixed(1)}% */}
+
+
+
+ {item?.value}
+
+
+
+ )}
+
+
+ No Data
+ 0
+
+
+ )}
+
+ )}
+
+
+
+
+ {chartData.map((entry, index) => (
+ |
+ ))}
+
+
+
+
+
+
+ {(() => {
+ const total =
+ chartData.reduce(
+ (s, d) => s + Number(d?.value || 0),
+ 0
+ ) || 1;
+ return chartData.map((d, i) => {
+ const color = COLORS[i % COLORS.length];
+ const value = Number(d?.value || 0);
+ const percent = total ? (value / total) * 100 : 0;
+ return (
+
+
+
+
+ );
+ });
+ })()}
+
+
+ {d?.name}
+
+
+ {value}
+
+
+ {percent.toFixed(2)}%
+
+
+
+
+ )}
+
@@ -2174,26 +2178,12 @@ const ProductForm = ({ formType }) => {
/>
- {/* */}
-
- {/*
-
-