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

Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-08 19:05:46 +06:30
parent 43debf4b7e 451804366c
commit c11b4b7fe0
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,25 +4,32 @@ class Origami::OthersPaymentsController < BaseOrigamiController
def index
@membership_rebate_balance = 0
@sale_id = params[:sale_id]
sale_data = Sale.find_by_sale_id(@sale_id)
customer_data= Customer.find_by_customer_id(sale_data.customer_id)
@membership_id = customer_data.membership_id
if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
if membership_data["status"]==true
membership_account_data = membership_data["data"];
membership_account_data.each do |acc_data|
if acc_data["accountable_type"] == "REBATEACCOUNT"
@membership_rebate_balance=acc_data["balance"]
else
@membership_rebate_balance = 0
end
end
else
@membership_rebate_balance = 0
end
end
@payment_method_setting = PaymentMethodSetting.all
# @sale_id = params[:sale_id]
# sale_data = Sale.find_by_sale_id(@sale_id)
# if sale_data.customer_id
# customer_data= Customer.find_by_customer_id(sale_data.customer_id)
# @membership_id = customer_data.membership_id
# if !@membership_id.nil?
# membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
# membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
# if membership_data["status"]==true
# membership_account_data = membership_data["data"];
# membership_account_data.each do |acc_data|
# if acc_data["accountable_type"] == "REBATEACCOUNT"
# @membership_rebate_balance=acc_data["balance"]
# else
# @membership_rebate_balance = 0
# end
# end
# else
# @membership_rebate_balance = 0
# end
# end
# else
# end
end
def create

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

@@ -2,11 +2,11 @@
<div class="col-lg-5 col-md-5 col-sm-3">
<div class="card">
<% if @membership_id!=0 %>
<div class="col-md-5">
<div class="col-md-12 long purple " id="redeem_account">Redim Amount</div>
</div>
<% end %>
<% @payment_method_setting.each do |payment_method|%>
<div class="col-md-5">
<div class="col-md-12 long purple " id="<%= payment_method.payment_method%>"><%= payment_method.payment_method %></div>
</div>
<% end %>
</div>
</div>
@@ -134,7 +134,7 @@ $(document).on('click', '.cashier_number', function(event){
}
});
$("#redeem_account").click(function(){
$("#REDIMREBATE").click(function(){
$('.rebate-form').removeAttr("hidden");
});