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

Merge pull request 'remove number constrain' (#215) from bugfixingprint into main 

Reviewed-on: Pozomind/pozo-retail-app#215
This commit is contained in:
karthikalakshmi 2026-03-03 15:27:14 +05:30
parent 0111c26240 2bdba61c17
commit 79da0c6d94
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ const BSImeiDetails = (props) => {
}; };
const ChangeRadioOption = (data) => { const ChangeRadioOption = (data) => {
setRadioBtnSelection(data); setRadioBtnSelection(data);
formRef.current?.resetFields(['SerialNumber', 'SerialNumbertext', 'IMEINumber', 'IMEINumbertext']); formRef.current?.resetFields(['SerialNumbertext', 'IMEINumbertext']);
}; };
const SerialNumberOnchange = (e) => { const SerialNumberOnchange = (e) => {
console.log(e, SerialNumberList, 'SerialNumberOnchange'); console.log(e, SerialNumberList, 'SerialNumberOnchange');
@ -93,8 +93,8 @@ const BSImeiDetails = (props) => {
setMessageType('error'); setMessageType('error');
setMessageData('you cant enter more than Order Qty'); setMessageData('you cant enter more than Order Qty');
} }
formRef.current?.resetFields(['SerialNumbertext', 'IMEINumbertext']);
formRef.current?.resetFields();
}; };
const IMEINumberOnchange = (e) => { const IMEINumberOnchange = (e) => {
@ -125,7 +125,7 @@ const BSImeiDetails = (props) => {
setMessageType('error'); setMessageType('error');
setMessageData('you cant enter more than Order Qty'); setMessageData('you cant enter more than Order Qty');
} }
formRef.current?.resetFields(); formRef.current?.resetFields(['SerialNumbertext', 'IMEINumbertext']);
}; };
const RemoveSerialNumber = (item) => { const RemoveSerialNumber = (item) => {
@ -173,7 +173,9 @@ const BSImeiDetails = (props) => {
) )
) )
); );
formRef?.current?.resetFields()
CloseDeviceDetailModal(); CloseDeviceDetailModal();
}; };
console.log(ProductDetail, 'ProductDetaildevice'); console.log(ProductDetail, 'ProductDetaildevice');
return ( return (
@ -266,9 +268,7 @@ const BSImeiDetails = (props) => {
rules={[ rules={[
{ {
validator: async (_, value) => { validator: async (_, value) => {
if (value && !/^\d+$/.test(value)) {
return Promise.reject('Please enter only numbers');
}
await validateSafeInput(value); await validateSafeInput(value);
return Promise.resolve(); return Promise.resolve();
}, },
@ -282,12 +282,12 @@ const BSImeiDetails = (props) => {
fieldState={true} fieldState={true}
fieldApi={true} fieldApi={true}
autocomplete="off" autocomplete="off"
type="number" type="text"
onKeyDown={(e) => { // onKeyDown={(e) => {
if (['e', 'E', '+', '-', '.'].includes(e.key)) { // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
e.preventDefault(); // e.preventDefault();
} // }
}} // }}
/> />
</Form.Item> </Form.Item>
<Buttons <Buttons
@ -349,9 +349,7 @@ const BSImeiDetails = (props) => {
rules={[ rules={[
{ {
validator: async (_, value) => { validator: async (_, value) => {
if (value && !/^\d+$/.test(value)) {
return Promise.reject('Please enter only numbers');
}
await validateSafeInput(value); await validateSafeInput(value);
return Promise.resolve(); return Promise.resolve();
}, },
@ -365,12 +363,12 @@ const BSImeiDetails = (props) => {
fieldState={true} fieldState={true}
fieldApi={true} fieldApi={true}
autocomplete="off" autocomplete="off"
type="number" type="text"
onKeyDown={(e) => { // onKeyDown={(e) => {
if (['e', 'E', '+', '-', '.'].includes(e.key)) { // if (['e', 'E', '+', '-', '.'].includes(e.key)) {
e.preventDefault(); // e.preventDefault();
} // }
}} // }}
/> />
</Form.Item> </Form.Item>
<Buttons <Buttons

10
src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
View File

@ -558,9 +558,8 @@ const PaymentPdfBooking = ({
{item?.ProductIdentifierDtls?.map((detail, index) => { {item?.ProductIdentifierDtls?.map((detail, index) => {
const serial = detail.SerialNumber?.trim(); const serial = detail.SerialNumber?.trim();
const imeis = [detail.IMEI1, detail.IMEI2].filter(Boolean).join(", "); const imeis = [detail.IMEI1, detail.IMEI2].filter(Boolean).join(", ");
const description = detail.Description?.trim();
if (!serial && !imeis && !description) return null; if (!serial && !imeis) return null;
return ( return (
<div key={index} style={{ display: "flex", flexDirection: "column", gap: "2px" }}> <div key={index} style={{ display: "flex", flexDirection: "column", gap: "2px" }}>
@ -571,12 +570,13 @@ const PaymentPdfBooking = ({
{imeis && <div>{imeis}</div>} {imeis && <div>{imeis}</div>}
</div> </div>
)} )}
{/* Description */}
{description && <div>{description}</div>}
</div> </div>
); );
})} })}
{/* Description - First Index Only */}
{item?.ProductIdentifierDtls?.[0]?.Description?.trim() && (
<div>{item.ProductIdentifierDtls[0].Description.trim()}</div>
)}
{/* Available Time */} {/* Available Time */}
{sportsAppPreference && {sportsAppPreference &&