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

update quick service for payment

Browse Source
This commit is contained in:
Aung Myo
2018-02-02 18:03:43 +06:30
parent 3f584edbd8
commit 1d9164aaf0
24 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/origami/addorders_controller.rb
View File

@@ -136,9 +136,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
result = {:status=> @status, :data => @sale }
render :json => result.to_json
puts @status
puts @sale.to_json
puts "ssssssssssssssssssss"
end
end

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

@@ -1,6 +1,7 @@
class Origami::CreditPaymentsController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit visa_amount
sale_data = Sale.find_by_sale_id(@sale_id)

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

@@ -2,7 +2,7 @@ class Origami::JcbController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit jcb_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total

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

@@ -2,7 +2,7 @@ class Origami::MasterController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit master_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total

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

@@ -1,7 +1,7 @@
class Origami::MpuController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit mpu_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total

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

@@ -2,6 +2,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
def index
@membership_rebate_balance = 0
@sale_id = params[:sale_id]
@cashier_type = params[:type]
@payment_method_setting = PaymentMethodSetting.all
@rebate = MembershipSetting.find_by_rebate(1)

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

@@ -146,6 +146,7 @@ class Origami::PaymentsController < BaseOrigamiController
def show
sale_id = params[:sale_id]
@cashier_type = params[:type]
@member_discount = MembershipSetting.find_by_discount(1)

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

@@ -1,6 +1,7 @@
class Origami::PayparPaymentsController < BaseOrigamiController
def create
sale_id = params[:sale_id]
@cashier_type = params[:type]
redeem_amount = params[:redeem_amount]
membership_id = params[:membership_id]
payment_method = "paypar"

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

@@ -2,6 +2,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
payment_method = params[:payment_method]
@cashier_type = params[:type]
@membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(@sale_id)

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

@@ -1,7 +1,7 @@
class Origami::UnionpayController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit unionpay_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
@@ -23,8 +23,6 @@ class Origami::UnionpayController < BaseOrigamiController
others = others + sale_payment.payment_amount
end
end
puts "unionpaycount"
puts @unionpaycount
@can_unionpay = total - @unionpaycount - others
@member_discount = MembershipSetting.find_by_discount(1)
@sub_total = sale_data.total_amount

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

@@ -1,7 +1,7 @@
class Origami::VisaController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
@cashier_type = params[:type]
# limit visa_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total