confict clear

This commit is contained in:
Aung Myo
2017-06-02 19:22:01 +06:30
15 changed files with 264 additions and 253 deletions

View File

@@ -2,9 +2,10 @@ require 'sidekiq/web'
Rails.application.routes.draw do
namespace :settings do
resources :accounts
namespace :origami do
get 'request_bills/show'
end
root 'home#index'
mount Sidekiq::Web => '/kiq'
@@ -72,6 +73,7 @@ Rails.application.routes.draw do
resources :discounts, only: [:index,:new, :create ] #add discount type
resources :customers, only: [:index,:new, :create ] #add customer type
end
resources :request_bills, only: [:show]
end