merge with master

app/controllers/origami/customers_controller.rb

@@ -18,15 +18,20 @@ class Origami::CustomersController < BaseOrigamiController
     filter          = params[:filter]
 
     if filter.nil?
-      @crm_customers = Customer.order("name").page(params[:page])
+      @crm_customers = Customer.order("name").page params[:page]
     else
-      @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page])
+      @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page params[:page]
     end
+    # @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2)
     @crm_customer    = Customer.new
-    @membership     = Customer.get_member_group
-     if @membership["status"] == true
-       @member_group = @membership["data"]
-     end
+    # @membership     = Customer.get_member_group
+    #  if @membership["status"] == true
+    #    @member_group = @membership["data"]
+    #  end
+    puts "Errrrrrrrrrrrrrrrrr"
+   puts  @crm_customer.new_record?
+  
+   
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}

app/controllers/origami/home_controller.rb

@@ -49,20 +49,47 @@ class Origami::HomeController < BaseOrigamiController
 
   def update_sale_by_customer
 
-      sale = Sale.find(params[:sale_id])
-      status = sale.update_attributes(customer_id: params[:customer_id])
-
-      if status == true
+    id = params[:sale_id][0,3]
+    if(id == "SAL")
+       sale   = Sale.find(params[:sale_id])
+    else
+       sale   = Order.find(params[:sale_id])
+    end
+    
+    status = sale.update_attributes(customer_id: params[:customer_id])
+    
+    if status == true
         render json: JSON.generate({:status => true})
-      else
+    else
         render json: JSON.generate({:status => false, :error_message => "Record not found"})
 
-      end 
+    end 
   end
 
   def get_customer
-    @customer = Customer.find(params[:customer_id])
 
-    render :json => @customer.to_json
+    @customer       = Customer.find(params[:customer_id])
+
+    membership      = MembershipSetting.find_by_membership_type("paypar_url")
+
+    memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
+    merchant_uid       = memberaction.merchant_account_id.to_s
+    url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid}.to_json,
+                                             :headers => {
+                                                      'Content-Type' => 'application/json',
+                                                      'Accept'       => 'application/json'
+                                              }
+                                        )
+
+    respond_to do |format|
+    format.js do
+      render :json => {
+        :response_data => response.as_json,
+        :customer => @customer}
+     end
+     end
   end
+
 end

app/controllers/origami/redeem_payments_controller.rb

@@ -16,7 +16,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  							if member_actions.gateway_url
  								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
  								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
-		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
+ 								merchant_uid= member_actions.merchant_account_id
+		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid)
 		 						if membership_data["status"]==true
 		 							@membership_rebate_balance=membership_data["balance"]
 		 							@out = true, @membership_rebate_balance,@membership_id