@@ -3589,23 +3615,30 @@ const BSBillingEditQuantity = (props) => {
Packing
- {isKg && ()}
-
+ {isKg && (
+
+ )}
{RadioBtnSelection == 'Quantity' && (
<>
-
+
{
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
@@ -3614,6 +3647,10 @@ const BSBillingEditQuantity = (props) => {
type="number"
value={Quantity}
onChange={(e) => setQuantity(e.target.value)}
+ onBlur={() => {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
className="EditQuantity-Quantitybox"
/>
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSImeiDetails/BSImeiDetails.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSImeiDetails/BSImeiDetails.jsx
index e2d9943..b9d4a12 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSImeiDetails/BSImeiDetails.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSImeiDetails/BSImeiDetails.jsx
@@ -11,17 +11,21 @@ import { InputField } from '../../../../../Components/Forms/InputField';
import {
GlobalOrderCardDetails,
changeOrderCardDetails,
+ changefocusStatusCust,
+ changeCombofocus,
+ GlobalfocusStatusCust,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { useDispatch, useSelector } from 'react-redux';
import { validateSafeInput } from '../../../../../Services/Others';
import { TextAreaInput } from '../../../../../../ownLib/my-ui-lib';
-import "../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.scss"
+import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.scss';
const BSImeiDetails = (props) => {
const formRef = useRef(null);
const dispatch = useDispatch();
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
const CartOrderDetails = useSelector(GlobalOrderCardDetails);
+ const selectStatuscust = useSelector(GlobalfocusStatusCust);
const [DeviceDetailOpen, setDeviceDetailOpen] = useState(props.DeviceDetails);
const [ProductDetail, setProductDetail] = useState(props.ProductDetail);
const [RadioBtnSelection, setRadioBtnSelection] = useState('Serial');
@@ -51,8 +55,8 @@ const BSImeiDetails = (props) => {
);
formRef?.current?.setFieldsValue({
- description: productidentifier?.[0]?.Description || "",
- })
+ description: productidentifier?.[0]?.Description || '',
+ });
}, []);
const CloseDeviceDetailModal = () => {
props.handleDeviceDetailClose();
@@ -72,8 +76,7 @@ const BSImeiDetails = (props) => {
} else {
setSerialNumberList([...SerialNumberList, e]);
}
- }
- else {
+ } else {
setMessageType('error');
setMessageData('Already Selected ');
}
@@ -94,7 +97,6 @@ const BSImeiDetails = (props) => {
setMessageData('you cant enter more than Order Qty');
}
formRef.current?.resetFields(['SerialNumbertext', 'IMEINumbertext']);
-
};
const IMEINumberOnchange = (e) => {
@@ -139,8 +141,10 @@ const BSImeiDetails = (props) => {
setMessageType(null);
}, []);
const AddDeviceDetails = () => {
-
- console.log(formRef?.current?.getFieldsValue, "formRef?.current?.getFieldsValue")
+ 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) => {
@@ -165,17 +169,16 @@ const BSImeiDetails = (props) => {
cartItem // if the item is already in the cart, increase the quantity of the item
) =>
cartItem.ProdId === ProductDetail.ProdId &&
- cartItem.InwardDtlId === ProductDetail.InwardDtlId &&
- cartItem?.OrderRate === ProductDetail?.OrderRate &&
- cartItem?.BookingTypeName === ProductDetail?.BookingTypeName
+ cartItem.InwardDtlId === ProductDetail.InwardDtlId &&
+ cartItem?.OrderRate === ProductDetail?.OrderRate &&
+ cartItem?.BookingTypeName === ProductDetail?.BookingTypeName
? { ...cartItem, ProductIdentifierDtls: IdentifyDetails }
: cartItem // otherwise, return the cart item
)
)
);
- formRef?.current?.resetFields()
+ formRef?.current?.resetFields();
CloseDeviceDetailModal();
-
};
console.log(ProductDetail, 'ProductDetaildevice');
return (
@@ -239,7 +242,7 @@ const BSImeiDetails = (props) => {
{RadioBtnSelection == 'Serial' && (
- {ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
+ {ProductDetail?.FullProductIdentifierDtls?.length > 0 && (
{
onChangeFunction={(e) => SerialNumberOnchange(e)}
/>
-
- }
+ )}
{
-
await validateSafeInput(value);
return Promise.resolve();
},
},
]}
>
- {
- // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
- // e.preventDefault();
- // }
- // }}
- />
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ />
+
{
)}
-
{RadioBtnSelection == 'IMEI' && (
- {ProductDetail?.FullProductIdentifierDtls?.length > 0 &&
+ {ProductDetail?.FullProductIdentifierDtls?.length > 0 && (
{
className="field-DropDown"
onChangeFunction={(e) => IMEINumberOnchange(e)}
/>
- }
+
+ )}
{
-
await validateSafeInput(value);
return Promise.resolve();
},
},
]}
>
- {
- // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
- // e.preventDefault();
- // }
- // }}
- />
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ >
+ {
+ dispatch(changefocusStatusCust(!selectStatuscust));
+ dispatch(changeCombofocus(false));
+ }}
+ />
+
{
)}
-
+
Description..}
@@ -411,7 +423,6 @@ const BSImeiDetails = (props) => {
-
-
+
}
handleCancel={CloseDeviceDetailModal}
/>
-
+