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/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -39,7 +39,6 @@ class Crm::DiningQueuesController < BaseCrmController
  # POST /crm/dining_queues
  # POST /crm/dining_queues.json
  def create
-    puts dining_queue_params
    @dining_queue = DiningQueue.new(dining_queue_params)
    @dining_queue.shop_code = @shop.shop_code
    respond_to do |format|