Merge branch 'develop'

the-AjK · Apr 9, 2018 · 3aeb289 · 3aeb289
2 parents a9c2cab + 28c95ec
commit 3aeb289
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/db.js b/src/db.js
@@ -509,10 +509,10 @@ exports.getMenuSuggestions = (cb) => {
         for (let j = 0; j < m.firstCourse.items.length; j++) {
           const fc = m.firstCourse.items[j];
           fcs.push(fc.value);
-          condiments.concat(fc.condiments);
+          condiments = condiments.concat(fc.condiments);
         }
-        scs.concat(m.secondCourse.items);
-        sideDishes.concat(m.secondCourse.sideDishes);
+        scs = scs.concat(m.secondCourse.items);
+        sideDishes = sideDishes.concat(m.secondCourse.sideDishes);
       }
       cb(null, {
         fc: removeDuplicates(fcs),

diff --git a/src/telegram/bot.js b/src/telegram/bot.js
@@ -250,13 +250,13 @@ bot.mention(['@tables', '@table'], (ctx) => {
         if (mention == 'table') {
           //find user table and broadcast the message
           for (let i = 0; i < orders.length; i++) {
-
-            if (orders[i].owner._id.equals(ctx.session.user._id)) {
+            let orderOwner = orders[i].owner._id.toString(),
+              user = ctx.session.user._id.toString();
+            if ( orderOwner === user) {
               userHasOrdered = true;
               const userTableName = orders[i].table.name;
               for (let j = 0; j < orders.length; j++) {
-                if (!orders[j].owner._id.equals(ctx.session.user._id) &&
-                  orders[j].table.name == userTableName) {
+                if (orders[j].table.name == userTableName && orderOwner != user) {
                   bot.telegram.sendMessage(orders[j].owner.telegram.id, message, {
                     parse_mode: "markdown"
                   });