Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

2018-02-20 13:34:48 +06:30
parent 5ec255ad33 8f239cbb0b
commit c4c57680a1
4 changed files with 7 additions and 7 deletions
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -6,8 +6,6 @@ class Origami::RequestBillsController < ApplicationController
    sale_order=SaleOrder.new

    # if shift = ShiftSale.current_open_shift(current_user.id)
-    puts ShiftSale.current_shift
-    puts "sssssssssss"
    if !ShiftSale.current_shift.nil?
      order_id = params[:id] # order_id
      bk_order = BookingOrder.find_by_order_id(order_id)