fixed conflict

app/controllers/origami/home_controller.rb

@@ -1,16 +1,26 @@
 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