calculate induties in bill

app/controllers/induties/assign_in_duties_controller.rb

@@ -2,7 +2,6 @@ class Induties::AssignInDutiesController < ApplicationController
   def index
     @commissioners =[]
     @commiss=Commissioner.active.all.order(created_at: :desc)
-    # puts @commissioners.to_json
     @commiss.each do|commissioner|
       check_in_count =InDuty.where('commissioner_ids =? and out_time is null', commissioner.id.to_json).count;
       @commissioners.push({ "id"=>commissioner.id, 
@@ -13,6 +12,7 @@ class Induties::AssignInDutiesController < ApplicationController
       
     end
     @booking_id = params[:booking_id]
+    
   end
 
   def get_all_occupied_dining
@@ -60,5 +60,12 @@ class Induties::AssignInDutiesController < ApplicationController
     induty = InDuty.find(induty_id)
     induty.destroy
   end
+  def get_current_booking
+    @current_booking =InDuty.select("in_duties.*,dining_facilities.type as dinning_type")
+          .joins(" LEFT JOIN dining_facilities on dining_facilities.id = in_duties.dinning_id").where('booking_id =? and out_time is null', params[:booking_id]).order(created_at: :asc);
+    respond_to do |format|
+      format.json { render json: @current_booking.to_json }
+    end
+  end
 
 end

app/controllers/origami/home_controller.rb

@@ -35,7 +35,7 @@ class Origami::HomeController < BaseOrigamiController
     @payment_methods = PaymentMethodSetting.all
     @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
     #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
-    @order_items = Array.new
+   @order_items = Array.new
     @dining_booking.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -144,6 +144,7 @@ class Origami::HomeController < BaseOrigamiController
         end
       end
     end
+    
   end
 
 def check_emp_access_code

app/controllers/origami/request_bills_controller.rb

@@ -28,7 +28,7 @@ class Origami::RequestBillsController < ApplicationController
         
         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)
+          @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source, params[:current_checkin_induties_count])
           @sale_data = Sale.find_by_sale_id(@sale_id)
           @sale_items = SaleItem.where("sale_id=?",@sale_id)