add Description
This commit is contained in:
parent
bc8dafa167
commit
1c464221a2
|
|
@ -106,6 +106,11 @@ const BSBillingTable1 = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
||||||
setting?.SettingValue === 'Y'
|
setting?.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const SessionData = useSelector(StoredSessionData);
|
const SessionData = useSelector(StoredSessionData);
|
||||||
const BranchId = SessionData?.BranchId;
|
const BranchId = SessionData?.BranchId;
|
||||||
const AppId = SessionData?.AppId;
|
const AppId = SessionData?.AppId;
|
||||||
|
|
@ -2252,8 +2257,7 @@ const BSBillingTable1 = () => {
|
||||||
{OldtableDataTakeAway?.map((item, index) => (
|
{OldtableDataTakeAway?.map((item, index) => (
|
||||||
<tr
|
<tr
|
||||||
key={index}
|
key={index}
|
||||||
className={`${
|
className={`${item?.SalesId && OrderType !== 'Hold'
|
||||||
item?.SalesId && OrderType !== 'Hold'
|
|
||||||
? 'Billing-Table1-row-disabled'
|
? 'Billing-Table1-row-disabled'
|
||||||
: 'Billing-Table1-row'
|
: 'Billing-Table1-row'
|
||||||
}
|
}
|
||||||
|
|
@ -2348,8 +2352,9 @@ const BSBillingTable1 = () => {
|
||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
}}
|
}}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
|
||||||
item.ProductIdentifierDtls?.length > 0
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -2548,8 +2553,7 @@ const BSBillingTable1 = () => {
|
||||||
{OldtableDataDinein?.map((item, index) => (
|
{OldtableDataDinein?.map((item, index) => (
|
||||||
<tr
|
<tr
|
||||||
key={OldtableDataTakeAway?.length + index}
|
key={OldtableDataTakeAway?.length + index}
|
||||||
className={`${
|
className={`${item?.SalesId
|
||||||
item?.SalesId
|
|
||||||
? 'Billing-Table1-row-disabled'
|
? 'Billing-Table1-row-disabled'
|
||||||
: 'Billing-Table1-row'
|
: 'Billing-Table1-row'
|
||||||
}
|
}
|
||||||
|
|
@ -2845,8 +2849,7 @@ const BSBillingTable1 = () => {
|
||||||
OldtableDataTakeAway?.length +
|
OldtableDataTakeAway?.length +
|
||||||
index
|
index
|
||||||
}
|
}
|
||||||
className={`${
|
className={`${BookingType === 'Dine In' && item?.SalesId
|
||||||
BookingType === 'Dine In' && item?.SalesId
|
|
||||||
? 'Billing-Table1-row-disabled'
|
? 'Billing-Table1-row-disabled'
|
||||||
: 'Billing-Table1-row'
|
: 'Billing-Table1-row'
|
||||||
}
|
}
|
||||||
|
|
@ -2979,8 +2982,9 @@ const BSBillingTable1 = () => {
|
||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
}}
|
}}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
|
||||||
item.ProductIdentifierDtls?.length > 0
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -3191,8 +3195,7 @@ const BSBillingTable1 = () => {
|
||||||
tableDataTakeAway?.length +
|
tableDataTakeAway?.length +
|
||||||
index
|
index
|
||||||
}
|
}
|
||||||
className={`${
|
className={`${BookingType === 'Dine In' && item?.SalesId
|
||||||
BookingType === 'Dine In' && item?.SalesId
|
|
||||||
? 'Billing-Table1-row-disabled'
|
? 'Billing-Table1-row-disabled'
|
||||||
: 'Billing-Table1-row'
|
: 'Billing-Table1-row'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,12 @@ const BsBill2 = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
||||||
setting?.SettingValue === 'Y'
|
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 [count, setCount] = useState(1);
|
||||||
const ReorderProductData = useSelector(GlobalReorderProductDetails);
|
const ReorderProductData = useSelector(GlobalReorderProductDetails);
|
||||||
const CartOrderDetails = useSelector(GlobalOrderCardDetails);
|
const CartOrderDetails = useSelector(GlobalOrderCardDetails);
|
||||||
|
|
@ -1379,7 +1385,7 @@ const BsBill2 = () => {
|
||||||
style={{ fontFamily: SelectedFont }}
|
style={{ fontFamily: SelectedFont }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
(item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0) &&
|
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
|
||||||
handleImeiDetails(item)
|
handleImeiDetails(item)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|
@ -1848,7 +1854,7 @@ const BsBill2 = () => {
|
||||||
style={{ fontFamily: SelectedFont }}
|
style={{ fontFamily: SelectedFont }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
(item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0) &&
|
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
|
||||||
handleImeiDetails(item)
|
handleImeiDetails(item)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -147,6 +147,11 @@ const BSBillingTable3 = () => {
|
||||||
item.SettingIdName.toLowerCase() === 'shortcutkeys' &&
|
item.SettingIdName.toLowerCase() === 'shortcutkeys' &&
|
||||||
item.SettingValue === 'Y'
|
item.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
console.log(preferenceshortcutkey, 'preferenceshortcutkey');
|
console.log(preferenceshortcutkey, 'preferenceshortcutkey');
|
||||||
const tableDataDinein = tableData?.filter(
|
const tableDataDinein = tableData?.filter(
|
||||||
(a, b) => a.BookingTypeName === 'Dine In' && !a?.SalesId
|
(a, b) => a.BookingTypeName === 'Dine In' && !a?.SalesId
|
||||||
|
|
@ -2492,8 +2497,9 @@ const BSBillingTable3 = () => {
|
||||||
className="Table3-items for-combo"
|
className="Table3-items for-combo"
|
||||||
style={{ fontFamily: 'Poppins' }}
|
style={{ fontFamily: 'Poppins' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
|
||||||
item.ProductIdentifierDtls?.length > 0
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -3086,8 +3092,9 @@ const BSBillingTable3 = () => {
|
||||||
className="Table3-items for-combo"
|
className="Table3-items for-combo"
|
||||||
style={{ fontFamily: 'Poppins' }}
|
style={{ fontFamily: 'Poppins' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
|
||||||
item.ProductIdentifierDtls?.length > 0
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item, index)
|
: editField && handleEditQuantity(item, index)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,11 @@ const BSBillingTable4 = () => {
|
||||||
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
|
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
|
||||||
(item) => item.SettingIdName === 'BillItemsOrder'
|
(item) => item.SettingIdName === 'BillItemsOrder'
|
||||||
)?.SettingValue;
|
)?.SettingValue;
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const SessionData = useSelector(StoredSessionData);
|
const SessionData = useSelector(StoredSessionData);
|
||||||
const BranchId = SessionData?.BranchId;
|
const BranchId = SessionData?.BranchId;
|
||||||
const AppId = SessionData?.AppId;
|
const AppId = SessionData?.AppId;
|
||||||
|
|
@ -2484,8 +2489,8 @@ const BSBillingTable4 = () => {
|
||||||
className="Table4-items for-combo"
|
className="Table4-items for-combo"
|
||||||
style={{ fontFamily: 'Poppins' }}
|
style={{ fontFamily: 'Poppins' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -3068,8 +3073,8 @@ const BSBillingTable4 = () => {
|
||||||
className="Table4-items for-combo"
|
className="Table4-items for-combo"
|
||||||
style={{ fontFamily: 'Poppins' }}
|
style={{ fontFamily: 'Poppins' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item, index)
|
: editField && handleEditQuantity(item, index)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,11 @@ const BsBill = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
||||||
setting?.SettingValue === 'Y'
|
setting?.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const [count, setCount] = useState(1);
|
const [count, setCount] = useState(1);
|
||||||
const [messageType, setMessageType] = useState(null);
|
const [messageType, setMessageType] = useState(null);
|
||||||
const [messageData, setMessageData] = useState(null);
|
const [messageData, setMessageData] = useState(null);
|
||||||
|
|
@ -3393,8 +3398,8 @@ const BsBill = () => {
|
||||||
<td
|
<td
|
||||||
className="BSBillingTable5-table-td for-combo"
|
className="BSBillingTable5-table-td for-combo"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -4061,8 +4066,8 @@ const BsBill = () => {
|
||||||
<td
|
<td
|
||||||
className="BSBillingTable5-table-td for-combo"
|
className="BSBillingTable5-table-td for-combo"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,11 @@ const BSBillingTable6 = () => {
|
||||||
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
|
const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find(
|
||||||
(item) => item.SettingIdName === 'BillItemsOrder'
|
(item) => item.SettingIdName === 'BillItemsOrder'
|
||||||
)?.SettingValue;
|
)?.SettingValue;
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
|
const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
|
||||||
const OrderType = useSelector(GlobalOrderType);
|
const OrderType = useSelector(GlobalOrderType);
|
||||||
const GlobEstBooking = useSelector(GlobalEstimateBooking);
|
const GlobEstBooking = useSelector(GlobalEstimateBooking);
|
||||||
|
|
@ -2304,8 +2309,8 @@ const BSBillingTable6 = () => {
|
||||||
className="BillingTable6-table-td for-combo"
|
className="BillingTable6-table-td for-combo"
|
||||||
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
|
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
@ -2855,8 +2860,8 @@ const BSBillingTable6 = () => {
|
||||||
className="BillingTable6-table-td for-combo"
|
className="BillingTable6-table-td for-combo"
|
||||||
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
|
style={{ fontFamily: 'Poppins', textAlign: 'left' }}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -158,6 +158,11 @@ const BSBillingTable7 = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
setting?.SettingIdName?.toLowerCase() === 'shortcutkeys' &&
|
||||||
setting?.SettingValue === 'Y'
|
setting?.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (SelectedFont) {
|
if (SelectedFont) {
|
||||||
WebFont.load({
|
WebFont.load({
|
||||||
|
|
@ -2730,7 +2735,7 @@ const BSBillingTable7 = () => {
|
||||||
}}
|
}}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
(item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0) &&
|
item.ProductIdentifierDtls?.length > 0 || imeiModal) &&
|
||||||
handleImeiDetails(item)
|
handleImeiDetails(item)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ import {
|
||||||
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
|
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
import { useDispatch, useSelector } from 'react-redux';
|
||||||
import { validateSafeInput } from '../../../../../Services/Others';
|
import { validateSafeInput } from '../../../../../Services/Others';
|
||||||
|
import { TextAreaInput } from '../../../../../../ownLib/my-ui-lib';
|
||||||
const BSImeiDetails = (props) => {
|
const BSImeiDetails = (props) => {
|
||||||
const formRef = useRef(null);
|
const formRef = useRef(null);
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
|
@ -26,7 +27,7 @@ const BSImeiDetails = (props) => {
|
||||||
const [SerialNumberList, setSerialNumberList] = useState([]);
|
const [SerialNumberList, setSerialNumberList] = useState([]);
|
||||||
const [IMEINumberList, setIMEINumberList] = useState([]);
|
const [IMEINumberList, setIMEINumberList] = useState([]);
|
||||||
|
|
||||||
console.log(SerialNumberList, IMEINumberList, 'SerialNumberList');
|
console.log(props, 'propsprops');
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let productidentifier = ProductDetail?.ProductIdentifierDtls
|
let productidentifier = ProductDetail?.ProductIdentifierDtls
|
||||||
? ProductDetail?.ProductIdentifierDtls
|
? ProductDetail?.ProductIdentifierDtls
|
||||||
|
|
@ -47,6 +48,10 @@ const BSImeiDetails = (props) => {
|
||||||
return [imei1, imei2].filter(Boolean).join(',');
|
return [imei1, imei2].filter(Boolean).join(',');
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
formRef?.current?.setFieldsValue({
|
||||||
|
description: productidentifier?.[0]?.Description || "",
|
||||||
|
})
|
||||||
}, []);
|
}, []);
|
||||||
const CloseDeviceDetailModal = () => {
|
const CloseDeviceDetailModal = () => {
|
||||||
props.handleDeviceDetailClose();
|
props.handleDeviceDetailClose();
|
||||||
|
|
@ -65,7 +70,8 @@ const BSImeiDetails = (props) => {
|
||||||
} else {
|
} else {
|
||||||
setSerialNumberList([...SerialNumberList, e]);
|
setSerialNumberList([...SerialNumberList, e]);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
setMessageType('error');
|
setMessageType('error');
|
||||||
setMessageData('Already Selected ');
|
setMessageData('Already Selected ');
|
||||||
}
|
}
|
||||||
|
|
@ -83,7 +89,7 @@ const BSImeiDetails = (props) => {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
setMessageType('error');
|
setMessageType('error');
|
||||||
setMessageData('Already Selected');
|
setMessageData('you cant enter more than Order Qty');
|
||||||
}
|
}
|
||||||
|
|
||||||
formRef.current?.resetFields();
|
formRef.current?.resetFields();
|
||||||
|
|
@ -115,7 +121,7 @@ const BSImeiDetails = (props) => {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
setMessageType('error');
|
setMessageType('error');
|
||||||
setMessageData('Already Selected');
|
setMessageData('you cant enter more than Order Qty');
|
||||||
}
|
}
|
||||||
formRef.current?.resetFields();
|
formRef.current?.resetFields();
|
||||||
};
|
};
|
||||||
|
|
@ -131,6 +137,8 @@ const BSImeiDetails = (props) => {
|
||||||
setMessageType(null);
|
setMessageType(null);
|
||||||
}, []);
|
}, []);
|
||||||
const AddDeviceDetails = () => {
|
const AddDeviceDetails = () => {
|
||||||
|
|
||||||
|
console.log(formRef?.current?.getFieldsValue, "formRef?.current?.getFieldsValue")
|
||||||
const maxLength = Math.max(SerialNumberList.length, IMEINumberList.length);
|
const maxLength = Math.max(SerialNumberList.length, IMEINumberList.length);
|
||||||
// Create the new object array
|
// Create the new object array
|
||||||
const IdentifyDetails = Array.from({ length: maxLength }, (_, index) => {
|
const IdentifyDetails = Array.from({ length: maxLength }, (_, index) => {
|
||||||
|
|
@ -143,6 +151,7 @@ const BSImeiDetails = (props) => {
|
||||||
IMEI1: imeiPair[0] || '', // First IMEI number
|
IMEI1: imeiPair[0] || '', // First IMEI number
|
||||||
IMEI2: imeiPair[1] || '', // Second IMEI number
|
IMEI2: imeiPair[1] || '', // Second IMEI number
|
||||||
MacId: '', // Default empty macid
|
MacId: '', // Default empty macid
|
||||||
|
Description: formRef.current?.getFieldsValue()?.description || '',
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
console.log(IdentifyDetails, 'IdentifyDetails');
|
console.log(IdentifyDetails, 'IdentifyDetails');
|
||||||
|
|
@ -175,7 +184,7 @@ const BSImeiDetails = (props) => {
|
||||||
<DefaultModal
|
<DefaultModal
|
||||||
title={
|
title={
|
||||||
<div className="EditQuantity-title">
|
<div className="EditQuantity-title">
|
||||||
<FormHeader title={'Device Identifier'} />
|
<FormHeader title={'Device Identifieer'} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
open={DeviceDetailOpen}
|
open={DeviceDetailOpen}
|
||||||
|
|
@ -226,6 +235,7 @@ const BSImeiDetails = (props) => {
|
||||||
{RadioBtnSelection == 'Serial' && (
|
{RadioBtnSelection == 'Serial' && (
|
||||||
<div>
|
<div>
|
||||||
<div className="SerialNumberColumn">
|
<div className="SerialNumberColumn">
|
||||||
|
{ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
|
||||||
<Form.Item name="SerialNumber">
|
<Form.Item name="SerialNumber">
|
||||||
<DropDowns
|
<DropDowns
|
||||||
options={ProductDetail?.FullProductIdentifierDtls?.filter(
|
options={ProductDetail?.FullProductIdentifierDtls?.filter(
|
||||||
|
|
@ -246,6 +256,9 @@ const BSImeiDetails = (props) => {
|
||||||
onChangeFunction={(e) => SerialNumberOnchange(e)}
|
onChangeFunction={(e) => SerialNumberOnchange(e)}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="SerialNumbertext"
|
name="SerialNumbertext"
|
||||||
rules={[
|
rules={[
|
||||||
|
|
@ -277,6 +290,7 @@ const BSImeiDetails = (props) => {
|
||||||
></Buttons>
|
></Buttons>
|
||||||
</div>
|
</div>
|
||||||
<div>Serial Number:</div>
|
<div>Serial Number:</div>
|
||||||
|
|
||||||
<div className="SerialNumber-Selected">
|
<div className="SerialNumber-Selected">
|
||||||
{SerialNumberList?.map((item, index) => (
|
{SerialNumberList?.map((item, index) => (
|
||||||
<div key={index}>
|
<div key={index}>
|
||||||
|
|
@ -292,9 +306,12 @@ const BSImeiDetails = (props) => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
{RadioBtnSelection == 'IMEI' && (
|
{RadioBtnSelection == 'IMEI' && (
|
||||||
<div>
|
<div>
|
||||||
<div className="SerialNumberColumn">
|
<div className="SerialNumberColumn">
|
||||||
|
{ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
|
||||||
<Form.Item name="IMEINumber">
|
<Form.Item name="IMEINumber">
|
||||||
<DropDowns
|
<DropDowns
|
||||||
options={ProductDetail?.FullProductIdentifierDtls?.filter(
|
options={ProductDetail?.FullProductIdentifierDtls?.filter(
|
||||||
|
|
@ -317,7 +334,8 @@ const BSImeiDetails = (props) => {
|
||||||
className="field-DropDown"
|
className="field-DropDown"
|
||||||
onChangeFunction={(e) => IMEINumberOnchange(e)}
|
onChangeFunction={(e) => IMEINumberOnchange(e)}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>}
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="IMEINumbertext"
|
name="IMEINumbertext"
|
||||||
rules={[
|
rules={[
|
||||||
|
|
@ -363,7 +381,20 @@ const BSImeiDetails = (props) => {
|
||||||
</div>
|
</div>
|
||||||
</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>
|
</Form>
|
||||||
|
|
||||||
|
|
||||||
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
|
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
|
||||||
<Buttons
|
<Buttons
|
||||||
buttonText="Submit"
|
buttonText="Submit"
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,11 @@ const ComboSalesBillTable = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
||||||
setting?.SettingValue === 'Y'
|
setting?.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const SessionData = useSelector(StoredSessionData);
|
const SessionData = useSelector(StoredSessionData);
|
||||||
const BranchId = SessionData?.BranchId;
|
const BranchId = SessionData?.BranchId;
|
||||||
const AppId = SessionData?.AppId;
|
const AppId = SessionData?.AppId;
|
||||||
|
|
@ -2540,8 +2545,9 @@ const ComboSalesBillTable = () => {
|
||||||
key={`prod-${index}`}
|
key={`prod-${index}`}
|
||||||
className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
|
className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
row.FullProductIdentifierDtls?.length > 0 ||
|
(row.FullProductIdentifierDtls?.length > 0 ||
|
||||||
row.ProductIdentifierDtls?.length > 0
|
row.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
|
|
||||||
? handleImeiDetails(row)
|
? handleImeiDetails(row)
|
||||||
: editField && handleEditQuantity(row)
|
: editField && handleEditQuantity(row)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,11 @@ const StandardTable = () => {
|
||||||
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
setting?.SettingIdName?.toLowerCase() === 'decimal' &&
|
||||||
setting?.SettingValue === 'Y'
|
setting?.SettingValue === 'Y'
|
||||||
);
|
);
|
||||||
|
const imeiModal = preferenceDatas?.[0]?.SettingDtlDetails?.some(
|
||||||
|
(setting) =>
|
||||||
|
setting?.SettingIdName?.toLowerCase() === 'imeidetails' &&
|
||||||
|
setting?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
const SessionData = useSelector(StoredSessionData);
|
const SessionData = useSelector(StoredSessionData);
|
||||||
const BranchId = SessionData?.BranchId;
|
const BranchId = SessionData?.BranchId;
|
||||||
const AppId = SessionData?.AppId;
|
const AppId = SessionData?.AppId;
|
||||||
|
|
@ -3181,8 +3186,8 @@ const StandardTable = () => {
|
||||||
"'Inter', ui-sans-serif, system-ui, sans-serif",
|
"'Inter', ui-sans-serif, system-ui, sans-serif",
|
||||||
}}
|
}}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
item.FullProductIdentifierDtls?.length > 0 ||
|
(item.FullProductIdentifierDtls?.length > 0 ||
|
||||||
item.ProductIdentifierDtls?.length > 0
|
item.ProductIdentifierDtls?.length > 0 || imeiModal)
|
||||||
? handleImeiDetails(item)
|
? handleImeiDetails(item)
|
||||||
: editField && handleEditQuantity(item)
|
: editField && handleEditQuantity(item)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@ const PreferenceList = () => {
|
||||||
],
|
],
|
||||||
scanlayout: allSettingsMap['scanlayout']?.value === 'Y',
|
scanlayout: allSettingsMap['scanlayout']?.value === 'Y',
|
||||||
verifyproduct: allSettingsMap['verifyproduct']?.value === 'Y',
|
verifyproduct: allSettingsMap['verifyproduct']?.value === 'Y',
|
||||||
|
imeidetails:allSettingsMap['imeidetails']?.value === 'Y',
|
||||||
customisedbillnumber: allSettingsMap['customisedbillnumber']?.value === 'Y',
|
customisedbillnumber: allSettingsMap['customisedbillnumber']?.value === 'Y',
|
||||||
upiqr: allSettingsMap['upiqr']?.value === 'Y',
|
upiqr: allSettingsMap['upiqr']?.value === 'Y',
|
||||||
lowstockreport: allSettingsMap['lowstockreport']?.value === 'Y',
|
lowstockreport: allSettingsMap['lowstockreport']?.value === 'Y',
|
||||||
|
|
@ -309,6 +310,7 @@ const PreferenceList = () => {
|
||||||
mobilea4: values.mobilea4,
|
mobilea4: values.mobilea4,
|
||||||
scanlayout: values.scanlayout,
|
scanlayout: values.scanlayout,
|
||||||
verifyproduct: values.verifyproduct,
|
verifyproduct: values.verifyproduct,
|
||||||
|
imeidetails:values.imeidetails,
|
||||||
customisedbillnumber: values.customisedbillnumber,
|
customisedbillnumber: values.customisedbillnumber,
|
||||||
upiqr: values.upiqr,
|
upiqr: values.upiqr,
|
||||||
lowstockreport: values.lowstockreport,
|
lowstockreport: values.lowstockreport,
|
||||||
|
|
@ -633,6 +635,10 @@ const PreferenceList = () => {
|
||||||
'verifyproduct',
|
'verifyproduct',
|
||||||
'Do you Want Verify the Product?'
|
'Do you Want Verify the Product?'
|
||||||
)}
|
)}
|
||||||
|
{renderCheckbox(
|
||||||
|
'imeidetails',
|
||||||
|
'Do you want to open the IMEI model without IMEI details?'
|
||||||
|
)}
|
||||||
{renderCheckbox(
|
{renderCheckbox(
|
||||||
'customisedbillnumber',
|
'customisedbillnumber',
|
||||||
'Do you Want Customised Bill Number?'
|
'Do you Want Customised Bill Number?'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue