merge with crm

app/controllers/origami/customers_controller.rb

@@ -12,8 +12,17 @@ class Origami::CustomersController < BaseOrigamiController
 
   def add_customer
 
-    @sale_id        = params[:sale_id]
-    filter          = params[:filter]
+    @sale_id             = params[:sale_id]
+     if(@sale_id[0,3] == "SAL")
+       @booking          = Booking.find_by_sale_id(@sale_id)
+       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+    else
+       @booking_order    = BookingOrder.find_by_order_id(@sale_id)
+       @booking          = Booking.find(@booking_order.booking_id)
+       @dining_facility  = DiningFacility.find(@booking.dining_facility_id)
+    end
+    
+    filter               = params[:filter]
 
     filter = params[:filter]
     

app/controllers/origami/home_controller.rb

@@ -23,13 +23,13 @@ class Origami::HomeController < BaseOrigamiController
            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
-              if (order.status == "new")
+              if (order.status == "new")                
                 @obj_order = order
+                @customer = order.customer
                 @date = order.created_at
                 order.order_items.each do |item|
                   @order_items.push(item)
                 end
-              end
            end
            @status_order = 'order'
          else
@@ -43,6 +43,7 @@ class Origami::HomeController < BaseOrigamiController
              @date = sale.created_at
              @status_sale = 'sale'
              @obj_sale = sale
+             @customer = sale.customer
            end
          end
      end

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