Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

config/application.rb

@@ -13,6 +13,7 @@ module SXRestaurants
     # -- all .rb files in that directory are automatically loaded.
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
+    config.time_zone = 'Asia/Rangoon'
     
   end
 end

config/routes.rb

@@ -228,6 +228,7 @@ Rails.application.routes.draw do
   namespace :transactions do
     resources :sales
     resources :orders
+    resources :credit_notes
 
     get "/sales/:sale_id/manual_complete_sale" =>"manual_sales#manual_complete_sale", :as => "manual_complete_sale"
     get "/sales/:sale_id/void" =>"manual_sales#void", :as => "void"