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/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -117,8 +117,6 @@ class Settings::PromotionsController < ApplicationController
      end
      res.push({item_inst.menu_item.item_code => arr_inst})
    end
-    puts "res"
-    p res
    render json: res
  end