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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-08-26 11:03:03 +06:30
parent 38a01a8bde a226a39d08
commit e0cbe57245
41 changed files with 1592 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,19 +36,21 @@ class Origami::HomeController < BaseOrigamiController
@shop = current_shop
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
@dining_booking = @dining.current_bookings
@order_items = Array.new
@dining_booking.each do |booking|
@dining.current_bookings.each do |booking|
if @obj_sale || @booking.blank?
@booking = booking
end
if booking.sale_id
@obj_sale = booking.sale
@sale_array.push(@obj_sale)
@sale_taxes = @obj_sale.sale_taxes
@status_sale = 'sale'
@sale_array.push(booking.sale)
if @obj_sale.blank?
@obj_sale = booking.sale
@sale_taxes = @obj_sale.sale_taxes
@status_sale = 'sale'
end
else
@order_items += booking.order_items
@obj_order = booking.orders.first