fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -80,7 +80,7 @@ if (menu.menu_categories)
                alt_name: its.alt_name,
                min_selectable_qty: its.min_selectable_qty,
                max_selectable_qty: its.max_selectable_qty,
-                instances: its.menu_item_instances.pluck(:id).map { |id| {id: id}}
+                instances: its.menu_item_instances.map { |id| {id: id}}
              }
            }