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

app/controllers/origami/addorders_controller.rb

@@ -153,13 +153,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       end
 
       @status, @booking = @order.generate
-
-      if @status && @booking && @order.source == 'quick_service'
+      if current_user.role != "waiter"
+        if @status && @booking && @order.source == 'quick_service'
         
-        @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
-        result = {:status=> @status, :data => @sale }
+          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          result = {:status=> @status, :data => @sale }
+          render :json => result.to_json
+        end
+      else
+        result = {:status=> @status, :data => 0 }
         render :json => result.to_json
       end
+      
   end
 
   # render json for http status code

app/controllers/origami/payments_controller.rb

@@ -93,7 +93,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil

app/controllers/origami/pending_order_controller.rb

@@ -2,21 +2,46 @@ class Origami::PendingOrderController < BaseOrigamiController
   def index
     # @dining= DiningFacility.where("status = 'occupied'")
     # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d'))
-    @sale = Sale.pending_order
+    @sale = Sale.pending_sale
+    @order = Sale.pending_order
+
   end
   def show
-    @sales = Sale.pending_order
-    @sale = Sale.find(params[:sale_id])
-    @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
-    @booking = BookingOrder.find_by_order_id(@order).booking_id
-    if Booking.find(@booking).dining_facility_id.to_i > 0
-      @table_id = Booking.find(@booking).dining_facility_id
+    @sales  = Sale.pending_sale
+    @orders = Sale.pending_order
+    @id     = params[:sale_id]
+    if(@id[0,3] == "SAL")     
+      @sale = Sale.find(@id)
+      @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
+      @booking = BookingOrder.find_by_order_id(@order).booking_id
+      @bookings = Booking.find(@booking)
+      @status = "sale"
+    else
+      # @booking = BookingOrder.find_by_order_id(@order).booking_id
+      @bookings = Booking.find(@id)
+      @status = "order"
+
+      @order_items = Array.new
+      @bookings.booking_orders.each do |booking_order|
+        order = Order.find(booking_order.order_id)
+        if (order.status == "new")
+          order.order_items.each do |item|
+            @order_items.push(item)
+          end
+        end
+      end
+    end
+    
+    if @bookings.dining_facility_id.to_i > 0
+      @table_id = Booking.find(@bookings.booking_id).dining_facility_id
       @dining  = DiningFacility.find(@table_id)
     else
       @table_id = nil
       @dining  = nil
     end
+
   end
+   
    helper_method :shop_detail
   def shop_detail
     @shop = Shop.first

app/controllers/origami/quick_service_controller.rb

@@ -134,21 +134,26 @@ class Origami::QuickServiceController < ApplicationController
       end
 
       @status, @booking = @order.generate
-
-      if @status && @booking && @order.source == 'quick_service'
-        if params[:sale_id]
-          @sale = Sale.find(params[:sale_id])
-          if @order.table_id.to_i > 0
-            @table_id = @order.table_id
-          else
-            @table_id = nil
+      if(params[:sale_id][0,3] == "SAL") 
+        if @status && @booking && @order.source == 'quick_service'
+          if params[:sale_id]
+            @sale = Sale.find(params[:sale_id])
+            if @order.table_id.to_i > 0
+              @table_id = @order.table_id
+            else
+              @table_id = nil
+            end
+            update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
           end
-          update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
-        end
-        
-        result = {:status=> true, :data => @sale }
-        render :json => result.to_json
-      end
+          
+          result = {:status=> true, :data => @sale }
+          render :json => result.to_json
+        end   
+      else
+        result = {:status=> true, :data => nil }
+          render :json => result.to_json
+      end 
+
   end
 
   def get_menu_category ()

app/controllers/origami/request_bills_controller.rb

@@ -8,6 +8,9 @@ class Origami::RequestBillsController < ApplicationController
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
+      puts params[:id]
+      puts bk_order
+      puts bk_order.booking_id
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?