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

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

Browse Source
This commit is contained in:
Yan
2017-06-13 10:00:47 +06:30
parent 3404c5e0bd 29acbd9bfa
commit 3e691ca3f7
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/models/sale_payment.rb
View File

@@ -236,21 +236,34 @@ class SalePayment < ApplicationRecord
def rebat(sObj) def rebat(sObj)
food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items)
generic_customer_id = sObj.customer.membership_id generic_customer_id = sObj.customer.membership_id
total_amount = food_prices if generic_customer_id != nil || generic_customer_id != ""
receipt_no = sObj.receipt_no paypar = sObj.sale_payments
membership = MembershipSetting.find_by_membership_type("paypar_url") payparcost = 0
memberaction = MembershipAction.find_by_membership_type("rebate") paypar.each do |pp|
campaign_type_id = memberaction.additional_parameter["campaign_type_id"] if pp.payment_method == "paypar"
app_token = membership.auth_token.to_s payparcost = payparcost + pp.payment_amount
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s end
response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, end
receipt_no: receipt_no}.to_json, total_amount = food_prices - payparcost
:headers => { puts "aaaa"
'Content-Type' => 'application/json', puts food_prices
'Accept' => 'application/json' puts payparcost
}) puts total_amount
receipt_no = sObj.receipt_no
membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("rebate")
campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id,
receipt_no: receipt_no}.to_json,
:headers => {
'Content-Type' => 'application/json',
'Accept' => 'application/json'
})
puts response.to_json puts response.to_json
end
end end
private private

2
app/views/origami/home/index.html.erb
View File

@@ -101,7 +101,7 @@
unique_id=bko.booking_id unique_id=bko.booking_id
customer_id=bko.order_customer_id customer_id=bko.order_customer_id
# check selected item and assign # check selected item and assign
if @selected_item != nil if !@selected_item.nil?
if bko.order_id == @selected_item.order_id if bko.order_id == @selected_item.order_id
sale_status = sale_status + " selected-item" sale_status = sale_status + " selected-item"
end end