a;sdhf
This commit is contained in:
@@ -194,15 +194,7 @@ router.get('/spreaders', async (req, res, next) => {
|
||||
LEFT JOIN equipment_categories ec ON ue.category_id = ec.id
|
||||
WHERE ue.user_id = $1
|
||||
AND ue.is_active = true
|
||||
AND (
|
||||
ec.name ILIKE '%spreader%'
|
||||
OR ue.spreader_type IS NOT NULL
|
||||
OR ue.custom_name ILIKE '%spreader%'
|
||||
OR ue.manufacturer ILIKE '%spreader%'
|
||||
OR ue.manufacturer ILIKE '%lesco%'
|
||||
)
|
||||
AND ue.custom_name NOT ILIKE '%nozzle%'
|
||||
AND ue.custom_name NOT ILIKE '%sprayer%'
|
||||
AND ec.name ILIKE 'spreader'
|
||||
ORDER BY ue.custom_name, ue.manufacturer, ue.model`,
|
||||
[req.user.id]
|
||||
);
|
||||
|
||||
@@ -462,6 +462,7 @@ const CreateProductModal = ({ onSubmit, onCancel, sharedProducts, categories })
|
||||
const selectedSpreader = availableSpreaders.find(s => s.id === parseInt(newSpreaderSetting.equipmentId));
|
||||
const settingWithSpreaderInfo = {
|
||||
...newSpreaderSetting,
|
||||
equipmentId: parseInt(newSpreaderSetting.equipmentId), // Convert to number
|
||||
id: Date.now(),
|
||||
equipmentName: selectedSpreader?.name,
|
||||
equipmentManufacturer: selectedSpreader?.manufacturer,
|
||||
@@ -915,6 +916,7 @@ const EditProductModal = ({ product, onSubmit, onCancel, sharedProducts, categor
|
||||
const selectedSpreader = availableEditSpreaders.find(s => s.id === parseInt(newEditSpreaderSetting.equipmentId));
|
||||
const settingWithSpreaderInfo = {
|
||||
...newEditSpreaderSetting,
|
||||
equipmentId: parseInt(newEditSpreaderSetting.equipmentId), // Convert to number
|
||||
equipmentName: selectedSpreader?.name,
|
||||
equipmentManufacturer: selectedSpreader?.manufacturer,
|
||||
equipmentModel: selectedSpreader?.model
|
||||
|
||||
Reference in New Issue
Block a user