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

check booking sale id is null for all order

Browse Source
This commit is contained in:
phyusin
2018-02-14 14:20:20 +06:30
parent 086d5a7306
commit 91aa216666
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,15 +38,21 @@ class Origami::HomeController < BaseOrigamiController
if !order.order_items.empty? if !order.order_items.empty?
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
else
@order_items_count[booking.dining_facility_id] += order.order_items.count
end end
end end
end end
end end
else else
sale = Sale.find(booking.sale_id) if !booking.sale_id.nil?
if sale.sale_status !='completed' sale = Sale.find(booking.sale_id)
if !@order_items_count.key?(booking.dining_facility_id) if sale.sale_status !='completed'
@order_items_count.store(booking.dining_facility_id, sale.sale_items.count) 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
end
end end
end end
end end

14
app/controllers/origami/orders_controller.rb
View File

@@ -24,15 +24,21 @@ class Origami::OrdersController < BaseOrigamiController
if !order.order_items.empty? if !order.order_items.empty?
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
else
@order_items_count[booking.dining_facility_id] += order.order_items.count
end end
end end
end end
end end
else else
sale = Sale.find(booking.sale_id) if !booking.sale_id.nil?
if sale.sale_status !='completed' sale = Sale.find(booking.sale_id)
if !@order_items_count.key?(booking.dining_facility_id) if sale.sale_status !='completed'
@order_items_count.store(booking.dining_facility_id, sale.sale_items.count) 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
end
end end
end end
end end

14
app/controllers/origami/rooms_controller.rb
View File

@@ -34,15 +34,21 @@ class Origami::RoomsController < BaseOrigamiController
if !order.order_items.empty? if !order.order_items.empty?
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
else
@order_items_count[booking.dining_facility_id] += order.order_items.count
end end
end end
end end
end end
else else
sale = Sale.find(booking.sale_id) if !booking.sale_id.nil?
if sale.sale_status !='completed' sale = Sale.find(booking.sale_id)
if !@order_items_count.key?(booking.dining_facility_id) if sale.sale_status !='completed'
@order_items_count.store(booking.dining_facility_id, sale.sale_items.count) 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
end
end end
end end
end end