Sale Save

app/controllers/origami/home_controller.rb

@@ -1,15 +1,23 @@
 class Origami::HomeController < BaseOrigamiController
   def index
-  	@order_table = Order.get_order_table()
-  	@order_rooms = Order.get_order_rooms()
+  	@booking_orders = Order.get_booking_order_table()
+  	@booking_rooms = Order.get_booking_order_rooms()
   	@orders = Order.get_orders()
   end
   def show
   	str = []
-  	@order_details = OrderItem.get_order_items_details(params[:order_id])     
-    @order_details.each do |ord_detail| 
-    	str.push(ord_detail)
-    end  
-    render :json => str.to_json   
+    if !params[:sale_id].nil?
+      @order_details = SaleItem.get_order_items_details(params[:sale_id])    
+      @order_details.each do |ord_detail| 
+        str.push(ord_detail)
+      end
+      render :json => str.to_json  
+    else
+      @order_details = OrderItem.get_order_items_details(params[:order_id])     
+      @order_details.each do |ord_detail| 
+        str.push(ord_detail)
+      end
+      render :json => str.to_json  
+    end 
   end
 end

app/controllers/origami/request_bills_controller.rb

@@ -1,13 +1,13 @@
 class Origami::RequestBillsController < BaseOrigamiController
   def show
     @sale = Sale.new
-    check_order = Order.find_by_id(params[:id])
-    if check_order
-    	@order_details = OrderItem.get_order_items_details(check_order.id)     
-  		@order_details = OrderItem.get_order_items_details(check_order.id) 
-    	@status, @sale_id = @sale.generate_invoice_from_order(check_order.id, nil,current_login_employee.name)
-    	@sale_data = Sale.find_by_id(@sale_id)
-    	@sale_items = SaleItem.where("sale_id=?",@sale_id)
+    booking_id = params[:id]
+    check_booking = Booking.find_by_id(booking_id)
+    if check_booking.sale_id.nil?
+      #check if it doesn't exist 
+      @status = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name) 
+      @sale_data = Sale.find_by_id(check_booking.sale_id)
+      @sale_items = SaleItem.where("sale_id=?",check_booking.sale_id)
     end  
   end
 end