From d037802a435669b00034296f5d439ad4d34c8150 Mon Sep 17 00:00:00 2001 From: yarzar_code Date: Tue, 19 May 2020 18:12:34 +0630 Subject: [PATCH] fixed void --- app/controllers/foodcourt/orders_controller.rb | 8 +++----- app/views/foodcourt/orders/app_orders.html.erb | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb index 71408690..0343c9e2 100755 --- a/app/controllers/foodcourt/orders_controller.rb +++ b/app/controllers/foodcourt/orders_controller.rb @@ -54,7 +54,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController end end def app_orders - if !params[:booking_id].nil? && !params[:booking_id].blank? + if params[:booking_id].present? @booking = Booking.select("orders.*,bookings.*,customers.*") .joins("JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id") @@ -67,11 +67,9 @@ class Foodcourt::OrdersController < BaseFoodcourtController elsif params[:pending_id] id = params[:pending_id] - if id.include? "SAL" + if id.include? "SAL" @pending = Sale.includes(:sale_items).find_by(sale_id: id) - if @pending.sale_status == "new" - @status = "sale" - end + @status = "sale" elsif id.include? "BKI" @pending = Booking.includes(:order_items).find_by(booking_id: id) @status = "order" diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb index e25b9b41..c1b96cd8 100644 --- a/app/views/foodcourt/orders/app_orders.html.erb +++ b/app/views/foodcourt/orders/app_orders.html.erb @@ -522,9 +522,9 @@ var sale_id = $("#sale_id").text(); if (table_id) { - window.location.href = '/foodcourt/food_court/modify_order/' + table_id + "/"+sale_id +'?update=true'; + window.location.href = '/foodcourt/food_court/modify_order/' + table_id + "/"+ sale_id + '?update=true'; }else{ - window.location.href = '/foodcourt/food_court/modify_order/'+ booking_id+"/" +sale_id +'?update=true&order_id="'+order_id+'"' + window.location.href = '/foodcourt/food_court/modify_order/' + booking_id + "/" + sale_id + '?update=true&order_id="'+order_id+'"' } });