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

app/controllers/api/orders_controller.rb

@@ -68,8 +68,7 @@ class Api::OrdersController <  Api::ApiController
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
               sale_status = check_order_with_booking(booking)
-               # puts "WWwwWWWWWWww"
-               # puts sale_status
+
               if sale_status
                 return return_json_status_with_code(400, "bill requested")
               end
@@ -79,8 +78,7 @@ class Api::OrdersController <  Api::ApiController
             end
           else
               sale_status = check_order_with_table(params[:table_id])
-               # puts "OOOOOOOOO"
-               # puts sale_status
+
               if sale_status
                 return return_json_status_with_code(400, "bill requested")
               end
@@ -88,15 +86,20 @@ class Api::OrdersController <  Api::ApiController
         end #booking exists
       else
         sale_status = check_order_with_table(params[:table_id])
-         # puts "MMMMMMMM"
-         # puts sale_status
+
         if sale_status
           # return false , @message = "bill requested"
           return return_json_status_with_code(400, "bill requested")
         end
       end
 
-     @status, @booking = @order.generate
+      @status, @booking = @order.generate
+     # # for parallel order     
+     #  remoteIP = ""
+     #  begin
+     #   @status, @booking = @order.generate
+     #   remoteIP = request.remote_ip
+     #  end while request.remote_ip != remoteIP
   end
 
   # render json for http status code

app/controllers/oqs/edit_controller.rb

@@ -15,5 +15,16 @@ class Oqs::EditController < ApplicationController#BaseOqsController
     order_item.qty = qty_weight
     order_item.remark = remarks
     order_item.save
+
+    # print
+    assigned_item = AssignedOrderItem.find_by_item_code(order_item.item_code)    
+    # order queue stations
+    oqs = assigned_item.order_queue_station
+    
+    unique_code="OrderItemPdf"    
+
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_item(print_settings, oqs,assigned_item.order_id, assigned_item.item_code, print_status=" (Edited)" )
   end
 end