merge with crm

app/controllers/origami/home_controller.rb

@@ -17,7 +17,12 @@ class Origami::HomeController < BaseOrigamiController
   	@booking_orders = Order.get_booking_order_table()
   	@booking_rooms = Order.get_booking_order_rooms()
   	@orders = Order.get_orders()
+<<<<<<< HEAD
   end  
+=======
+
+  end
+>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
 
   def item_show
   	selection(params[:booking_id],1)
@@ -45,4 +50,23 @@ class Origami::HomeController < BaseOrigamiController
       str
     end
   end
+
+  def update_sale_by_customer
+
+      sale = Sale.find(params[:sale_id])
+      status = sale.update_attributes(customer_id: params[:customer_id])
+
+      if status == true
+        render json: JSON.generate({:status => true})
+      else
+        render json: JSON.generate({:status => false, :error_message => "Record not found"})
+
+      end 
+  end
+
+  def get_customer
+    @customer = Customer.find(params[:customer_id])
+
+    render :json => @customer.to_json
+  end
 end