...
Updated filter logic:
Code Block |
---|
if (shouldSearchByName) {
conditions.and.push({ name: { ilike: queryString } });
} else if (shouldSearchByBothNameAndCode) {
condition.and.push({
or: [
{ name: { ilike: queryString } },
{ code: { ilike: queryString } }
]
});
} else {
conditions.and.push({ code: { ilike: queryString } });
} |
...
Expand |
---|
title | Rendering snippet for address fields |
---|
|
Code Block |
---|
const renderPincodeBox = () => {
if (isAddressHierarchyPresent && isAddressMappingAllowed && hierarchyFieldsArr.include('pincode')) {
return (
<AutoComplete
value={newAddress.pincode}
className={classes.pincodeInput}
dropdownClassName={classes.pincodeInputDropdown}
options={
localityPincodesList.map((pincode: any) => {
return {
label: `${pincode.name} (${pincode.code})`,
value: pincode.code,
};
})
}
onSearch={loadPincodes}
onSelect={(e) => saveAddressUsingAddressHierarchy(e, 'pincode')}
onChange={(value) => updateAddressFieldWithValidations('pincode', value)}
style={{ textAlign: 'left' }}
allowClear
>
<Input
className={classes.autoCompleteInputBox}
allowClear
placeholder={t('address_pincode')}
/>
</AutoComplete>
);
} else
if (isAddressHierarchyPresent && !isAddressMappingAllowed && hierarchyFieldsArr.include('pincode')) {
return (
<Form.Item
className={classes.pincodeWithExtra}
name="pincode"
extra={samplePincode ? `Ex. ${samplePincode}` : undefined}
>
<Select
value={newAddress.pincode}
dropdownClassName={classes.pincodeInputDropdown}
placeholder={t('address_pincode')}
onChange={(e) => {
updateAddressFieldWithValidations('pincode', e);
const isValid = isValidPincode(e);
if (isValid !== validPincode) {
setValidPincode(isValid);
}
}}
options={
localityPincodesList.map((pincode: any) => {
return {
label: `${pincode.name} (${pincode.code})`,
value: pincode.code,
};
})
}
onSelect={(e) => saveAddressUsingAddressHierarchy(e, 'pincode')}
defaultActiveFirstOption={false}
filterOption={false}
onSearch={loadPincodes}
showSearch
allowClear
style={validPincode ? {} : { borderColor: 'red' }}
/>
</Form.Item>
);
}
else { return (
<Input
value={newAddress.pincode}
className={classes.pincodeInput}
placeholder={t('address_citypincode')}
onChange={(e) => updateAddressFieldWithValidations('pincodeInputpincode', e.target.value)}
/>
);
}
};
|
|
Additional Details:
Changes in src/network/pickup.api.ts
...