confict clear

app/controllers/api/orders_controller.rb

@@ -40,6 +40,7 @@ class Api::OrdersController <  Api::ApiController
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil? && params[:booking_id].to_i > 0
         @order.new_booking = false
+        # @order.new_booking = true
         @order.booking_id = params[:booking_id]
       end
 

app/controllers/origami/home_controller.rb

@@ -1,6 +1,15 @@
 class Origami::HomeController < BaseOrigamiController
   def index
+  	@order_table = Order.get_order_table()
+  	@order_rooms = Order.get_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   
   end
 end

app/controllers/origami/request_bills_controller.rb

@@ -0,0 +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)
+    end  
+  end
+end