Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -6,7 +6,7 @@ class Api::BillController < Api::ApiController
  def create
    @status = false
    @error_message = "Order ID or Booking ID is require to request for a bill."
-    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0])
    if !ShiftSale.current_shift.nil?
    #create Bill by Booking ID
      table = 0