fixed conflict

app/controllers/oqs/print_controller.rb

@@ -2,7 +2,7 @@ class Oqs::PrintController < ApplicationController
   def print
   	unique_code="OrderItemPdf"
   	assigned_item_id=params[:id]
-  	assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('assigned_order_item_id='+assigned_item_id)
+  	assigned_order_item=AssignedOrderItem.select("order_id, item_code").where("assigned_order_item_id='" + assigned_item_id + "'")
 
   	print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)

app/controllers/origami/credit_payments_controller.rb

@@ -0,0 +1,10 @@
+class Origami::CreditPaymentsController < BaseOrigamiController
+
+
+  def index
+  end
+
+  def create
+  end
+
+end

app/controllers/origami/others_payments_controller.rb

@@ -0,0 +1,10 @@
+class Origami::OthersPaymentsController < BaseOrigamiController
+
+
+  def index
+  end
+
+  def create
+  end
+
+end

app/controllers/origami/payments_controller.rb

@@ -2,13 +2,23 @@ class Origami::PaymentsController < BaseOrigamiController
 
 
   def index
-
   end
 
   def create
+    cash = params[:cash]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      sale_payment.process_payment(saleObj, @user, cash)
+    end
   end
 
   def show
-
+    sale_id = params[:sale_id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find_by_sale_id(sale_id)
+    end
   end
+
 end

app/controllers/origami/request_bills_controller.rb

@@ -14,7 +14,7 @@ class Origami::RequestBillsController < BaseOrigamiController
     else
       @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
       @sale_items = SaleItem.where("sale_id=?",check_booking.sale_id)
-    end 
+    end
 
     unique_code="ReceiptBillPdf"
 
@@ -25,13 +25,5 @@ class Origami::RequestBillsController < BaseOrigamiController
     printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
 
   end
-
-
-  def show
-    sale_id = params[:sale_id]
-    if Sale.exists?(sale_id)
-      @sale_data = Sale.find_by_id(sale_id)
-    end
-  end
-
+  
 end

app/controllers/settings/set_menu_items_controller.rb

@@ -81,6 +81,6 @@ class Settings::SetMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end

app/controllers/settings/simple_menu_items_controller.rb

@@ -78,6 +78,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end