{imagedata?.map((item, index) => (
setSelectedImage(item)}
>
@@ -2665,20 +2599,20 @@ const ProductForm = ({ formType }) => {
{qrAndTokenDtlsFields?.includes(
'Auto Generate QRCode'
) && (
-
{(QrcodeAutoSingle == 'N' ||
editstate?.OnePcQR) && (
-
- openQrcodeAuto(e)}
- disabled={editstate?.QRCode ? true : false}
- />
-
- )}
+
+ openQrcodeAuto(e)}
+ disabled={editstate?.QRCode ? true : false}
+ />
+
+ )}
{(QrcodeAuto == 'N' || editstate?.QRCode) &&
qrAndTokenDtlsFields?.includes(
'Auto Generate QRCode'
@@ -2723,19 +2657,19 @@ const ProductForm = ({ formType }) => {
{qrAndTokenDtlsFields?.includes(
'Stock Maintenance'
) && (
-
- openStock(e)}
- />
-
- )}
+
+ openStock(e)}
+ />
+
+ )}
{StockOpen === 'Y' &&
qrAndTokenDtlsFields?.includes(
'Stock Maintenance'
@@ -2766,35 +2700,35 @@ const ProductForm = ({ formType }) => {
{qrAndTokenDtlsFields?.includes(
'Token Maintenance'
) && (
-
- openToken(e)}
- />
-
- )}
+
+ openToken(e)}
+ />
+
+ )}
{qrAndTokenDtlsFields?.includes(
'Rack Maintenance'
) && (
-
- openRack(e)}
- />
-
- )}
+
+ openRack(e)}
+ />
+
+ )}
{RackOpen === 'Y' &&
qrAndTokenDtlsFields?.includes(
@@ -2805,15 +2739,15 @@ const ProductForm = ({ formType }) => {
options={
formType === 'edit'
? RackData?.map((option) => ({
- value: option.RackId,
- label: option.RackName,
- }))
+ value: option.RackId,
+ label: option.RackName,
+ }))
: RackData?.filter(
- (item) => item.ActiveStatus === 'A'
- )?.map((option) => ({
- value: option.RackId,
- label: option.RackName,
- }))
+ (item) => item.ActiveStatus === 'A'
+ )?.map((option) => ({
+ value: option.RackId,
+ label: option.RackName,
+ }))
}
label={
@@ -2839,21 +2773,21 @@ const ProductForm = ({ formType }) => {
{qrAndTokenDtlsFields?.includes(
'Amount Per Piece'
) && (
-
-
- openAmountPerPieceAvailable(e)
- }
- />
-
- )}
+
+
+ openAmountPerPieceAvailable(e)
+ }
+ />
+
+ )}
{AmountPerPieceAvailable == 'Y' &&
qrAndTokenDtlsFields?.includes(
@@ -2886,7 +2820,7 @@ const ProductForm = ({ formType }) => {
}
isOnChange={
editstate?.OnePcsPrice ||
- editstate?.OnePcsPrice == 0
+ editstate?.OnePcsPrice == 0
? true
: false
}
@@ -2910,39 +2844,39 @@ const ProductForm = ({ formType }) => {
- 
- {
- await validateSafeInput(value); // To block HTML tags & SQL keywords
- return Promise.resolve();
+
+
+ )}
)}
@@ -2991,134 +2925,134 @@ const ProductForm = ({ formType }) => {
{(priceDtlsFields?.length > 0 ||
hsnAndMoreDtlsFields?.length > 0 ||
dateAndTimeDtlsFields?.length > 0) && (
-
+
+ {
+ await validateSafeInput(value); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
},
- },
- ]}
- >
-
-
- )}
+ ]}
+ >
+
-
-
-
-
-
- ({
+
+
+
+
+
+
+ ({
value: option.ConfigId,
label: option.ConfigName,
}))
- : ProductTypeData.filter(
+ : ProductTypeData.filter(
(item) => item.ConfigName !== 'Others'
)?.map((option) => ({
value: option.ConfigId,
label: option.ConfigName,
}))
- }
- label={
-
- }
- className="field-DropDown"
- isOnchanges={
- editstate?.ProdType || SelectedProductType
- ? true
- : false
- }
- onChangeFunction={
- handleProductTypeDropDownChange
- }
- valueData={SelectedProductType}
- disabled={
- editstate?.ProdTypeName == 'Others' ||
- formType == 'add'
- ? false
- : true
- }
- />
-
-
- {priceDtlsFields?.includes('Tax') && (
-
- ({
- value: option.TaxId,
- label: getOptionLabel(
- option,
- SelectedTaxId === option.TaxId
- ),
- }))}
- label="Tax"
+ }
+ label={
+
+ }
className="field-DropDown"
isOnchanges={
- editstate?.TaxId || SelectedTaxId
+ editstate?.ProdType || SelectedProductType
? true
: false
}
- onChangeFunction={handleTaxDropDownChange}
- valueData={SelectedTaxId}
+ onChangeFunction={
+ handleProductTypeDropDownChange
+ }
+ valueData={SelectedProductType}
+ disabled={
+ editstate?.ProdTypeName == 'Others' ||
+ formType == 'add'
+ ? false
+ : true
+ }
/>
-
-
- )}
- {SelectedTaxId &&
- priceDtlsFields?.includes('Cess') && (
- {
- await validateSafeInput(value);
- if (!value) {
- return Promise.resolve(); // Skip validation if the field is empty
- }
+ {priceDtlsFields?.includes('Tax') && (
+
+ ({
+ value: option.TaxId,
+ label: getOptionLabel(
+ option,
+ SelectedTaxId === option.TaxId
+ ),
+ }))}
+ label="Tax"
+ className="field-DropDown"
+ isOnchanges={
+ editstate?.TaxId || SelectedTaxId
+ ? true
+ : false
+ }
+ onChangeFunction={handleTaxDropDownChange}
+ valueData={SelectedTaxId}
+ />
+
+
+
+ )}
- if (
- !/^\d{1,3}(\.\d{1,2})?$/.test(value)
- ) {
- return Promise.reject(
- 'Cess should be a number with up to 2 decimal places'
- );
- }
+ {SelectedTaxId &&
+ priceDtlsFields?.includes('Cess') && (
+ {
+ await validateSafeInput(value);
+ if (!value) {
+ return Promise.resolve(); // Skip validation if the field is empty
+ }
- const cessValue = parseFloat(value);
- if (cessValue < 0 || cessValue > 100) {
- return Promise.reject(
- 'Cess cannot be greater than 100%'
- );
- }
+ if (
+ !/^\d{1,3}(\.\d{1,2})?$/.test(value)
+ ) {
+ return Promise.reject(
+ 'Cess should be a number with up to 2 decimal places'
+ );
+ }
- return Promise.resolve();
+ const cessValue = parseFloat(value);
+ if (cessValue < 0 || cessValue > 100) {
+ return Promise.reject(
+ 'Cess cannot be greater than 100%'
+ );
+ }
+
+ return Promise.resolve();
+ },
},
- },
- ]}
- >
-
- )}
- {priceDtlsFields?.includes('Discount Type') && (
-
- - {(hsnAndMoreDtlsFields?.length > 0 || - dateAndTimeDtlsFields?.length > 0) && ( -
-
-
- {(hsnAndMoreDtlsFields?.length > 0 ||
- dateAndTimeDtlsFields?.length > 0 ||
- priceDtlsFields?.includes('Add Variant')) && (
-
+
- )}
-
- {priceDtlsFields?.includes('Discount Limit') && (
-
+
+ {
padding: '5px',
backgroundColor: '#fff',
}
- : { opacity: '0.6', boxShadow: 'none' }
- }
- onClick={() => {
- Onchangeoffertype('P');
- }}
- >
-
-
+ { + Onchangeoffertype('P'); }} > - Percentage -
-+ Percentage +
+ {
padding: '5px',
backgroundColor: '#fff',
}
- : { opacity: '0.6', boxShadow: 'none' }
- }
- onClick={() => {
- Onchangeoffertype('F');
- }}
- >
-
- - Fixed -
-
-
- Sales Limit}
- autocomplete="off"
- onChange={Handleoffervalue}
- isOnChange={
- DiscountValue || DiscountValue == 0
- ? true
- : false
+ : { opacity: '0.6', boxShadow: 'none' }
}
- inputMode="decimal"
- onInput={(e) => {
- const cleanedValue =
- e.target.value.replace(/[^0-9.]/g, '');
- const parts = cleanedValue.split('.');
- e.target.value =
- parts.length > 2
- ? `${parts[0]}.${parts.slice(1).join('')}`
- : cleanedValue;
- }}
- value={DiscountValue}
- />
-
-
- )}
-
- {(hsnAndMoreDtlsFields?.length > 0 ||
- dateAndTimeDtlsFields?.length > 0) && (
-
)}
- {priceDtlsFields?.includes('Add Variant') && (
-
- {OpenAdd ? {
+ Onchangeoffertype('F');
}}
>
- {OpenAdd
- ? 'Hide Additional Details'
- : 'Show Additional Details'}
-
+
+ Fixed +
+
- Add Variant
+
+ {priceDtlsFields?.includes('Discount Limit') && (
+
- )}
-
+
+ Sales Limit}
+ autocomplete="off"
+ onChange={Handleoffervalue}
+ isOnChange={
+ DiscountValue || DiscountValue == 0
+ ? true
+ : false
+ }
+ inputMode="decimal"
+ onInput={(e) => {
+ const cleanedValue =
+ e.target.value.replace(/[^0-9.]/g, '');
+ const parts = cleanedValue.split('.');
+ e.target.value =
+ parts.length > 2
+ ? `${parts[0]}.${parts.slice(1).join('')}`
+ : cleanedValue;
+ }}
+ value={DiscountValue}
+ />
+
)}
- - {(hsnAndMoreDtlsFields?.length > 0 || - dateAndTimeDtlsFields?.length > 0) && ( -
- {OpenAdd && (
-
-
-
-
- {
}
>
-
-
-
-
- ({
const TurboAddForm = () => {
const dispatch = useDispatch();
// Redux selectors
- const taxData = useSelector(taxSelector);
+ const taxRef = useRef();
+ const brandRef = useRef();
+ const categoryRef = useRef();
+ const subCategoryRef = useRef();
const scannerRef = useRef();
- console.log(taxData, 'taxData');
+ const prodTaxData = useSelector(prodTaxDataSelector);
+ const taxData = useSelector(taxSelector);
const UomData = useSelector(uomDataSelector);
const productTypeData = useSelector(productTypeDataSelector);
const ApplicationPreferenceData = useSelector(ApplicationPreferences);
@@ -164,8 +175,8 @@ const TurboAddForm = () => {
)?.PreferredCatId;
const prodCategories = useSelector(prodCatDataSelector);
const prodSubCategories = useSelector(prodSubCatDataSelector);
+ const allProdSubCategories = useSelector(allProdSubCatDataSelector);
const searchText = useSelector(GlobalSearchData);
-
// Session data
const AppId = useMemo(() => getSession('AppId'), []);
const CompId = useMemo(() => getSession('CompId'), []);
@@ -173,6 +184,11 @@ const TurboAddForm = () => {
const UserId = useMemo(() => getSession('UserId'), []);
// State
+ const [openTaxModal, setOpenTaxModal] = useState(false);
+ const [openCategoryModal, setOpenCategoryModal] = useState(false);
+ const [openSubCategoryModal, setOpenSubCategoryModal] = useState(false);
+ const [openBrandModal, setOpenBrandModal] = useState(false);
+ const [imageCategoryUrl, setImageCategoryUrl] = useState('');
const [voiceData, setVoiceData] = useState(null);
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
@@ -257,7 +273,7 @@ const TurboAddForm = () => {
uomPref?.some?.(
(e) =>
e?.PreferredSubCatName?.toLowerCase() ===
- item?.ConfigName?.toLowerCase() && e?.PreferredStatus === 'Y'
+ item?.ConfigName?.toLowerCase() && e?.PreferredStatus === 'Y'
)
);
@@ -372,6 +388,8 @@ const TurboAddForm = () => {
[UomPreference, taxData, prodCategories, prodSubCategories]
);
+ console.log(selectOptions?.tax, taxData, "selectOptions tax");
+
// Filtered products for search
const filteredProducts = useMemo(() => {
if (!searchTerm.trim()) return products;
@@ -953,14 +971,14 @@ const TurboAddForm = () => {
prev.map((p) =>
p.id === productId
? {
- ...p,
- availableSubCategories,
- subCategory: subCategoryId,
- subCategoryName,
- availableBrands,
- brand: '',
- brandName: '',
- }
+ ...p,
+ availableSubCategories,
+ subCategory: subCategoryId,
+ subCategoryName,
+ availableBrands,
+ brand: '',
+ brandName: '',
+ }
: p
)
);
@@ -1013,7 +1031,7 @@ const TurboAddForm = () => {
return p;
});
});
- } catch (error) {}
+ } catch (error) { }
}
},
[handleInputChange, selectOptions.subCategories]
@@ -1189,7 +1207,7 @@ const TurboAddForm = () => {
(p, i) =>
i !== idx &&
p.productName?.trim().toLowerCase() ===
- product.productName?.trim().toLowerCase() &&
+ product.productName?.trim().toLowerCase() &&
p.uom === product.uom &&
p.nou === product.nou &&
p?.category === product?.category &&
@@ -1613,11 +1631,11 @@ const TurboAddForm = () => {
rowIndex === 0 && !isMobile ? rowIndex + 1 : rowIndex;
return idx === index
? {
- ...p,
- productName: found.ProdName,
- barcode: enteredValue,
- productImage: found.ImageUrl,
- }
+ ...p,
+ productName: found.ProdName,
+ barcode: enteredValue,
+ productImage: found.ImageUrl,
+ }
: p;
})
);
@@ -1687,7 +1705,7 @@ const TurboAddForm = () => {
const duplicateExists = products.some(
(row) =>
row.productName?.trim().toLowerCase() ===
- baseData.productName?.trim().toLowerCase() &&
+ baseData.productName?.trim().toLowerCase() &&
row.nou === baseData.nou &&
row.uom === baseData.uom
);
@@ -1936,12 +1954,12 @@ const TurboAddForm = () => {
// onClick={() => handleQrcode()}
// style={{ cursor: 'pointer', marginLeft: '8px' }}
// />
- {
- changeSearchedData(value);
- }}
- />
+ changeSearchedData(value);
+ }}
+ />
)}
{
field="category"
options={defaultCategories}
onSubmit={handleDefaultSetting}
+ triggerModal={setOpenCategoryModal}
+ Component={ 0 &&
- selectedDefaultSubCategory
+ selectedDefaultSubCategory
? `Selected Sub-Category : ${defaultSubCategories?.find((subCat) => subCat.value === selectedDefaultSubCategory)?.label}`
: null
}
@@ -2060,6 +2093,16 @@ const TurboAddForm = () => {
checkBoxHeading={
'Apply to all selected sub-category rows'
}
+ triggerModal={setOpenBrandModal}
+ needAllSubCategories={true}
+ Component={
+
+
+
+ {/* {record.ActiveStatus === "A" ? ( */}
+ statusFormatter(record, index)}
+ />
+
+
+ ),
+ },
+ ];
+
+ const handleAddSubCategory = async () => {
+ const subCategoryData = await ref?.current?.validateFields();
+
+ const alreadyExists = tableData.some(
+ (item) => item.SubCategory === subCategoryData?.SubConfigName
+ );
+
+ if (!alreadyExists) {
+ setTableData((prev) => {
+ const newIndex = prev.length + 1;
+
+ const datas = {
+ category: selectedCategory,
+ SubCategory: subCategoryData?.SubConfigName,
+ key: newIndex, // Push index here
+ };
+
+ return [...prev, datas];
+ });
+ } else {
+ setMessageType('error');
+ setMessageData('Sub Category Already Exist');
+ }
+ ref.current.resetFields(['SubConfigName']);
+ };
+
+ const handleSubmitSubCategory = async () => {
+ if (!tableData || tableData.length === 0) {
+ setMessageType('error');
+ setMessageData('Please add at least one Sub-Category.');
+ return;
+ }
+
+ const subCategoryTypeId = await dispatch(
+ getConfigTypeData({ TypeName: 'Product Sub-Category' })
+ ).unwrap();
+
+ const addSubCategoryData = {
+ TypeId: subCategoryTypeId?.data?.data?.[0]?.TypeId || 0,
+ ConfigDetails: tableData.map((item) => ({
+ ConfigName: item.SubCategory,
+ })),
+ AlphaNumFId: AppId,
+ NumFId: selectedCategory,
+ CreatedBy: UserId,
+ };
+
+ const response = await dispatch(
+ postConfigurationmultiple(addSubCategoryData)
+ ).unwrap();
+
+ if (response?.data?.statusCode == 1) {
+ setSubCategoryImageUrl('');
+ setMessageType('success');
+ setMessageData('Sub-Category Added Successfully');
+ close(false);
+ setSelectedCategory(null);
+ const subCatResponse = await dispatch(getProdSubCatData({ ConfigId: selectedCategory })).unwrap();
+ setTableData([]);
+ ref?.current?.resetFields();
+ if (products?.length > 0) {
+ const hasTheCategory = products.some(product => product.category === selectedCategory);
+ if (hasTheCategory) {
+ if (subCatResponse?.data?.statusCode == 1) {
+ const subCategories = subCatResponse?.data?.data || [];
+ const availableSubCategories = subCategories?.filter(
+ (subCat) =>
+ subCat.NumFId === parseInt(selectedCategory) && !!subCat?.ConfigName
+ )?.map((subCat) => ({
+ label: subCat.ConfigName,
+ value: subCat.ConfigId,
+ }));
+
+ const updatedProducts = products?.map((product) => {
+ if (product.category === selectedCategory) {
+ return {
+ ...product,
+ availableSubCategories,
+ };
+ }
+ return product;
+ });
+
+ setProducts(updatedProducts);
+ }
+
+ }
+ }
+ console.log(products, "selectedCategory", selectedCategory)
+ } else {
+ setMessageType('error');
+ setMessageData(response?.data?.response);
+ ref?.current?.resetFields();
+ }
+ };
+
+ const handleCatDropDownChange = (value) => {
+ setSelectedCategory(value);
+ ref?.current?.setFieldsValue({ CategoryId: value });
+ };
+
+ const statusFormatter = (record, index) => {
+ let filteredData = tableData.filter(
+ (item) => item.SubCategory != record?.SubCategory
+ );
+ setTableData(filteredData);
+ };
+
+ const handleSubCatModalClose = () => {
+ close(false);
+ setSubCategoryImageUrl('');
+ setSelectedCategory(null);
+ setTableData([]);
+ ref?.current?.resetFields();
+ };
+
+ const handleEdit = () => {
+
+ };
+
+ const onComplete = useCallback(() => {
+ setMessageData(null);
+ setMessageType(null);
+ }, []);
+
+ return (
+ <>
+
+
+ setOpen(false)} />
- {showField &&
- {hsnAndMoreDtlsFields?.length > 0 && (
-
{
-
-
- 0 ||
+ dateAndTimeDtlsFields?.length > 0 ||
+ priceDtlsFields?.includes('Add Variant')) && (
+
+
+ )}
+ {(hsnAndMoreDtlsFields?.length > 0 ||
+ dateAndTimeDtlsFields?.length > 0) && (
+
- {dateAndTimeDtlsFields?.length > 0 && ( -
- )}
-
-
-
-
+ {OpenAdd ?
+ {OpenAdd
+ ? 'Hide Additional Details'
+ : 'Show Additional Details'}
+
+
+ )}
+ {priceDtlsFields?.includes('Add Variant') && (
+
- {hsnAndMoreDtlsFields?.includes(
- 'HSN'
- ) && (
- {
- await validateSafeInput(
- value
- );
- return Promise.resolve();
- },
- },
- ]}
- >
-
- HSN Code
-
- }
- id="HSNCode"
- value={selectedHsn}
- type="text"
- list="hsnList"
- maxLength={100}
- autoComplete="off"
- isOnChange={
- editstate?.HSNCode
- ? true
- : true
- }
- onChange={(e) => {
- const value =
- e?.target?.value || '';
- setSelectedHsn(value);
- if (value.length >= 1) {
- formRef.current?.setFieldsValue(
- {
- HSNCode: value,
- }
- );
- handleHsnData(value);
- }
- }}
- suffix={
- selectedHsn?.length >= 1 ? (
-
- setSelectedHsn('')
- }
- />
- ) : (
-
- )
- }
- />
- {HsnDetails?.length > 0 && (
-
- )}
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'Part Number'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
-
- {hsnAndMoreDtlsFields?.includes(
- 'Batch Number'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'Model Number'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'IMEI 1'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'IMEI 2'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'Serial Number'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
- {hsnAndMoreDtlsFields?.includes(
- 'MacId'
- ) && (
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
- )}
-
-
+ Add Variant
)}
- - {dateAndTimeDtlsFields?.length > 0 && ( -
-
-
- {
- await validateSafeInput(
- value
- ); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
- Warranty Days
- }
- isOnChange={true}
- />
-
- {/* } */}
- {dateAndTimeDtlsFields?.includes(
- 'Expire Date'
- ) && (
-
-
-
-
-
- )}
+
+ + {(hsnAndMoreDtlsFields?.length > 0 || + dateAndTimeDtlsFields?.length > 0) && ( +
)}
-
- {dateAndTimeDtlsFields?.includes(
- 'Manufacture Date'
- ) && (
-
-
-
-
-
- )}
- {/* {(dateAndTimeDtlsFields?.includes('Expiry Notification Days') && */}
+
+ )}
- -
-
-
-
+ + {(hsnAndMoreDtlsFields?.length > 0 || + dateAndTimeDtlsFields?.length > 0) && ( +
+ {OpenAdd && (
+
)}
-
+ {hsnAndMoreDtlsFields?.length > 0 && (
+
+ {dateAndTimeDtlsFields?.length > 0 && ( +
+ )}
+
+
+
+
+
+
+ )}
+
+ {hsnAndMoreDtlsFields?.includes(
+ 'HSN'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ );
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ HSN Code
+
+ }
+ id="HSNCode"
+ value={selectedHsn}
+ type="text"
+ list="hsnList"
+ maxLength={100}
+ autoComplete="off"
+ isOnChange={
+ editstate?.HSNCode
+ ? true
+ : true
+ }
+ onChange={(e) => {
+ const value =
+ e?.target?.value || '';
+ setSelectedHsn(value);
+ if (value.length >= 1) {
+ formRef.current?.setFieldsValue(
+ {
+ HSNCode: value,
+ }
+ );
+ handleHsnData(value);
+ }
+ }}
+ suffix={
+ selectedHsn?.length >= 1 ? (
+
+ setSelectedHsn('')
+ }
+ />
+ ) : (
+
+ )
+ }
+ />
+ {HsnDetails?.length > 0 && (
+
+ )}
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'Part Number'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+
+ {hsnAndMoreDtlsFields?.includes(
+ 'Batch Number'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'Model Number'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'IMEI 1'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'IMEI 2'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'Serial Number'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+ {hsnAndMoreDtlsFields?.includes(
+ 'MacId'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ )}
+
+ + {dateAndTimeDtlsFields?.length > 0 && ( +
+
+
+
-
+ {dateAndTimeDtlsFields?.includes(
+ 'Expiry Notification Days'
+ ) &&
+ dateAndTimeDtlsFields?.includes(
+ 'Expire Date'
+ ) && (
+ {
+ await validateSafeInput(
+ value
+ ); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ Expiry Notification Days
+
+ }
+ isOnChange={true}
+ />
+
+ )}
+
+ {dateAndTimeDtlsFields?.includes(
+ 'Available From'
+ ) && (
+
+
+
+
+
+ )}
+ {dateAndTimeDtlsFields?.includes(
+ 'Available To'
+ ) && (
+
+
+
+
+
+ )}
+
+
+
+
+ {dateAndTimeDtlsFields?.includes(
+ 'Manufacture Date'
+ ) && (
+
+
+
+
+
+ )}
+ {/* {(dateAndTimeDtlsFields?.includes('Expiry Notification Days') && */}
- {dateAndTimeDtlsFields?.includes(
- 'Expiry Notification Days'
- ) &&
- dateAndTimeDtlsFields?.includes(
- 'Expire Date'
- ) && (
{
- Expiry Notification Days
-
+
}
isOnChange={true}
/>
- )}
+ {/* } */}
+ {dateAndTimeDtlsFields?.includes(
+ 'Expire Date'
+ ) && (
+
+
+
+
+
+ )}
- {dateAndTimeDtlsFields?.includes(
- 'Available From'
- ) && (
-
-
-
-
-
- )}
- {dateAndTimeDtlsFields?.includes(
- 'Available To'
- ) && (
-
-
-
-
-
- )}
-
- +
+
+
+
-
-
-
-
+
+
+
+
- {openVariant && (
-
- )}
+
+
-
-
- }
- handleSubmit={submitCategory}
- handleCancel={handleCategory}
- >
-
-
-
- {
- await validateSafeInput(value);
-
- if (value && value.length > 50) {
- return Promise.reject(
- 'Category Name should not exceed 50 characters'
- );
- }
-
- return Promise.resolve();
- },
- },
- ]}
- >
- Category Name
- }
- autocomplete="off"
- />
-
-
-
-
-
-
-
- Upload Icon
--
-
-
-
-
- }
- >
-
+ close={setOpenSubCategoryModel}
+ categoryData={ProdCatData}
+ ref={formSubCategoryRef}
+ />
-
-
-
-
- ({
- value: option.ConfigId,
- label: option.ConfigName,
- }))}
- label={}
- className="field-DropDown"
- onChangeFunction={handleCatDropDownChange}
- valueData={SelectedCategory}
- disabled={Tabledata.length >= 1}
- />
-
-
- {/*
-
-
-
*/}
- Upload Icon
--
-
-
-
-
- SubCategory Name
- }
- autocomplete="off"
- />
-
-
-
-
- {
- try {
- const values =
- await formSubCategoryRef.current?.validateFields(
- ['CategoryId', 'SubConfigName']
- );
- const trimmedValue = values?.SubConfigName
- ? values.SubConfigName.trim()
- : '';
- if (!values?.CategoryId) {
- throw new Error('Please Select Category');
- }
- if (!trimmedValue) {
- throw new Error('SubCategory Name is required');
- }
- await validateSafeInput(trimmedValue);
- if (trimmedValue.length > 50) {
- throw new Error(
- 'SubCategory Name should not exceed 50 characters'
- );
- }
- !editDataval ? handleEdit() : handleadd();
- } catch (error) {
- message.error(
- error.message || 'Please fill required fields'
- );
- }
- }}
- />
-
-
-
-
-
-
-
-
-
- }
- >
-
-
-
-
- ({
- value: option.ConfigId,
- label: option.ConfigName,
- }))}
- label={}
- className="field-DropDown"
- onChangeFunction={handleSubCatDropDownChange}
- valueData={SelectedSubCategory}
- />
-
-
-
-
-
-
- Upload Icon
--
-
-
-
-
- {
- await validateSafeInput(value);
-
- if (value && value.length > 50) {
- return Promise.reject(
- 'Brand Name should not exceed 50 characters'
- );
- }
-
- return Promise.resolve();
- },
- },
- ]}
- >
- Brand Name}
- autocomplete="off"
- />
-
-
-
-
- ({
- value: option.ConfigId,
- label: option.ConfigName,
- }))}
- label="Tax Name"
- className="field-DropDown"
- onChangeFunction={handleTaxNameDropDownChange}
- valueData={SelectedTaxNameId}
- />
-
-
- {
- await validateSafeInput(value); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
- {
- let cleanedValue = e.target.value.replace(
- /[^0-9.]/g,
- ''
- ); // Remove invalid characters
- const parts = cleanedValue.split('.');
-
- if (cleanedValue.startsWith('.')) {
- cleanedValue = '0' + cleanedValue;
- }
-
- e.target.value =
- parts.length > 2
- ? `${parts[0]}.${parts.slice(1).join('')}`
- : cleanedValue;
- }}
- />
-
-
- {
- await validateSafeInput(value); // To block HTML tags & SQL keywords
- return Promise.resolve();
- },
- },
- ]}
- >
-
-
-
-
-
- }
- handleSubmit={submitTax}
- handleCancel={handleTax}
- >
-
+ close={setOpenTaxModel}
+ prodTaxData={ProdTaxData}
+ ref={formTaxRef}
+ />
-
-
-
-
+
+
+ }
+ />
+
+ )
+});
+
+export default AddBrandModal
\ No newline at end of file
diff --git a/src/Pages/Product/Utils/AddCategoryModal.jsx b/src/Pages/Product/Utils/AddCategoryModal.jsx
new file mode 100644
index 0000000..d7f1d84
--- /dev/null
+++ b/src/Pages/Product/Utils/AddCategoryModal.jsx
@@ -0,0 +1,147 @@
+import { forwardRef, useCallback, useState } from "react";
+import Imageupload from '../../../Components/Forms/Upload.jsx';
+import { DefaultModal } from "../../../Components/Modal/DefaultModal";
+import { InputField } from "../../../Components/Forms/InputField";
+import { Form } from "antd";
+import { getSession, validateSafeInput } from "../../../Services/Others.js";
+import { useDispatch } from "react-redux";
+import { getConfigTypeData, postConfiguration } from "../../../Features/ConfigMasterPage/ConfigMasterPage.js";
+import { getProdCatData } from "../../../Features/ProductPage/ProductPage.js";
+import { Messages } from "../../../Components/Notifications/Messages.jsx";
+
+const AddCategoryModal = forwardRef((
+ {
+ open = false,
+ close = () => { },
+ }, ref) => {
+
+ const dispatch = useDispatch();
+ const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+
+ const [messageType, setMessageType] = useState('');
+ const [messageData, setMessageData] = useState('');
+
+ const [imageCategoryUrl, setImageCategoryUrl] = useState('');
+
+ const handleImageCategoryUrlUpdate = (url) => {
+ setImageCategoryUrl(url);
+ };
+
+ const handleSubmitCategory = async () => {
+ try {
+ const values = await ref?.current?.validateFields();
+
+ const categoryTypeId = await dispatch(
+ getConfigTypeData({ TypeName: 'Product Category' })
+ ).unwrap();
+
+ const data = {
+ TypeId: categoryTypeId?.data?.data?.[0]?.TypeId,
+ ConfigName: values?.ConfigName,
+ AlphaNumFId: AppId,
+ SmallIcon: imageCategoryUrl,
+ CreatedBy: UserId,
+ };
+ const response = await dispatch(postConfiguration(data)).unwrap();
+ if (response?.data?.statusCode === 1) {
+ await dispatch(getProdCatData({ AppId: AppId }));
+ close(false);
+ setImageCategoryUrl('');
+ setMessageType('success');
+ setMessageData(response?.data?.response);
+ ref?.current?.resetFields();
+ } else {
+ setMessageType('error');
+ setMessageData(response?.data?.response);
+ }
+ return;
+ }
+ catch (error) {
+ console.log('Error:', error?.message);
+ return;
+ }
+ }
+
+ const handleModalClose = () => {
+ close(false);
+ setImageCategoryUrl('');
+ ref?.current?.resetFields();
+ };
+
+ const onComplete = useCallback(() => {
+ setMessageData(null);
+ setMessageType(null);
+ }, []);
+
+
+ return (
+ <>
+
+
+
+
+
+ ({
+ value: option.ConfigId,
+ label: option.ConfigName,
+ }))}
+ label={}
+ className="field-DropDown"
+ onChangeFunction={handleSubCatDropDownChange}
+ valueData={selectedSubCategory}
+ />
+
+
+
+
+
+
+ Upload Icon
++
+
+
+
+
+ {
+ await validateSafeInput(value);
+
+ if (value && value.length > 50) {
+ return Promise.reject(
+ 'Brand Name should not exceed 50 characters'
+ );
+ }
+
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+ Brand Name}
+ autocomplete="off"
+ />
+
+
+
+
+
+ }
+ handleSubmit={handleSubmitCategory}
+ handleCancel={handleModalClose}
+ />
+
+ )
+});
+
+export default AddCategoryModal;
\ No newline at end of file
diff --git a/src/Pages/Product/Utils/AddSubCategoryModal.jsx b/src/Pages/Product/Utils/AddSubCategoryModal.jsx
new file mode 100644
index 0000000..6979b31
--- /dev/null
+++ b/src/Pages/Product/Utils/AddSubCategoryModal.jsx
@@ -0,0 +1,337 @@
+import { Form, Table } from 'antd';
+import { forwardRef, useCallback, useState } from 'react';
+import { DropDowns } from '../../../Components/Forms/DropDown';
+import { getSession, validateSafeInput } from '../../../Services/Others';
+import { InputField } from '../../../Components/Forms/InputField';
+import { PlusCircleOutlined, DeleteFilled } from '@ant-design/icons';
+import { Tooltip, message, Space } from 'antd';
+import { DefaultModal } from '../../../Components/Modal/DefaultModal';
+import { Messages } from '../../../Components/Notifications/Messages';
+import { getProdSubCatData, postConfigurationmultiple } from '../../../Features/ProductPage/ProductPage';
+import { useDispatch } from 'react-redux';
+import { getConfigTypeData } from '../../../Features/ConfigMasterPage/ConfigMasterPage';
+
+const AddSubCategoryModal = forwardRef((
+ {
+ open = false,
+ close = () => { },
+ categoryData = [],
+ products = [],
+ setProducts = () => { },
+ flag = false,
+ }, ref) => {
+
+ const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+
+ const dispatch = useDispatch();
+
+ const [page, setPage] = useState(1);
+ const [searchedText, setSearchedText] = useState('');
+ const [sortedInfo, setSortedInfo] = useState({});
+ const [editDataval, setEditDataVal] = useState(true);
+ const [messageType, setMessageType] = useState('');
+ const [messageData, setMessageData] = useState('');
+ const [imageSubCategoryUrl, setSubCategoryImageUrl] = useState('');
+
+ const [selectedCategory, setSelectedCategory] = useState(null);
+ const [tableData, setTableData] = useState([]);
+
+ const Columns = [
+ {
+ title: 'Sl.No',
+ key: 'sno',
+ align: 'center',
+ render: (text, object, index) => (
+ {(page - 1) * 10 + index + 1}
+ ),
+ },
+ {
+ title: 'SubCategory Name',
+ dataIndex: 'SubCategory',
+ key: 'SubCategory',
+ editable: true,
+ render: (text) => {text},
+ filteredValue: [searchedText],
+ onFilter: (value, record) => {
+ return (
+ String(record.TableName)
+ ?.toLowerCase()
+ ?.includes(value?.toLowerCase()) ||
+ String(record.TableName)
+ ?.toLowerCase()
+ ?.includes(value?.toLowerCase()) ||
+ String(record.ChairCount)
+ ?.toLowerCase()
+ ?.includes(value?.toLowerCase()) ||
+ String(record.ChairLevelSer)
+ ?.toLowerCase()
+ ?.includes(value?.toLowerCase()) ||
+ String(record.DineInTypeName)
+ ?.toLowerCase()
+ ?.includes(value?.toLowerCase())
+ );
+ },
+ sorter: (a, b) => a?.ProdName?.length - b?.ProdName?.length,
+ sortOrder:
+ sortedInfo.columnKey === 'SubCategory' ? sortedInfo.order : null,
+ ellipsis: true,
+ },
+ {
+ title: 'Action',
+ key: 'Action',
+ dataIndex: 'Action',
+ align: 'center',
+ render: (_, record, index) => (
+ // Tabledata.length >= 1 ? (
+
+
+
+
+ {
+ await validateSafeInput(value);
+
+ if (value && value.length > 50) {
+ return Promise.reject(
+ 'Category Name should not exceed 50 characters'
+ );
+ }
+
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+ Category Name
+ }
+ autocomplete="off"
+ />
+
+
+
+
+
+
+
+ Upload Icon
++
+
+
+
+
+ }
+ />
+
+ )
+});
+
+export default AddSubCategoryModal
\ No newline at end of file
diff --git a/src/Pages/Product/Utils/AddTaxModal.jsx b/src/Pages/Product/Utils/AddTaxModal.jsx
new file mode 100644
index 0000000..e093b45
--- /dev/null
+++ b/src/Pages/Product/Utils/AddTaxModal.jsx
@@ -0,0 +1,193 @@
+import { forwardRef, useCallback, useState } from "react";
+import { DefaultModal } from "../../../Components/Modal/DefaultModal";
+import { Form } from "antd";
+import { DropDowns } from "../../../Components/Forms/DropDown";
+import { InputField } from "../../../Components/Forms/InputField";
+import { getSession, validateSafeInput } from "../../../Services/Others";
+import { useDispatch } from "react-redux";
+import { Messages } from "../../../Components/Notifications/Messages";
+import { DatePic } from '../../../Components/Forms/DatePicker.jsx';
+import { getAdmin as getTax } from "../../../Features/Tax/Tax.js";
+import { getAdmin, postTax } from "../../../Features/ProductPage/ProductPage.js";
+const AddTaxModal = forwardRef((
+ {
+ open = false,
+ close = () => { },
+ prodTaxData = [],
+ flag = false,
+ }, ref) => {
+
+ const dispatch = useDispatch();
+ console.log(prodTaxData, 'prodTaxData in modal');
+ const AppId = getSession('AppId');
+ const CompId = getSession('CompId');
+ const UserId = getSession('UserId');
+
+ const [messageType, setMessageType] = useState(null);
+ const [messageData, setMessageData] = useState(null);
+ const [selectedTaxNameId, setSelectedTaxNameId] = useState(null);
+
+ const handleTaxNameDropDownChange = async (ConfigId) => {
+ ref.current?.setFieldsValue({ TaxName: ConfigId });
+ await setSelectedTaxNameId(ConfigId);
+ };
+
+ const handleTaxModalClose = () => {
+ close(false);
+ setSelectedTaxNameId(null);
+ ref.current?.resetFields();
+ }
+
+ const handleSubmitTax = async () => {
+ try {
+ const subTaxData = await ref?.current?.validateFields();
+ const effectiveDate = new Date(subTaxData.EffectiveFrom);
+ const formattedDate = effectiveDate.toLocaleDateString('en-CA');
+ const addTaxData = {
+ CompId: CompId,
+ AppId: AppId,
+ TaxName: subTaxData?.TaxName,
+ TaxPercentage: subTaxData?.TaxPercentage,
+ EffectiveFrom: formattedDate,
+ Reference: subTaxData.Reference,
+ CreatedBy: UserId,
+ };
+
+ const response = await dispatch(postTax(addTaxData)).unwrap();
+ if (response?.data?.statusCode == 1) {
+ setMessageType('success');
+ setMessageData(response?.data?.response);
+ close(false);
+ if (flag) {
+ await dispatch(getTax({ CompId: CompId, AppId: AppId }));
+ } else {
+ await dispatch(getAdmin({ CompId: CompId, AppId: AppId }));
+ }
+ ref?.current?.resetFields();
+ setSelectedTaxNameId(null);
+ } else {
+ setMessageType('error');
+ setMessageData(response?.data?.response);
+ }
+ } catch (error) {
+ console.log('Error:', error?.message);
+ }
+ };
+
+ const onComplete = useCallback(() => {
+ setMessageType(null);
+ setMessageData(null);
+ }, []);
+
+ return (
+ <>
+
+
+
+
+
+ ({
+ value: option?.ConfigId,
+ label: option?.ConfigName,
+ }))}
+ label={}
+ className="field-DropDown"
+ onChangeFunction={handleCatDropDownChange}
+ valueData={selectedCategory}
+ disabled={tableData?.length >= 1}
+ />
+
+
+
+
+
+
+
+ SubCategory Name
+ }
+ autocomplete="off"
+ />
+
+
+
+
+ {
+ try {
+ const values =
+ await ref.current?.validateFields(
+ ['CategoryId', 'SubConfigName']
+ );
+ const trimmedValue = values?.SubConfigName
+ ? values.SubConfigName.trim()
+ : '';
+ if (!values?.CategoryId) {
+ throw new Error('Please Select Category');
+ }
+ if (!trimmedValue) {
+ throw new Error('SubCategory Name is required');
+ }
+ await validateSafeInput(trimmedValue);
+ if (trimmedValue.length > 50) {
+ throw new Error(
+ 'SubCategory Name should not exceed 50 characters'
+ );
+ }
+ !editDataval ? handleEdit() : handleAddSubCategory();
+ } catch (error) {
+ message.error(
+ error.message || 'Please fill required fields'
+ );
+ }
+ }}
+ />
+
+
+
+
+
+
+
+
+ ({
+ value: option.ConfigId,
+ label: option.ConfigName,
+ }))}
+ label="Tax Name"
+ className="field-DropDown"
+ onChangeFunction={handleTaxNameDropDownChange}
+ valueData={selectedTaxNameId}
+ />
+
+
+ {
+ await validateSafeInput(value); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+ {
+ let cleanedValue = e.target.value.replace(
+ /[^0-9.]/g,
+ ''
+ ); // Remove invalid characters
+ const parts = cleanedValue.split('.');
+
+ if (cleanedValue.startsWith('.')) {
+ cleanedValue = '0' + cleanedValue;
+ }
+
+ e.target.value =
+ parts.length > 2
+ ? `${parts[0]}.${parts.slice(1).join('')}`
+ : cleanedValue;
+ }}
+ />
+
+
+ {
+ await validateSafeInput(value); // To block HTML tags & SQL keywords
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+
+
+
+
+ }
+ handleSubmit={handleSubmitTax}
+ handleCancel={handleTaxModalClose}
+ />
+
+ )
+});
+
+export default AddTaxModal;
\ No newline at end of file
diff --git a/src/Pages/Product/Utils/DefaultSettingPopover.jsx b/src/Pages/Product/Utils/DefaultSettingPopover.jsx
index 72bd4cb..34801b6 100644
--- a/src/Pages/Product/Utils/DefaultSettingPopover.jsx
+++ b/src/Pages/Product/Utils/DefaultSettingPopover.jsx
@@ -2,12 +2,19 @@ import { memo, useState, useEffect } from "react";
import { DropDowns } from "../../../Components/Forms/DropDown";
import { Checkbox, Popover } from "antd";
import { Settings, X } from "lucide-react";
+import { PlusCircleOutlined } from '@ant-design/icons';
+import { Tooltip } from 'antd';
+import { getActiveProdSubCatData } from "../../../Features/ProductPage/ProductPage";
+import { useDispatch } from "react-redux";
+import { getSession } from "../../../Services/Others";
-const DefaultSettingPopover = memo(({ field, options, onSubmit, currentDefault, popOverHeading, checkBoxHeading = 'Apply to all existing rows', showField }) => {
+const DefaultSettingPopover = memo(({ field, options, onSubmit, currentDefault, popOverHeading, checkBoxHeading = 'Apply to all existing rows', showField, Component = null, triggerModal = () => { }, needAllSubCategories = false }) => {
+ const dispatch = useDispatch();
const [selectedValue, setSelectedValue] = useState(currentDefault);
const [applyToAll, setApplyToAll] = useState(false);
const [open, setOpen] = useState(false);
- console.log(showField, "showField")
+ const [fetchSubCategoriesData, setFetchSubCategoriesData] = useState(false);
+ console.log(Component, "showField")
useEffect(() => {
if (open) {
setSelectedValue(currentDefault);
@@ -15,6 +22,17 @@ const DefaultSettingPopover = memo(({ field, options, onSubmit, currentDefault,
}
}, [open, currentDefault]);
+ useEffect(() => {
+
+ const fetchAllSubCategories = async () => {
+ await (dispatch(getActiveProdSubCatData({ AppId: getSession('AppId') })))?.unwrap();
+ }
+
+ if (fetchSubCategoriesData) {
+ fetchAllSubCategories();
+ }
+ }, [fetchSubCategoriesData]);
+
const handleSubmit = () => {
onSubmit(field, selectedValue, applyToAll);
setOpen(false);
@@ -39,21 +57,34 @@ const DefaultSettingPopover = memo(({ field, options, onSubmit, currentDefault,
+
+
+
+ {showField}
}
-
+
+ {
+ triggerModal(true);
+ if (needAllSubCategories) {
+ setFetchSubCategoriesData(true);
+ }
+ }}
+ />
+
+ )}
-
+ {Component}
-
+
+
);
});