fixed conflict

app/controllers/origami/request_bills_controller.rb

@@ -1,6 +1,7 @@
 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)     
@@ -9,5 +10,13 @@ class Origami::RequestBillsController < BaseOrigamiController
     	@sale_data = Sale.find_by_id(@sale_id)
     	@sale_items = SaleItem.where("sale_id=?",@sale_id)
     end  
+    unique_code="ReceiptBillPdf"
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+    printer = Printer::ReceiptPrinter.new(print_settings)
+
+    printer.print_receipt_bill(print_settings,@sale_items,@sale)
+
+     
   end
 end

app/controllers/settings/set_menu_items_controller.rb

@@ -6,12 +6,14 @@ class Settings::SetMenuItemsController < ApplicationController
   def index
     @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
   end
- 
+
   # GET /settings/menu_items/1
   # GET /settings/menu_items/1.json
   def show
     @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
+
     @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
+
   end
 
   # GET /settings/menu_items/new