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

app/controllers/api/bill_controller.rb

@@ -6,7 +6,8 @@ class Api::BillController < Api::ApiController
     @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].id)
+    if !ShiftSale.current_shift.nil?
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -41,8 +42,8 @@ class Api::BillController < Api::ApiController
       end
     
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift_by_terminal.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift_by_terminal.id
+      # @sale_data.save
 
       Promotion.promo_activate(@sale)
 

app/controllers/application_controller.rb

@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first

app/controllers/origami/request_bills_controller.rb

@@ -5,16 +5,15 @@ class Origami::RequestBillsController < ApplicationController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    if shift = ShiftSale.current_open_shift(current_user.id)
+    # if shift = ShiftSale.current_open_shift(current_user.id)SSS
+    if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
-        # puts "current_login_employee"
-        # puts current_login_employee.name
-        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
+        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
         @sale_data = Sale.find_by_sale_id(@sale_id)
         @sale_items = SaleItem.where("sale_id=?",@sale_id)
       else
@@ -23,8 +22,8 @@ class Origami::RequestBillsController < ApplicationController
       end
 
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift.id
+      # @sale_data.save
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
@@ -55,4 +54,10 @@ class Origami::RequestBillsController < ApplicationController
 
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end