update OQS and cashier

This commit is contained in:
Aung Myo
2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions

View File

@@ -24,10 +24,12 @@ class Origami::RoomsController < BaseOrigamiController
@order_items = Array.new
booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id)
@customer = order.customer
if (order.status == "new")
@obj_order = order
@customer = order.customer
@date = order.created_at
@booking = booking
order.order_items.each do |item|
@order_items.push(item)
end
@@ -42,6 +44,7 @@ class Origami::RoomsController < BaseOrigamiController
if @status_order == 'order'
@status_order = 'sale'
end
@booking = booking
@date = sale.created_at
@status_sale = 'sale'
@obj_sale = sale