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

change redeem formula

Browse Source
This commit is contained in:
phyusin
2018-12-18 17:17:40 +06:30
parent da96c57c8c
commit cfad5bc280
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale_payment.rb
View File

@@ -184,7 +184,7 @@ class SalePayment < ApplicationRecord
url = paypar_url.to_s + membership_actions_data.gateway_url.to_s url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
merchant_uid = membership_actions_data.merchant_account_id merchant_uid = membership_actions_data.merchant_account_id
auth_token = membership_actions_data.auth_token auth_token = membership_actions_data.auth_token
campaign_type_id = membership_actions_data.additional_parameters["campaign_type_id"] campaign_type_id = JSON.parse(membership_actions_data.additional_parameters)["campaign_type_id"]
sale_data = Sale.find_by_sale_id(sale_id) sale_data = Sale.find_by_sale_id(sale_id)
if sale_data if sale_data

12
app/views/origami/redeem_payments/index.html.erb
View File

@@ -189,7 +189,17 @@
}); });
}else{ }else{
swal ( "Information" , result.message); swal({
title: 'Oops',
text: result.message.toString(),
type: 'error',
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/Redeem";
});
} }
} }
}) })