From b14f4d67a5a5def04a397164332db3dd82cc2add Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 18:23:12 +0630 Subject: [PATCH] origamijs --- app/assets/javascripts/origami.js | 14 ++++++++++---- app/controllers/crm/customers_controller.rb | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 45c6d909..b3872b84 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -188,11 +188,17 @@ $(document).ready(function(){ function show_customer_details(customer_id){ + if(window.location.pathname.substring(0, 12) == "/origami/SAL"){ + var url = customer_id+"/get_customer/" + }else{ + var url = "origami/"+customer_id+"/get_customer/" + } + $('.customer_detail').removeClass('hide'); //Start Ajax $.ajax({ type: "GET", - url: "origami/"+customer_id+"/get_customer/", + url: url, data: {}, dataType: "json", success: function(data) { @@ -201,10 +207,10 @@ $(document).ready(function(){ if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){ var balance = data["response_data"]["data"][i]["balance"]; console.log(balance); - if (balance) { - $("#customer_amount").text(balance); + if (balance == "0.0") { + $("#customer_amount").text('0.0'); }else{ - $("#customer_amount").text('00'); + $("#customer_amount").text(balance); } diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 01acd441..c33db2e1 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -124,14 +124,14 @@ end phone = customer_params[:contact_no] email = customer_params[:email] date_of_birth = customer_params[:date_of_birth] - id = customer_params[:membership_id] + id = @crm_customer.membership_id member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("update_membership_customer") 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,merchant_uid:merchant_uid}.to_json,