update origami for room

This commit is contained in:
Aung Myo
2017-07-03 12:20:03 +06:30
parent 6c3c863fce
commit 92712787e1
4 changed files with 37 additions and 23 deletions

View File

@@ -55,6 +55,10 @@ class Origami::PaymentsController < BaseOrigamiController
shop_details = Shop.find(1)
# get member information
member_info = Customer.get_member_account(customer)
puts "transaction"
puts rebate_amount.to_json
puts "member_info"
puts member_info.to_json
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)

View File

@@ -6,6 +6,7 @@ class Origami::RoomsController < BaseOrigamiController
@complete = Sale.all
@orders = Order.all.order('date desc')
@room = DiningFacility.find(params[:room_id])
@sale_array = Array.new
@room.bookings.each do |booking|
if booking.sale_id.nil?
@order_items = Array.new
@@ -23,12 +24,16 @@ class Origami::RoomsController < BaseOrigamiController
sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed"
@sale_array.push(sale)
@status = 'sale'
@obj = sale
@customer = sale.customer
end
end
end
puts "hhhhhhhhhh"
puts @status
puts @obj.to_json
end