Move merchants to top-level namespace (#895)

config/locales/views/merchants/en.yml

@@ -0,0 +1,29 @@
+---
+en:
+  merchants:
+    create:
+      success: New merchant created successfully
+    destroy:
+      success: Merchant deleted successfully
+    edit:
+      title: Edit merchant
+    form:
+      name_placeholder: Merchant name
+      submit_create: Add merchant
+      submit_edit: Update
+    index:
+      empty: No merchants yet
+      new_long: New merchant
+      new_short: New
+      title: Merchants
+    list:
+      confirm_accept: Delete merchant
+      confirm_body: Are you sure you want to delete this merchant? Removing this merchant
+        will unlink all associated transactions and may effect your reporting.
+      confirm_title: Delete merchant?
+      delete: Delete merchant
+      edit: Edit merchant
+    new:
+      title: New merchant
+    update:
+      success: Merchant updated successfully

config/locales/views/transactions/en.yml

@@ -50,33 +50,6 @@ en:
       transaction: transaction
     mark_transfers:
       success: Marked as transfer
-    merchants:
-      create:
-        success: New merchant created successfully
-      destroy:
-        success: Merchant deleted successfully
-      edit:
-        title: Edit merchant
-      form:
-        name_placeholder: Merchant name
-        submit_create: Add merchant
-        submit_edit: Update
-      index:
-        empty: No merchants yet
-        new_long: New merchant
-        new_short: New
-        title: Merchants
-      list:
-        confirm_accept: Delete merchant
-        confirm_body: Are you sure you want to delete this merchant? Removing this
-          merchant will unlink all associated transactions and may effect your reporting.
-        confirm_title: Delete merchant?
-        delete: Delete merchant
-        edit: Edit merchant
-      new:
-        title: New merchant
-      update:
-        success: Merchant updated successfully
     selection_bar:
       mark_transfers: Mark as transfers?
       mark_transfers_confirm: Mark as transfers

config/routes.rb

@@ -48,6 +48,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :merchants, only: %i[ index new create edit update destroy ]
+
   resources :transactions do
     collection do
       post "bulk_delete"
@@ -59,7 +61,6 @@ Rails.application.routes.draw do
       scope module: :transactions, as: :transaction do
         resources :rows, only: %i[ show update ]
         resources :rules, only: %i[ index ]
-        resources :merchants, only: %i[ index new create edit update destroy ]
       end
     end
   end