merge with crm

2017-06-23 17:51:09 +06:30
parent 68403617a5 f5f0f9e077
commit 27ff8b89e7
22 changed files with 465 additions and 307 deletions
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -9,9 +9,11 @@ class Origami::RoomsController < BaseOrigamiController
    @room.bookings.each do |booking|
         if booking.sale_id.nil?
           @order_items = Array.new
+           
           booking.booking_orders.each do |booking_order|
              order = Order.find(booking_order.order_id)
              @obj = order
+              @customer = order.customer
              order.order_items.each do |item|
                @order_items.push(item)
              end
@@ -23,6 +25,7 @@ class Origami::RoomsController < BaseOrigamiController
           if sale.sale_status != "completed"
             @status = 'sale'
             @obj = sale
+             @customer = sale.customer
           end
         end
    end