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

Merge branch 'foodcourt' of https://gitlab.com/code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Nweni
2019-12-02 18:02:50 +06:30
parent de73bf9f7d 600d3973cd
commit a59c662188
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/addorder.js
View File

@@ -1060,7 +1060,8 @@ $(function() {
window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text(); window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
}else{ }else{
if(result.current_user_role == 'foodcourt_cashier'){ if(result.current_user_role == 'foodcourt_cashier'){
window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment"; } window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment";
}
else{ else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"; window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment";
} }

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

@@ -91,6 +91,9 @@ class Foodcourt::OrdersController < BaseFoodcourtController
.where("orders.source='app' and bookings.shop_code='#{@shop.shop_code}'").order("created_at desc") .where("orders.source='app' and bookings.shop_code='#{@shop.shop_code}'").order("created_at desc")
end end
def app_order_by_booking def app_order_by_booking
@order_items = OrderItems.joins("JOIN orders ON orders.order_id=order_items.order_id")
.joins("JOIN booking_orders ON booking_orders.order_id=orders.order_id")
.where("orders.source='app' and booking_orders.booking_id='#{params[:booking_id]}'").order("created_at desc")
end end
end end

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

@@ -104,7 +104,7 @@ class Foodcourt::PaymentsController < BaseFoodcourtController
end end
#orders print out #orders print out
if type == "quick_service" # if type == "quick_service"
booking = Booking.find_by_sale_id(sale_id) booking = Booking.find_by_sale_id(sale_id)
if booking.dining_facility_id.to_i>0 if booking.dining_facility_id.to_i>0
table_id = booking.dining_facility_id table_id = booking.dining_facility_id
@@ -127,7 +127,7 @@ class Foodcourt::PaymentsController < BaseFoodcourtController
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order,from:from ActionCable.server.broadcast "order_queue_station_channel",order: assign_order,from:from
end end
end # end
#for card sale data #for card sale data
card_data = Array.new card_data = Array.new

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

@@ -3,15 +3,13 @@
<div id="oqs_loading"></div> <div id="oqs_loading"></div>
</div> </div>
<div class="row m-t--20"> <div class="row m-t--20">
<div class="col-md-9 col-lg-9 col-sm-12 m-t-10"> <div class="col-md-9 col-lg-9 col-sm-9 m-t-10" >
</div> <div class="card">
<div class="col-md-3 col-lg-3 col-sm-12 m-t-10"> <div class="card-block" style="">
<div class="card-header" style="padding: 0.12rem 0.25rem"> <div class="card-text" id="custom-slimscroll">
<div class="card-block">
<div class="card-text" id="order-detail-slimscroll" data-height="140">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>