fixed conflict

2017-06-07 22:29:43 +06:30
parent fd1c53432c f9c8dbc03e
commit 44382d284f
52 changed files with 746 additions and 249 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,6 +72,9 @@ Rails.application.routes.draw do
      resources :customers, only: [:index,:new, :create ] #add customer type
    end

+
+    get "/request_bills/:id" => "request_bills#print"
+
    get 'sale/:sale_id/payment' => 'payments#show'
    post 'payment_process' => 'payments#create'