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/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -59,8 +59,6 @@ class Inventory::StockChecksController < BaseInventoryController

      #Pull this menu
      @menu_category = InventoryDefinition.search_by_category(params[:id])
-      puts @menu_category.to_json
-      # puts @menu.menu_items[1].item_attributes.to_json
      return @menu_category
    else
      MenuCategory.current_menu