merged master

This commit is contained in:
Yan
2017-06-07 17:45:40 +06:30
25 changed files with 142 additions and 91 deletions

View File

@@ -1,10 +0,0 @@
class Origami::CardPaymentsController < BaseOrigamiController
def index
end
def create
end
end

View File

@@ -0,0 +1,10 @@
class Origami::OthersPaymentsController < BaseOrigamiController
def index
end
def create
end
end

View File

@@ -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