For pull
This commit is contained in:
27
app/controllers/origami/others_payments_controller.rb
Normal file
27
app/controllers/origami/others_payments_controller.rb
Normal file
@@ -0,0 +1,27 @@
|
||||
class Origami::OthersPaymentsController < BaseOrigamiController
|
||||
|
||||
|
||||
def index
|
||||
@membership_rebate_balance = 0
|
||||
@membership_id = 0
|
||||
if !@membership_id.nil?
|
||||
membership_setting = MembershipSetting.find_by_membership_type("smartpay_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
|
||||
|
||||
def create
|
||||
end
|
||||
|
||||
end
|
||||
@@ -5,13 +5,20 @@ class Origami::PaymentsController < BaseOrigamiController
|
||||
end
|
||||
|
||||
def create
|
||||
#payment type
|
||||
#sale status
|
||||
#point - get [ food amount ]
|
||||
cash = params[:cash]
|
||||
sale_id = params[:sale_id]
|
||||
if(Sale.exists?(sale_id))
|
||||
saleObj = Sale.find(sale_id)
|
||||
sale_payment = SalePayment.new
|
||||
sale_payment.process_payment(saleObj, @user, cash)
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
|
||||
sale_id = params[:sale_id]
|
||||
if Sale.exists?(sale_id)
|
||||
@sale_data = Sale.find_by_sale_id(sale_id)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
3
app/controllers/origami/paypar_controller.rb
Normal file
3
app/controllers/origami/paypar_controller.rb
Normal file
@@ -0,0 +1,3 @@
|
||||
class Origami::PayparController < ApplicationController
|
||||
|
||||
end
|
||||
@@ -1,6 +1,6 @@
|
||||
class Origami::RequestBillsController < BaseOrigamiController
|
||||
|
||||
def create
|
||||
def show
|
||||
@sale = Sale.new
|
||||
|
||||
|
||||
@@ -25,13 +25,5 @@ class Origami::RequestBillsController < BaseOrigamiController
|
||||
printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
|
||||
|
||||
end
|
||||
|
||||
|
||||
def show
|
||||
sale_id = params[:sale_id]
|
||||
if Sale.exists?(sale_id)
|
||||
@sale_data = Sale.find_by_sale_id(sale_id)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user