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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-07 15:18:19 +06:30
parent 126b371f8f e0dc47490d
commit 0bbf664e6b
2 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/controllers/origami/moveroom_controller.rb
View File

@@ -34,25 +34,25 @@ class Origami::MoveroomController < BaseOrigamiController
end end
end end
@status_order = 'order' @status_order = 'order'
else # else
sale = Sale.find(booking.sale_id) # sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile" # if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
@sale_array.push(sale) # @sale_array.push(sale)
if @status_order == 'order' # if @status_order == 'order'
@status_order = 'sale' # @status_order = 'sale'
end # end
@booking= booking # @booking= booking
@date = sale.created_at # @date = sale.created_at
@status_sale = 'sale' # @status_sale = 'sale'
@obj_sale = sale # @obj_sale = sale
@customer = sale.customer # @customer = sale.customer
accounts = @customer.tax_profiles # accounts = @customer.tax_profiles
@account_arr =[] # @account_arr =[]
accounts.each do |acc| # accounts.each do |acc|
account = TaxProfile.find(acc) # account = TaxProfile.find(acc)
@account_arr.push(account) # @account_arr.push(account)
end # end
end # end
end end
end end
end end

60
app/controllers/origami/movetable_controller.rb
View File

@@ -14,18 +14,39 @@ class Origami::MovetableController < BaseOrigamiController
@status_order = "" @status_order = ""
@status_sale = "" @status_sale = ""
@sale_array = Array.new @sale_array = Array.new
# if !bookings.nil?
# bookings.each do | booking |
# if booking.sale_id.nil? && booking.booking_status != 'moved'
# booking_array.push(booking)
# end
# booking.booking_orders.each do |booking_order|
# order = Order.find(booking_order.order_id)
# if order.status == 'new'
# order.order_items.each do |order_item|
# order_items.push(order_item)
# end
# end
# end
# end
# end
@dining.bookings.each do |booking| @dining.bookings.each do |booking|
if booking.sale_id.nil? if booking.sale_id.nil?
@order_items = Array.new @order_items = Array.new
if booking.booking_status != 'moved'
booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
@obj_order = order @obj_order = order
@customer = order.customer @customer = order.customer
@date = order.created_at @date = order.created_at
@booking= booking @booking= booking
if order.status == 'new'
order.order_items.each do |item| order.order_items.each do |item|
@order_items.push(item) @order_items.push(item)
end end
end
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
@@ -33,26 +54,27 @@ class Origami::MovetableController < BaseOrigamiController
@account_arr.push(account) @account_arr.push(account)
end end
end end
end
@status_order = 'order' @status_order = 'order'
else # else
sale = Sale.find(booking.sale_id) # sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile" # if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
@sale_array.push(sale) # @sale_array.push(sale)
if @status_order == 'order' # if @status_order == 'order'
@status_order = 'sale' # @status_order = 'sale'
end # end
@booking= booking # @booking= booking
@date = sale.created_at # @date = sale.created_at
@status_sale = 'sale' # @status_sale = 'sale'
@obj_sale = sale # @obj_sale = sale
@customer = sale.customer # @customer = sale.customer
accounts = @customer.tax_profiles # accounts = @customer.tax_profiles
@account_arr =[] # @account_arr =[]
accounts.each do |acc| # accounts.each do |acc|
account = TaxProfile.find(acc) # account = TaxProfile.find(acc)
@account_arr.push(account) # @account_arr.push(account)
end # end
end # end
end end
end end
end end