fixed conflict

app/controllers/api/api_controller.rb

@@ -1,6 +1,6 @@
 class Api::ApiController < ActionController::API
   include TokenVerification
-  helper_method :current_token, :current_login_employee
+  helper_method :current_token, :current_login_employee, :get_cashier
 
 
   private
@@ -13,6 +13,11 @@ class Api::ApiController < ActionController::API
     end
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_login_employee
     @employee = Employee.find_by_token_session(current_token)
   end

app/controllers/api/bill_controller.rb

@@ -13,7 +13,7 @@ class Api::BillController < Api::ApiController
         if booking
           if booking.sale_id.nil?
             @sale = Sale.new
-            @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee)
+            @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier)
           else
             @status = true
             @sale_id = booking.sale_id
@@ -22,23 +22,31 @@ class Api::BillController < Api::ApiController
 
     elsif (params[:order_id])
       @sale = Sale.new
-      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee)
+      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
     end
 
-    @sale_data = Sale.find_by_sale_id(@sale_id)
-    @sale_items = SaleItem.where("sale_id=?",@sale_id)
+# Not Use for these printed bill cannot give customer
+    # @sale_data = Sale.find_by_sale_id(@sale_id)
+    # @sale_items = SaleItem.where("sale_id=?",@sale_id)
 
-    unique_code = "ReceiptBillPdf"
-    customer= Customer.find(@sale_data.customer_id)
+    # unique_code = "ReceiptBillPdf"
+    # #shop detail
+    # shop_details = Shop.find(1)
 
-    # get printer info
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    # customer= Customer.find(@sale_data.customer_id)
+    # # get member information
+    # member_info = Customer.get_member_account(customer)
 
-    # Calculate Price by accounts
-    item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
+    # # get printer info
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+    # # Calculate Price by accounts
+    # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
+
+
+    # printer = Printer::ReceiptPrinter.new(print_settings)
+    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
 
-    printer = Printer::ReceiptPrinter.new(print_settings)
-    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts)
   end
 
 

app/controllers/api/orders_controller.rb

@@ -67,32 +67,58 @@ class Api::OrdersController <  Api::ApiController
         if booking
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
-              check_order_with_booking(booking)
+              sale_status = check_order_with_booking(booking)
+              puts "WWwwWWWWWWww"
+              puts sale_status
+              if sale_status
+                return false , @message = "bill requested"
+              end
             else
               @order.new_booking = false
               @order.booking_id = params[:booking_id]
             end
           else
-              check_order_with_table(params[:table_id])
+              sale_status = check_order_with_table(params[:table_id])
+              puts "OOOOOOOOO"
+              puts sale_status
+              if sale_status
+                return false , @message = "bill requested"
+              end
           end
         end #booking exists
       else
-        check_order_with_table(params[:table_id])
-       end
+        sale_status = check_order_with_table(params[:table_id])
+        puts "MMMMMMMM"
+        puts sale_status
+        if sale_status
+          return false , @message = "bill requested"
+        end
+      end
 
     @status, @booking = @order.generate
   end
 
+  # render json for http status code 202
+  def return_json_status_with_code(code, msg, booking_id)
+    render status: code, json: {
+      message: msg,
+      booking_id: booking_id
+    }.to_json    
+  end
+
   def check_order_with_table(table_id)
     table =  DiningFacility.find(table_id)
     if table
        booking = table.get_current_booking
+       puts booking
        if booking
          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
            @order.new_booking = true
+           return true
          else
            @order.new_booking = false
            @order.booking_id = booking.booking_id
+           return false
          end
        end
     end
@@ -101,9 +127,11 @@ class Api::OrdersController <  Api::ApiController
   def check_order_with_booking(booking)
     if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
       @order.new_booking = true
+      return true
     else
       @order.new_booking = false
       @order.booking_id = params[:booking_id]
+      return false
     end
   end
   # Description