merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/controllers/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RoomInvoicesController < ApplicationController#BaseOrigamiController
+class Origami::RoomInvoicesController < ApplicationController #BaseOrigamiController
 	def index
    @room = DiningFacility.find(params[:room_id])
    puts "room bookig lenght"