merge with crm

app/controllers/origami/customers_controller.rb

@@ -1,7 +1,38 @@
 class Origami::CustomersController < BaseOrigamiController
   #Form to add customer -
   def index
+    
+  
   end
-  def create
+
+  # GET /crm/customers/1
+  # GET /crm/customers/1.json
+  def show
   end
+
+
+  
+  def add_customer
+
+    @sale_id        = params[:sale_id]
+    filter          = params[:filter]
+
+    if filter.nil?
+      @crm_customers = Customer.order("name").page(params[:page])
+    else
+      @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page])
+    end
+    @crm_customer    = Customer.new
+    @membership     = Customer.get_member_group
+     if @membership["status"] == true
+       @member_group = @membership["data"]
+     end
+    respond_to do |format|
+      # format.html { render :template => "crm/customers/index" }
+      format.html { render action: "index"}
+      format.json { render json: @crm_customers }
+    end
+  end
+
+ 
 end

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