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/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -118,8 +118,6 @@ class Oqs::HomeController < BaseOqsController
    status = params[:status]

    items  = queue_items_query(false,oqs_id,filter,table_id,status)
-puts "items0"
-puts items.to_json
    if !items.empty?
      items.each do |item|
        if !item.set_menu_items.nil?