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/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -1,10 +1,8 @@
 class Origami::RoomInvoicesController < BaseOrigamiController
 	def index
    @room = DiningFacility.find(params[:room_id])
-    puts "room bookig lenght"
    @sale_array = Array.new
    @room.bookings.each do |booking|
-      puts booking.sale_id

         if booking.sale_id.nil?
         else