fix for search modifier

Author: VuXfi

adapters/rms/RMSAdapter.js

@@ -92,7 +92,7 @@ class RMSAdapter {
                     const rmsGroupIds = currentRMSGroupsFlatTree.map((group) => group.rmsId);
                     // Set all groups not in the list to inactive
                     await Group.update({ where: { rmsId: { "!=": rmsGroupIds } } }, { isDeleted: true }).fetch();
-                    sails.log.debug("ADAPTER RMS > syncProducts Groups:", JSON.stringify(rmsGroupIds));
+                    sails.log.silly("ADAPTER RMS > syncProducts Groups:", JSON.stringify(rmsGroupIds));
                     for (const group of currentRMSGroupsFlatTree) {
                         emitter.emit("rms-sync:before-each-group-item", group);
                         group.concept = group.concept ?? "origin";
@@ -117,7 +117,7 @@ class RMSAdapter {
                             let createdProduct = await Dish.createOrUpdate(productData);
                             // Set isDeleted for absent products in ERP
                             await Dish.update({ id: { nin: allProductIds }, parentGroup: group.id }, { isDeleted: true }).fetch();
-                            sails.log.debug(`ADAPTER RMS > syncProducts sync Group [${group.id}] '${group.name}' dishes:`, JSON.stringify(productIds));
+                            sails.log.silly(`ADAPTER RMS > syncProducts sync Group [${group.id}] '${group.name}' dishes:`, JSON.stringify(productIds));
                             const SKIP_LOAD_PRODUCT_IMAGES = (await Settings.get("SKIP_LOAD_PRODUCT_IMAGES")) ?? false;
                             // Load images
                             if (product.images && product.images.length && !SKIP_LOAD_PRODUCT_IMAGES) {

adapters/rms/RMSAdapter.ts

@@ -123,7 +123,7 @@ export default abstract class RMSAdapter {
           // Set all groups not in the list to inactive
           await Group.update({ where: { rmsId: { "!=": rmsGroupIds } } }, { isDeleted: true }).fetch();
 
-          sails.log.debug("ADAPTER RMS > syncProducts Groups:", JSON.stringify(rmsGroupIds))
+          sails.log.silly("ADAPTER RMS > syncProducts Groups:", JSON.stringify(rmsGroupIds))
 
           for (const group of currentRMSGroupsFlatTree) {
             emitter.emit("rms-sync:before-each-group-item", group);
@@ -157,7 +157,7 @@ export default abstract class RMSAdapter {
 
               // Set isDeleted for absent products in ERP
               await Dish.update({id: { nin: allProductIds }, parentGroup: group.id}, {isDeleted: true}).fetch();
-              sails.log.debug(`ADAPTER RMS > syncProducts sync Group [${group.id}] '${group.name}' dishes:`, JSON.stringify(productIds))
+              sails.log.silly(`ADAPTER RMS > syncProducts sync Group [${group.id}] '${group.name}' dishes:`, JSON.stringify(productIds))
 
               const SKIP_LOAD_PRODUCT_IMAGES = (await Settings.get("SKIP_LOAD_PRODUCT_IMAGES")) ?? false;
               // Load images

models/Order.js

@@ -1152,9 +1152,11 @@ let Model = {
                                     whereConditions.push({ id: selectedModifier.id });
                                 }
                                 if (selectedModifier.rmsId) {
-                                    whereConditions.push({ rmsId: selectedModifier.id });
                                     whereConditions.push({ rmsId: selectedModifier.rmsId });
                                 }
+                                else {
+                                    whereConditions.push({ rmsId: selectedModifier.id });
+                                }
                                 let dishes = await Dish.find({
                                     where: { or: whereConditions },
                                 }).limit(2);
@@ -1169,9 +1171,10 @@ let Model = {
                                         },
                                     }).limit(1);
                                 }
-                                const modifierObj = dishes[0];
+                                const old_modifierObj = (await Dish.find({ where: { or: [{ id: selectedModifier.id }, { rmsId: selectedModifier.id }] } }).limit(1))[0];
+                                const modifierObj = dishes[0] || old_modifierObj;
                                 if (!modifierObj) {
-                                    throw "Dish with id " + selectedModifier.id + " not found!";
+                                    throw "Modifier with id " + selectedModifier.id + " not found!";
                                 }
                                 // let opts:  any = {}
                                 // await emitter.emit("core:order-countcart-before-calc-modifier", modifier, modifierObj, opts);

models/Order.ts

@@ -1405,8 +1405,9 @@ let Model = {
                 }
 
                 if (selectedModifier.rmsId) {
-                  whereConditions.push({ rmsId: selectedModifier.id });
                   whereConditions.push({ rmsId: selectedModifier.rmsId });
+                } else {
+                  whereConditions.push({ rmsId: selectedModifier.id });
                 }
 
                 let dishes = await Dish.find({
@@ -1425,10 +1426,11 @@ let Model = {
                   }).limit(1);
                 }
 
-                const modifierObj = dishes[0];
+                const old_modifierObj = (await Dish.find({ where: { or: [{ id: selectedModifier.id }, { rmsId: selectedModifier.id }] } }).limit(1))[0];
+                const modifierObj = dishes[0] || old_modifierObj;
 
                 if (!modifierObj) {
-                  throw "Dish with id " + selectedModifier.id + " not found!";
+                  throw "Modifier with id " + selectedModifier.id + " not found!";
                 }
 
                 // let opts:  any = {}