git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Nweni
2017-06-11 13:02:03 +06:30
parent 82de95ca22
commit aa8068ad10
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/membership_actions_controller.rb
View File

@@ -17,10 +17,12 @@ class Settings::MembershipActionsController < ApplicationController
sale_data = Sale.find_by_sale_id(@sale_id) sale_data = Sale.find_by_sale_id(@sale_id)
if sale_data.customer_id if sale_data.customer_id
customer_data= Customer.find_by_customer_id(sale_data.customer_id) customer_data= Customer.find_by_customer_id(sale_data.customer_id)
puts customer_data.to_json
@membership_id = customer_data.membership_id @membership_id = customer_data.membership_id
@campaign_type_id =1 @campaign_type_id =1
if !@membership_id.nil? if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("paypar_url") membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
puts membership_setting
membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
if membership_data["status"]==true if membership_data["status"]==true
@membership_rebate_balance=membership_data["balance"] @membership_rebate_balance=membership_data["balance"]

3
app/views/origami/others_payments/index.html.erb
View File

@@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value = "<%= @membership_id %>">PAY</div> <div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">PAY</div>
</div> </div>
</div> </div>
</div> </div>
@@ -133,7 +133,6 @@ $(document).on('click', '.cashier_number', function(event){
// return false; // return false;
// } // }
}); });
$("#REDIMREBATE").click(function(){ $("#REDIMREBATE").click(function(){
$('.rebate-form').removeAttr("hidden"); $('.rebate-form').removeAttr("hidden");
gateway_url = $(this).attr("data-url"); gateway_url = $(this).attr("data-url");