fixed conflictfile

app/controllers/origami/home_controller.rb

@@ -1,30 +1,49 @@
 class Origami::HomeController < BaseOrigamiController
   def index
+    if params[:booking_id] != nil
+      type=params[:booking_id].split('-')[0];  
+      # Sale 
+      if type == "SAL"
+        @selected_item = Sale.find(params[:booking_id])
+        @selected_item_type="Sale"
+      # Booking
+      else
+        @selected_item = Order.find(params[:booking_id])
+        @selected_item_type="Order"
+      end      
+    end
+
+    @completed_orders = Order.get_completed_order()
   	@booking_orders = Order.get_booking_order_table()
   	@booking_rooms = Order.get_booking_order_rooms()
   	@orders = Order.get_orders()
+  end  
 
-  end
-
-  def show
-  	str = []
-    type=params[:id].split('-')[0];
+  def item_show
+  	selection(params[:booking_id],1)
+  end  
 
+  def selection(selected_id, is_ajax)
+    str = []
+    type=selected_id.split('-')[0];  
     # Sale 
     if type == "SAL"
-      @order_details = SaleItem.get_order_items_details(params[:id])
+      @order_details = SaleItem.get_order_items_details(params[:booking_id])
       @order_details.each do |ord_detail|
         str.push(ord_detail)
       end
-      render :json => str.to_json
     # Booking
     else
-      @order_details = OrderItem.get_order_items_details(params[:id])
+      @order_details = OrderItem.get_order_items_details(params[:booking_id])
       @order_details.each do |ord_detail|
         str.push(ord_detail)
-      end
-      render :json => str.to_json
+      end    
     end 
+    if is_ajax == 1
+      render :json => str.to_json
+    else
+      str
+    end
   end
 
   def update_sale_by_customer