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

fix order update with table and room

Browse Source
This commit is contained in:
pyaephyoeaung
2022-06-03 10:11:18 +06:30
parent 214712fd2d
commit 7485486868
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,10 @@ class Foodcourt::OrdersController < BaseFoodcourtController
end end
def modify_order def modify_order
@zone = Zone.all
@tables = Table.active.order('status desc')
@rooms = Room.active.order('status desc')
@cashier_type = "food_court" @cashier_type = "food_court"
today = DateTime.now today = DateTime.now
day = Date.today.wday day = Date.today.wday
@@ -112,6 +116,8 @@ class Foodcourt::OrdersController < BaseFoodcourtController
@booking = @table.get_booking @booking = @table.get_booking
end end
# byebug
@sale_id = @booking.sale_id @sale_id = @booking.sale_id
if @booking if @booking

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

@@ -533,8 +533,8 @@
$('#addorder').on('click', function () { $('#addorder').on('click', function () {
var status = "<%= @status %>" var status = "<%= @status %>"
if (status == 'sale'){ if (status == 'sale'){
var table_id = "<%= @pending.try(:bookings).try(:first).try(:dining_facility).try(:id) %>" var table_id = "<%= @pending.try(:booking).try(:dining_facility).try(:id) %>"
var booking_id = "<%= @pending.try(:bookings).try(:first).try(:id) %>" var booking_id = "<%= @pending.try(:booking).try(:id) %>"
} }
else { else {
var table_id = "<%= @pending.try(:dining_facility).try(:id) %>"; var table_id = "<%= @pending.try(:dining_facility).try(:id) %>";
@@ -543,11 +543,11 @@
} }
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/' + booking_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+'"'
} // }
}); });