fix conflit

config/routes.rb

@@ -2,6 +2,7 @@ require 'sidekiq/web'
 
 Rails.application.routes.draw do
 
+
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -91,6 +92,13 @@ Rails.application.routes.draw do
     post 'select_sale_item' => 'commissions#select_sale_item'
     # product_commission
     post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item'
+    # in_juties
+    get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty'
+    post 'assign_in_juty' => 'in_juties#create_for_in_juty', as: 'create_for_in_juty'
+    get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty'
+    get 'table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty'
+    put '/edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty'
+    delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty'
 
     get 'table/:dining_id/movetable' => "movetable#move_dining"
     get 'table/:dining_id/moveroom' => "moveroom#move_dining"
@@ -316,6 +324,15 @@ Rails.application.routes.draw do
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end
 
+  # ----------- Inventory ---------------------------
+
+  namespace :inventory do
+    get 'inventory' => 'inventory#index'
+    resources :stock_check_items
+    resources :stock_checks
+    resources :stock_journals
+    resources :inventory_definitions
+  end
   #mount_compendium at: '/report' #, controller: 'reports'
 
   #--------- Reports ------------#