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

for all items

Browse Source
This commit is contained in:
phyusin
2018-02-15 13:24:29 +06:30
parent 8898ba597a 37c94b3665
commit d31c936547
6 changed files with 128 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/origami/home_controller.rb
View File

@@ -27,9 +27,9 @@ class Origami::HomeController < BaseOrigamiController
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
@order_items_count = Hash.new
bookings = Booking.all
if !bookings.nil?
@order_items_count = Hash.new
bookings.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
if !booking.booking_orders.empty?
@@ -51,7 +51,7 @@ class Origami::HomeController < BaseOrigamiController
if !@order_items_count.key?(booking.dining_facility_id)
@order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
else
@order_items_count[booking.dining_facility_id] += sale.sale_items.count
@order_items_count[booking.dining_facility_id] = sale.sale_items.count
end
end
end
@@ -59,6 +59,9 @@ class Origami::HomeController < BaseOrigamiController
end
end
puts "@order_items_count"
puts @order_items_count.to_json
@dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new