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

add Description

This commit is contained in:
Tamilselvan 2026-02-26 15:25:43 +05:30
parent bc8dafa167
commit 1c464221a2
11 changed files with 1102 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,11 @@ const BSBillingTable1 = () => {
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const SessionData = useSelector(StoredSessionData);
const BranchId = SessionData?.BranchId;
const AppId = SessionData?.AppId;
@ -2252,8 +2257,7 @@ const BSBillingTable1 = () => {
{OldtableDataTakeAway?.map((item, index) => (
<tr
key={index}
className={`${
item?.SalesId && OrderType !== 'Hold'
className={`${item?.SalesId && OrderType !== 'Hold'
? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row'
}
@ -2348,8 +2352,9 @@ const BSBillingTable1 = () => {
textAlign: 'left',
}}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -2548,8 +2553,7 @@ const BSBillingTable1 = () => {
{OldtableDataDinein?.map((item, index) => (
<tr
key={OldtableDataTakeAway?.length + index}
className={`${
item?.SalesId
className={`${item?.SalesId
? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row'
}
@ -2845,8 +2849,7 @@ const BSBillingTable1 = () => {
OldtableDataTakeAway?.length +
index
}
className={`${
BookingType === 'Dine In' && item?.SalesId
className={`${BookingType === 'Dine In' && item?.SalesId
? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row'
}
@ -2979,8 +2982,9 @@ const BSBillingTable1 = () => {
textAlign: 'left',
}}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -3191,8 +3195,7 @@ const BSBillingTable1 = () => {
tableDataTakeAway?.length +
index
}
className={`${
BookingType === 'Dine In' && item?.SalesId
className={`${BookingType === 'Dine In' && item?.SalesId
? 'Billing-Table1-row-disabled'
: 'Billing-Table1-row'
}

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

@ -91,6 +91,12 @@ const BsBill2 = () => {
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
console.log(imeiModal, "imeiModalimeiModal")
const [count, setCount] = useState(1);
const ReorderProductData = useSelector(GlobalReorderProductDetails);
const CartOrderDetails = useSelector(GlobalOrderCardDetails);
@ -1379,7 +1385,7 @@ const BsBill2 = () => {
style={{ fontFamily: SelectedFont }}
onClick={() =>
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0) &&
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
handleImeiDetails(item)
}
>
@ -1848,7 +1854,7 @@ const BsBill2 = () => {
style={{ fontFamily: SelectedFont }}
onClick={() =>
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0) &&
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
handleImeiDetails(item)
}
>

15
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
View File

@ -147,6 +147,11 @@ const BSBillingTable3 = () => {
item.SettingIdName.toLowerCase() === 'shortcutkeys' &&
item.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
console.log(preferenceshortcutkey, 'preferenceshortcutkey');
const tableDataDinein = tableData?.filter(
(a, b) => a.BookingTypeName === 'Dine In' && !a?.SalesId
@ -2492,8 +2497,9 @@ const BSBillingTable3 = () => {
className="Table3-items for-combo"
style={{ fontFamily: 'Poppins' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -3086,8 +3092,9 @@ const BSBillingTable3 = () => {
className="Table3-items for-combo"
style={{ fontFamily: 'Poppins' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item, index)
}

13
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBillingTable4.jsx
View File

@ -104,6 +104,11 @@ const BSBillingTable4 = () => {
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
(item) => item.SettingIdName === 'BillItemsOrder'
)?.SettingValue;
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const SessionData = useSelector(StoredSessionData);
const BranchId = SessionData?.BranchId;
const AppId = SessionData?.AppId;
@ -2484,8 +2489,8 @@ const BSBillingTable4 = () => {
className="Table4-items for-combo"
style={{ fontFamily: 'Poppins' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -3068,8 +3073,8 @@ const BSBillingTable4 = () => {
className="Table4-items for-combo"
style={{ fontFamily: 'Poppins' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item, index)
}

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

@ -109,6 +109,11 @@ const BsBill = () => {
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const [count, setCount] = useState(1);
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
@ -3393,8 +3398,8 @@ const BsBill = () => {
<td
className="BSBillingTable5-table-td for-combo"
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -4061,8 +4066,8 @@ const BsBill = () => {
<td
className="BSBillingTable5-table-td for-combo"
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}

17
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx
View File

@ -137,6 +137,11 @@ const BSBillingTable6 = () => {
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
(item) => item.SettingIdName === 'BillItemsOrder'
)?.SettingValue;
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
const OrderType = useSelector(GlobalOrderType);
const GlobEstBooking = useSelector(GlobalEstimateBooking);
@ -1485,7 +1490,7 @@ const BSBillingTable6 = () => {
CompleteRemove: true,
InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
BuyInwardDtlId: null,
OrderRate:isPaidProductAvailableInCart?.OrderRate,
OrderRate: isPaidProductAvailableInCart?.OrderRate,
Offer: 0,
});
} else if (
@ -1570,7 +1575,7 @@ const BSBillingTable6 = () => {
InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null,
Offer: item?.Offer,
OrderRate:item?.OrderRate,
OrderRate: item?.OrderRate,
});
await ChangeFreeprodlistFn({
OverAllFreeQty: freeProdList?.OverAllFreeQty,
@ -2304,8 +2309,8 @@ const BSBillingTable6 = () => {
className="BillingTable6-table-td for-combo"
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}
@ -2855,8 +2860,8 @@ const BSBillingTable6 = () => {
className="BillingTable6-table-td for-combo"
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}

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

@ -158,6 +158,11 @@ const BSBillingTable7 = () => {
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
useEffect(() => {
if (SelectedFont) {
WebFont.load({
@ -2730,7 +2735,7 @@ const BSBillingTable7 = () => {
}}
onClick={() =>
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0) &&
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
handleImeiDetails(item)
}
>

47
src/Pages/BookingScreen/Components/BSBillingTables/BSImeiDetails/BSImeiDetails.jsx
View File

@ -14,6 +14,7 @@ import {
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { useDispatch, useSelector } from 'react-redux';
import { validateSafeInput } from '../../../../../Services/Others';
import { TextAreaInput } from '../../../../../../ownLib/my-ui-lib';
const BSImeiDetails = (props) => {
const formRef = useRef(null);
const dispatch = useDispatch();
@ -26,7 +27,7 @@ const BSImeiDetails = (props) => {
const [SerialNumberList, setSerialNumberList] = useState([]);
const [IMEINumberList, setIMEINumberList] = useState([]);
console.log(SerialNumberList, IMEINumberList, 'SerialNumberList');
console.log(props, 'propsprops');
useEffect(() => {
let productidentifier = ProductDetail?.ProductIdentifierDtls
? ProductDetail?.ProductIdentifierDtls
@ -47,6 +48,10 @@ const BSImeiDetails = (props) => {
return [imei1, imei2].filter(Boolean).join(',');
})
);
formRef?.current?.setFieldsValue({
description: productidentifier?.[0]?.Description || "",
})
}, []);
const CloseDeviceDetailModal = () => {
props.handleDeviceDetailClose();
@ -65,7 +70,8 @@ const BSImeiDetails = (props) => {
} else {
setSerialNumberList([...SerialNumberList, e]);
}
} else {
}
else {
setMessageType('error');
setMessageData('Already Selected ');
}
@ -83,7 +89,7 @@ const BSImeiDetails = (props) => {
}
} else {
setMessageType('error');
setMessageData('Already Selected');
setMessageData('you cant enter more than Order Qty');
}
formRef.current?.resetFields();
@ -115,7 +121,7 @@ const BSImeiDetails = (props) => {
}
} else {
setMessageType('error');
setMessageData('Already Selected');
setMessageData('you cant enter more than Order Qty');
}
formRef.current?.resetFields();
};
@ -131,6 +137,8 @@ const BSImeiDetails = (props) => {
setMessageType(null);
}, []);
const AddDeviceDetails = () => {
console.log(formRef?.current?.getFieldsValue, "formRef?.current?.getFieldsValue")
const maxLength = Math.max(SerialNumberList.length, IMEINumberList.length);
// Create the new object array
const IdentifyDetails = Array.from({ length: maxLength }, (_, index) => {
@ -143,6 +151,7 @@ const BSImeiDetails = (props) => {
IMEI1: imeiPair[0] || '', // First IMEI number
IMEI2: imeiPair[1] || '', // Second IMEI number
MacId: '', // Default empty macid
Description: formRef.current?.getFieldsValue()?.description || '',
};
});
console.log(IdentifyDetails, 'IdentifyDetails');
@ -175,7 +184,7 @@ const BSImeiDetails = (props) => {
<DefaultModal
title={
<div className="EditQuantity-title">
<FormHeader title={'Device Identifier'} />
<FormHeader title={'Device Identifieer'} />
</div>
}
open={DeviceDetailOpen}
@ -226,6 +235,7 @@ const BSImeiDetails = (props) => {
{RadioBtnSelection == 'Serial' && (
<div>
<div className="SerialNumberColumn">
{ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
<Form.Item name="SerialNumber">
<DropDowns
options={ProductDetail?.FullProductIdentifierDtls?.filter(
@ -246,6 +256,9 @@ const BSImeiDetails = (props) => {
onChangeFunction={(e) => SerialNumberOnchange(e)}
/>
</Form.Item>
}
<Form.Item
name="SerialNumbertext"
rules={[
@ -277,6 +290,7 @@ const BSImeiDetails = (props) => {
></Buttons>
</div>
<div>Serial Number:</div>
<div className="SerialNumber-Selected">
{SerialNumberList?.map((item, index) => (
<div key={index}>
@ -292,9 +306,12 @@ const BSImeiDetails = (props) => {
</div>
</div>
)}
{RadioBtnSelection == 'IMEI' && (
<div>
<div className="SerialNumberColumn">
{ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
<Form.Item name="IMEINumber">
<DropDowns
options={ProductDetail?.FullProductIdentifierDtls?.filter(
@ -317,7 +334,8 @@ const BSImeiDetails = (props) => {
className="field-DropDown"
onChangeFunction={(e) => IMEINumberOnchange(e)}
/>
</Form.Item>
</Form.Item>}
<Form.Item
name="IMEINumbertext"
rules={[
@ -363,7 +381,20 @@ const BSImeiDetails = (props) => {
</div>
</div>
)}
<div style={{ display: "flex", marginTop: "10px" }}>
<Form.Item name="description">
<TextAreaInput
autoComplete="off"
label={<label>Description..</label>}
defaultValue=""
isOnChange={true}
/>
</Form.Item>
</div>
</Form>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Buttons
buttonText="Submit"
@ -372,11 +403,11 @@ const BSImeiDetails = (props) => {
icon={<ArrowRightOutlined />}
></Buttons>
</div>
</div>
</div >
}
handleCancel={CloseDeviceDetailModal}
/>
</div>
</div >
);
};
export default BSImeiDetails;

20
src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
View File

@ -105,6 +105,11 @@ const ComboSalesBillTable = () => {
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const SessionData = useSelector(StoredSessionData);
const BranchId = SessionData?.BranchId;
const AppId = SessionData?.AppId;
@ -1349,7 +1354,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: isPaidproduct?.InwardDtlId,
BuyInwardDtlId: null,
Offer: 0,
OrderRate:isPaidproduct?.OrderRate
OrderRate: isPaidproduct?.OrderRate
});
} else if (isPaidproduct?.OrderQty > item?.OrderQty) {
// Just Decrease Paid Qty
@ -1521,7 +1526,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null,
Offer: item?.Offer,
OrderRate:item?.OrderRate
OrderRate: item?.OrderRate
});
await ChangeFreeprodlistFn({
OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@ -1600,7 +1605,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null,
Offer: item?.Offer,
OrderRate:item?.OrderRate
OrderRate: item?.OrderRate
});
await ChangeFreeprodlistFn({
OverAllFreeQty: isCheckFreeProduct?.OverAllFreeQty,
@ -1634,7 +1639,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: item?.InwardDtlId,
BuyInwardDtlId: null,
Offer: item?.Offer,
OrderRate:item?.OrderRate
OrderRate: item?.OrderRate
});
await ChangeOfferAppliedProdsFn({
inwardDtlId: item?.InwardDtlId,
@ -1666,7 +1671,7 @@ const ComboSalesBillTable = () => {
InwardDtlId: isPaidProductAvailableInCart?.InwardDtlId,
BuyInwardDtlId: null,
Offer: 0,
OrderRate:isPaidProductAvailableInCart?.OrderRate
OrderRate: isPaidProductAvailableInCart?.OrderRate
});
} else if (
isPaidProductAvailableInCart?.OrderQty > item?.OrderQty
@ -2540,8 +2545,9 @@ const ComboSalesBillTable = () => {
key={`prod-${index}`}
className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
onClick={() =>
row.FullProductIdentifierDtls?.length > 0 ||
row.ProductIdentifierDtls?.length > 0
(row.FullProductIdentifierDtls?.length > 0 ||
row.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(row)
: editField && handleEditQuantity(row)
}

9
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx
View File

@ -111,6 +111,11 @@ const StandardTable = () => {
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
setting?.SettingValue === 'Y'
);
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
setting?.SettingValue === 'Y'
);
const SessionData = useSelector(StoredSessionData);
const BranchId = SessionData?.BranchId;
const AppId = SessionData?.AppId;
@ -3181,8 +3186,8 @@ const StandardTable = () => {
"'Inter', ui-sans-serif, system-ui, sans-serif",
}}
onClick={() =>
item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0
(item.FullProductIdentifierDtls?.length > 0 ||
item.ProductIdentifierDtls?.length > 0 || imeiModal)
? handleImeiDetails(item)
: editField && handleEditQuantity(item)
}

6
src/Pages/Preference/PreferenceList.jsx
View File

@ -108,6 +108,7 @@ const PreferenceList = () => {
],
scanlayout: allSettingsMap['scanlayout']?.value === 'Y',
verifyproduct: allSettingsMap['verifyproduct']?.value === 'Y',
imeidetails:allSettingsMap['imeidetails']?.value === 'Y',
customisedbillnumber: allSettingsMap['customisedbillnumber']?.value === 'Y',
upiqr: allSettingsMap['upiqr']?.value === 'Y',
lowstockreport: allSettingsMap['lowstockreport']?.value === 'Y',
@ -309,6 +310,7 @@ const PreferenceList = () => {
mobilea4: values.mobilea4,
scanlayout: values.scanlayout,
verifyproduct: values.verifyproduct,
imeidetails:values.imeidetails,
customisedbillnumber: values.customisedbillnumber,
upiqr: values.upiqr,
lowstockreport: values.lowstockreport,
@ -633,6 +635,10 @@ const PreferenceList = () => {
'verifyproduct',
'Do you Want Verify the Product?'
)}
{renderCheckbox(
'imeidetails',
'Do you want to open the IMEI model without IMEI details?'
)}
{renderCheckbox(
'customisedbillnumber',
'Do you Want Customised Bill Number?'