fixed conflict route and request bill

2017-06-07 22:21:42 +06:30
parent 234ef9bc15 b395e2e6f1
commit f9c8dbc03e
50 changed files with 731 additions and 379 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,8 +72,8 @@ Rails.application.routes.draw do
      resources :customers, only: [:index,:new, :create ] #add customer type
    end

-    resources :request_bills, only: [:show]
-    get 'sale/:sale_id/payment' => 'request_bills#show'
+
+    get "/request_bills/:id" => "request_bills#print"

    get 'sale/:sale_id/payment' => 'payments#show'
    post 'payment_process' => 'payments#create'