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

fixed void

Browse Source
This commit is contained in:
yarzar_code
2020-05-19 18:12:34 +06:30
parent 8a042a0948
commit d037802a43
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/foodcourt/orders_controller.rb
View File

@@ -54,7 +54,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
end end
end end
def app_orders def app_orders
if !params[:booking_id].nil? && !params[:booking_id].blank? if params[:booking_id].present?
@booking = Booking.select("orders.*,bookings.*,customers.*") @booking = Booking.select("orders.*,bookings.*,customers.*")
.joins("JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins("JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
.joins("JOIN orders ON orders.order_id=booking_orders.order_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id")
@@ -69,9 +69,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
id = 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) @pending = Sale.includes(:sale_items).find_by(sale_id: id)
if @pending.sale_status == "new"
@status = "sale" @status = "sale"
end
elsif id.include? "BKI" elsif id.include? "BKI"
@pending = Booking.includes(:order_items).find_by(booking_id: id) @pending = Booking.includes(:order_items).find_by(booking_id: id)
@status = "order" @status = "order"

4
app/views/foodcourt/orders/app_orders.html.erb
View File

@@ -522,9 +522,9 @@
var sale_id = $("#sale_id").text(); var sale_id = $("#sale_id").text();
if (table_id) { 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{ }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+'"'
} }
}); });