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

redeem process

Browse Source
This commit is contained in:
Moe Su
2017-06-09 02:40:35 +06:30
parent 7702c50675
commit c23f726cb3
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/sale_payment.rb
View File

@@ -79,17 +79,22 @@ class SalePayment < ApplicationRecord
end end
def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id) def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
url = paypar_url.to_s + "/api/redeem".to_s membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url");
response = HTTParty.post(url, if !membership_actions_data.nil?
url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
campaign_type_id = 1
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:""}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json' 'Accept' => 'application/json'
} }
) )
puts "RRRRRRRR" else
puts response.to_json response =false;
return response; end
return response;
end end

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

@@ -99,9 +99,9 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).on('click', '.cashier_number', function(event){ $(document).on('click', '.cashier_number', function(event){
event.stopPropagation(); // event.stopPropagation();
event.preventDefault(); // event.preventDefault();
if(event.handled !== true) { // if(event.handled !== true) {
var original_value; var original_value;
original_value = $('#used_amount').text(); original_value = $('#used_amount').text();
@@ -128,10 +128,10 @@ $(document).on('click', '.cashier_number', function(event){
break; break;
} }
event.handled = true; // event.handled = true;
} else { // } else {
return false; // return false;
} // }
}); });
$("#REDIMREBATE").click(function(){ $("#REDIMREBATE").click(function(){
@@ -141,7 +141,7 @@ $("#REDIMREBATE").click(function(){
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "../../../../settings/membership_actions", url: "../../../../settings/membership_actions",
data: {type:"redeem_url",gateway_url:gateway_url,sale_id:sale_id}, data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id},
success: function(result){ success: function(result){
$("#valid_amount").val(result[1]); $("#valid_amount").val(result[1]);
} }
@@ -153,7 +153,6 @@ $("#REDIMREBATE").click(function(){
$("#redeem").click(function(){ $("#redeem").click(function(){
valid_amount = $("#valid_amount").val(); valid_amount = $("#valid_amount").val();
sale_id = $("#REDIMREBATE").attr("data-sale-id"); sale_id = $("#REDIMREBATE").attr("data-sale-id");
alert(sale_id);
membership_id = $(this).attr("data-member-value"); membership_id = $(this).attr("data-member-value");
redeem_amount = parseInt($("#used_amount").text()); redeem_amount = parseInt($("#used_amount").text());
if(redeem_amount<=0){ if(redeem_amount<=0){