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

pay par payment

Browse Source
This commit is contained in:
Moe Su
2017-06-11 13:01:03 +06:30
parent 5f5e6470c7
commit 9f9c83ab7f
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/orgiami.js
View File

@@ -145,7 +145,7 @@ $(document).ready(function(){
// Payment for Bill // Payment for Bill
$('#pay').click(function() { $('#pay').click(function() {
var sale_id=$(".selected-item").find(".orders-id").text(); var sale_id=$(".selected-item").find(".orders-id").text();
if(order_id!=""){ if(sale_id!=""){
window.location.href = '/origami/sale/'+ sale_id + "/payment" window.location.href = '/origami/sale/'+ sale_id + "/payment"
} }
else { else {

1
app/controllers/origami/others_payments_controller.rb
View File

@@ -5,6 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
@membership_rebate_balance = 0 @membership_rebate_balance = 0
@sale_id = params[:sale_id] @sale_id = params[:sale_id]
@payment_method_setting = PaymentMethodSetting.all @payment_method_setting = PaymentMethodSetting.all
# @sale_id = params[:sale_id] # @sale_id = params[:sale_id]
# sale_data = Sale.find_by_sale_id(@sale_id) # sale_data = Sale.find_by_sale_id(@sale_id)

1
app/controllers/origami/paypar_payments_controller.rb
View File

@@ -8,7 +8,6 @@ class Origami::PayparPaymentsController < BaseOrigamiController
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
if status == true if status == true
@out = true, "Success!" @out = true, "Success!"
else else

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

@@ -24,7 +24,7 @@ class Settings::MembershipActionsController < ApplicationController
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"]
@out = true, @membership_rebate_balance @out = true, @membership_rebate_balance,@membership_id
else else
@out = false, 0 @out = false, 0
end end

7
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-member-value = "">PAY</div>
</div> </div>
</div> </div>
</div> </div>
@@ -143,6 +143,7 @@ $("#REDIMREBATE").click(function(){
url: "../../../../settings/membership_actions", url: "../../../../settings/membership_actions",
data: {type:"get_account_balance_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){
$("#redeem").attr("data-member-value",result[2]);
$("#valid_amount").val(result[1]); $("#valid_amount").val(result[1]);
} }
}) })
@@ -152,8 +153,8 @@ $("#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 = "<%=@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){
alert(" Insufficient Amount!") alert(" Insufficient Amount!")