diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index c15b6991..4af97d29 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -181,7 +181,6 @@ $(document).ready(function(){
 		}else{
 			var sale_id = $(".selected-item").find(".order-cid").text();
 		}
-		alert(sale_id);
 		window.location.href = '/origami/'+ sale_id  + "/add_customer"
 
 		return false;
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index c9c24240..01acd441 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/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5804f602..8606b44a 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -82,9 +82,10 @@ class SalePayment < ApplicationRecord
       membership_actions_data = MembershipAction.find_by_membership_type("redeem");
       if !membership_actions_data.nil?
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
-       campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
+        merchant_uid = membership_actions_data.merchant_account_id
+        campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
         response = HTTParty.post(url,
-                :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json,
+                :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid}.to_json,
                 :headers => {
                           'Content-Type' => 'application/json',
                           'Accept' => 'application/json'
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 83678543..0332fa12 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -29,10 +29,13 @@
               # Assigned Id for new Order? Sale?
               unique_id = ""
               customer_id = ""
+
               # For CSS- Class for Order? Sale?
               sale_status=""
               if cpo.order_status == 'new'
                 unique_id=cpo.booking_id
+
+                customer_id=cpo.order_customer_id
                 # check selected item and assign
                 if @selected_item != nil
                   if cpo.order_id == @selected_item.order_id
@@ -41,6 +44,7 @@
                 end
               else
                 unique_id=cpo.sale_id
+                customer_id=cpo.sale_customer_id
                 sale_status="paid"
                 # check selected item and assign
                 if @selected_item != nil
@@ -52,9 +56,11 @@
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
+
               <p class="hidden orders-id"><%= unique_id  %></p>
               <p class="hidden customer-id"><%= customer_id  %></p>
-              <h4 class="card-title orders-table"><%= cpo.table_name %></h4>
+              <p class="hidden order-cid"><%= cpo.order_id  %></p>
+              <h4 class="card-title orders-table"><%= cpo.table_name %></h4> 
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
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
diff --git a/db/seeds.rb b/db/seeds.rb
index 563710c5..28cbe535 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -145,19 +145,20 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu
 request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
 crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"})
 
-member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"})
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
-member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}},
-  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}},
-  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer"},
-  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer"},
-  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group"},
-  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}},
-  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"}
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}
   ])
-payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"})
+
 payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"})
 payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http//192.168.1.47:3006"})
+payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
 
 # shop = Shop.create(
diff --git a/dump.rdb b/dump.rdb
index 9a81a61e..62a327a0 100644
Binary files a/dump.rdb and b/dump.rdb differ