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

update process payment for current user

Browse Source
This commit is contained in:
Aung Myo
2018-08-07 16:27:32 +06:30
parent 76e626a0d9
commit 0e7db08bfc
16 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/api/payments_controller.rb
View File

@@ -33,68 +33,68 @@ class Api::PaymentsController < ActionController::API
when "cash"
sale_payment.payment_method = "cash"
sale_payment.received_amount = params[:amount]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "creditnote"
sale_payment.payment_method = "creditnote"
sale_payment.received_amount = params[:amount]
sale_payment.customer_id = params[:customer_id]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "visa"
sale_payment.payment_method = "visa"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "master"
sale_payment.payment_method = "master"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "jcb"
sale_payment.payment_method = "jcb"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "mpu"
sale_payment.payment_method = "mpu"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "unionpay"
sale_payment.payment_method = "unionpay"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "vochure"
sale_payment.payment_method = "vochure"
sale_payment.received_amount = params[:amount]
sale_payment.customer_id = params[:customer_id]
sale_payment.payment_reference = params[:vochure_no]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "giftcard"
sale_payment.payment_method = "giftcard"
sale_payment.received_amount = params[:amount]
sale_payment.customer_id = params[:customer_id]
sale_payment.payment_reference = params[:giftcard_no]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "paypar"
sale_payment.payment_method = "paypar"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
#TODO: implement paypar implementation
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "JunctionPay"
sale_payment.payment_method = "JunctionPay"
sale_payment.received_amount = params[:amount]
sale_payment.customer_id = params[:customer_id]
sale_payment.payment_reference = params[:vochure_no]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
when "alipay"
sale_payment.payment_method = "alipay"
sale_payment.received_amount = params[:amount]
sale_payment.payment_reference = params[:payment_reference]
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name)
@status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee)
end
end
end

2
app/controllers/origami/alipay_controller.rb
View File

@@ -81,7 +81,7 @@ class Origami::AlipayController < BaseOrigamiController
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "alipay",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "alipay",ref_no,payment_for)
end
end

2
app/controllers/origami/credit_payments_controller.rb
View File

@@ -44,7 +44,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
saleObj = Sale.find(sale_id)
remark = "credit payment for Receipt No #{saleObj.receipt_no}"
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "creditnote",remark)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "creditnote",remark)
end
end

2
app/controllers/origami/dinga_controller.rb
View File

@@ -86,7 +86,7 @@ def create
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
status, @sale,@membership_data = sale_payment.process_payment(saleObj, current_user.name, cash, "dinga",account_no)
status, @sale,@membership_data = sale_payment.process_payment(saleObj, current_user, cash, "dinga",account_no)
if status == true && @membership_data["status"] == true
@out = true, "Success!"

2
app/controllers/origami/gift_voucher_controller.rb
View File

@@ -59,7 +59,7 @@ class Origami::GiftVoucherController < BaseOrigamiController
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "GiftVoucher",ref_no)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "GiftVoucher",ref_no)
end
end

2
app/controllers/origami/jcb_controller.rb
View File

@@ -82,7 +82,7 @@ class Origami::JcbController < BaseOrigamiController
payment_for = true
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "jcb",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "jcb",ref_no,payment_for)
end
end

2
app/controllers/origami/junction_pay_controller.rb
View File

@@ -63,7 +63,7 @@ class Origami::JunctionPayController < BaseOrigamiController
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "JunctionPay", remarks)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "JunctionPay", remarks)
end
end

2
app/controllers/origami/master_controller.rb
View File

@@ -79,7 +79,7 @@ class Origami::MasterController < BaseOrigamiController
payment_for = true
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "master",ref_no,payment_for)
end
end

2
app/controllers/origami/mpu_controller.rb
View File

@@ -80,7 +80,7 @@ class Origami::MpuController < BaseOrigamiController
payment_for = true
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "mpu",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "mpu",ref_no,payment_for)
end
end

2
app/controllers/origami/paymal_controller.rb
View File

@@ -88,7 +88,7 @@ def create
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
status, @sale,@membership_data = sale_payment.process_payment(saleObj, current_user, cash, "paymal",account_no)
if status == true && @membership_data["status"] == true
@out = true, "Success!"
else

2
app/controllers/origami/payments_controller.rb
View File

@@ -537,7 +537,7 @@ class Origami::PaymentsController < BaseOrigamiController
saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
sale_payment.process_payment(saleObj, current_user, cash, "foc" ,remark)
bookings = Booking.where("sale_id='#{sale_id}'")
if bookings[0].dining_facility_id.to_i > 0

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

@@ -17,7 +17,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
end
sale_payment = SalePayment.new
status,msg =sale_payment.process_payment(saleObj, current_user.name, redeem_amount,payment_method)
status,msg =sale_payment.process_payment(saleObj, current_user, redeem_amount,payment_method)
if status == true
@out = true, "Success!"
else

2
app/controllers/origami/unionpay_controller.rb
View File

@@ -78,7 +78,7 @@ class Origami::UnionpayController < BaseOrigamiController
payment_for = true
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "unionpay",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "unionpay",ref_no,payment_for)
end
end

2
app/controllers/origami/visa_controller.rb
View File

@@ -78,7 +78,7 @@ class Origami::VisaController < BaseOrigamiController
payment_for = true
end
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no,payment_for)
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "visa",ref_no,payment_for)
end
end

2
app/controllers/origami/voucher_controller.rb
View File

@@ -73,7 +73,7 @@ class Origami::VoucherController < BaseOrigamiController
if( response["status"]==true )
saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "voucher")
@status, @sale = sale_payment.process_payment(saleObj, current_user, cash, "voucher")
end
end
end

2
app/models/order_reservation.rb
View File

@@ -161,7 +161,7 @@ class OrderReservation < ApplicationRecord
#end rounding adjustment
sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
sale_payment.process_payment(saleObj, current_user, saleObj.grand_total, "cash")
#order status send to doemal
callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)