From 6d34f925060119f84141d30403e8ecbaddc751ca Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 12 Jun 2017 16:33:18 +0630
Subject: [PATCH] update crm api

---
 app/controllers/crm/customers_controller.rb     | 8 ++++----
 app/controllers/origami/customers_controller.rb | 9 +++++++--
 app/controllers/origami/home_controller.rb      | 4 ++--
 config/initializers/kaminari_config.rb          | 2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index c9c24240..b3656673 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -68,12 +68,12 @@ class Crm::CustomersController < BaseCrmController
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
-        app_token       = membership.auth_token.to_s
+        merchant_uid       = memberaction.merchant_account_id.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
-                                                        member_group_id: member_group_id}.to_json,
+                                                        member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
@@ -129,12 +129,12 @@ end
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         memberaction    = MembershipAction.find_by_membership_type("update_membership_customer")
-        app_token       = membership.auth_token.to_s
+        merchant_uid    = memberaction.merchant_account_id.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
-                                                        id: id,member_group_id:member_group_id}.to_json,
+                                                        id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 74148296..a1a067fe 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/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
+    puts "Errrrrrrrrrrrrrrrrr"
+   puts  @crm_customer.new_record?
+  
+   
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 3db086b9..5742c366 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -72,10 +72,10 @@ class Origami::HomeController < BaseOrigamiController
     membership      = MembershipSetting.find_by_membership_type("paypar_url")
 
     memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
-    app_token       = membership.auth_token.to_s
+    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}.to_json,
+     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index b1d87b01..bcf4e43b 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -1,5 +1,5 @@
 Kaminari.configure do |config|
-  # config.default_per_page = 25
+   config.default_per_page = 2
   # config.max_per_page = nil
   # config.window = 4
   # config.outer_window = 0