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

For Pull

Browse Source
This commit is contained in:
Moe Su
2017-06-11 16:11:44 +06:30
parent 33cc576f1e
commit 29cdcfb28d
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/origami/redeem_payments_controller.rb
View File

@@ -1,9 +1,9 @@
class Origami::RedeemPaymentsController < BaseOrigamiController class Origami::RedeemPaymentsController < BaseOrigamiController
def index def index
sale_id = params[:sale_id] @sale_id = params[:sale_id]
payment_method = params[:payment_method] payment_method = params[:payment_method]
@membership_rebate_balance=0 @membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(sale_id) sale_data = Sale.find_by_sale_id(@sale_id)
if sale_data if sale_data
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)
@@ -12,18 +12,23 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
@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 'Hello Hello' if membership_setting.gateway_url
puts membership_setting.to_json member_actions =MembershipAction.find_by_membership_type("get_account_balance")
member_actions =MembershipAction.find_by_membership_type("get_account_balance") if member_actions.gateway_url
puts member_actions.to_json url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
puts url if membership_data["status"]==true
@membership_rebate_balance=membership_data["balance"]
membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) @out = true, @membership_rebate_balance,@membership_id
if membership_data["status"]==true end
@membership_rebate_balance=membership_data["balance"] else
@out = true, @membership_rebate_balance,@membership_id @out =false,0
end
else
@out = false,0
end end
else else
@out = false, 0 @out = false, 0
end end

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

@@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label class="col-lg-4 col-md-4 col-sm-4">Valid Amount</label> <label class="col-lg-4 col-md-4 col-sm-4">Valid Amount</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>"> <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
</div> </div>
<hr> <hr>
</div> </div>
@@ -77,12 +77,12 @@
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number"></div> <div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number">DEL</div> <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number">CLR</div> <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
</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" >PAY</div>
</div> </div>
</div> </div>
</div> </div>
@@ -95,9 +95,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();
@@ -122,22 +122,26 @@ $(document).on('click', '.cashier_number', function(event){
case 'clr': case 'clr':
$('#used_amount').html("0.0"); $('#used_amount').html("0.0");
break; break;
case 'del' :
var cash=$('#used_amount').text();
$('#used_amount').text(cash.substr(0,cash.length-1));
break;
} }
// event.handled = true; event.handled = true;
// } else { } else {
// return false; return false;
// } }
}); });
$("#redeem").click(function(){ $("#redeem").click(function(){
valid_amount = $("#valid_amount").val(); valid_amount = $("#valid_amount").val();
sale = "<%=@sale_id %>"; sale_id = $("#valid_amount").attr('data-value');
membership_id = $(this).attr('data-member-value'); membership_id = $("#valid_amount").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!")
}else if(valid_amount< redeem_amount){ }else if(valid_amount< redeem_amount || redeem_amount == ""){
alert("Please type valid amount"); alert("Please type valid amount");
}else{ }else{
$.ajax({ $.ajax({