fixed conflict request_bill_con and origami index

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

@@ -25,8 +25,3 @@ class Origami::RequestBillsController < BaseOrigamiController
     printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
 
   end
-
-
-  
-
-end