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

improvement

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-02-07 09:31:20 +06:30
parent 0582587f75
commit a645e3348d
8 changed files with 96 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/controllers/foodcourt/addorders_controller.rb
View File

@@ -87,6 +87,8 @@ class Foodcourt::AddordersController < BaseFoodcourtController
end
def create
new_booking =true
booking_id =nil
if params[:booking_id].present?
booking = Booking.find(params[:booking_id])
end
@@ -124,27 +126,25 @@ class Foodcourt::AddordersController < BaseFoodcourtController
else
customer_id = params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id # for no customer id from mobile
end
@order = Order.new
@order.source = params[:order_source]
@order.order_type = params[:order_type]
@order.customer_id = customer_id
@order.items = items_arr
@order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true
@order.waiters = current_login_employee.name
@order.employee_name = current_login_employee.name
@order.is_extra_time = is_extra_time
@order.extra_time = extra_time
if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved'
@order.new_booking = true
new_booking = true
else
@order.new_booking = false
@order.booking_id = booking.booking_id
new_booking = false
booking_id = booking.booking_id
end
@order =Order.create(source: params[:order_source],
order_type: params[:order_type],
customer_id: customer_id,
items: items_arr,
guest: params[:guest_info],
table_id: params[:table_id],
new_booking: new_booking,
waiters: current_login_employee.name,
employee_name: current_login_employee.name,
is_extra_time: is_extra_time,
extra_time: extra_time,
booking_id: booking_id
)
@status, @booking = @order.generate
if @status && @booking
@@ -162,8 +162,6 @@ class Foodcourt::AddordersController < BaseFoodcourtController
end
end
# Order.send_customer_view(@booking)
if current_user.role != "waiter" && params[:create_type] == "create_pay"
if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court')