update request bill msg box error

app/assets/javascripts/addorder.js

@@ -974,7 +974,7 @@ console.log(d_option)
       dataType: "json",
        success:function(result){
           if (result.status) {
-            
+            console.log(result)
             if (result.data == null){
                swal({
                   title: "Please Open Shift !",
@@ -987,6 +987,8 @@ console.log(d_option)
                  window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
               });
 
+            }else if(result.data == 'OK'){
+              window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
             }else{
               window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
             }

app/controllers/origami/quick_service_controller.rb

@@ -155,6 +155,9 @@ class Origami::QuickServiceController < ApplicationController
           result = {:status=> true, :data => @sale }
           render :json => result.to_json
         end  
+      elsif (params[:sale_id][0,3] == "BKI")
+         result = {:status=> true, :data => 'OK' }
+          render :json => result.to_json 
       else
         result = {:status=> true, :data => nil }
         render :json => result.to_json

app/controllers/origami/request_bills_controller.rb

@@ -16,7 +16,12 @@ class Origami::RequestBillsController < ApplicationController
       bk_order = BookingOrder.find_by_order_id(order_id)
       order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
+      if check_booking.dining_facility_id.to_i > 0
         table = DiningFacility.find(check_booking.dining_facility_id)
+      else
+        table = nil
+      end
+      
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
         @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)

app/models/sale.rb

@@ -2592,6 +2592,7 @@ end
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+                  .group("sales.sale_id")
   end
   def self.pending_order
     query = Booking.all