Move merchants to top-level namespace (#895)

app/views/categories/index.html.erb

@@ -23,6 +23,6 @@
 
   <footer class="flex justify-between gap-4">
     <%= previous_setting("Tags", tags_path) %>
-    <%= next_setting("Merchants", transaction_merchants_path) %>
+    <%= next_setting("Merchants", merchants_path) %>
   </footer>
 </section>

app/views/merchants/_form.html.erb

@@ -1,14 +1,14 @@
 <% is_editing = @merchant.id.present? %>
 <div data-controller="merchant-avatar">
-  <%= form_with model: @merchant, url: is_editing ? transaction_merchant_path(@merchant) : transaction_merchants_path, method: is_editing ? :patch : :post, scope: :transaction_merchant, data: { turbo: false } do |f| %>
+  <%= form_with model: @merchant, url: is_editing ? merchant_path(@merchant) : merchants_path, method: is_editing ? :patch : :post, scope: :merchant, data: { turbo: false } do |f| %>
     <section class="space-y-4">
       <div class="w-fit m-auto">
-        <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>
+        <%= render partial: "merchants/avatar", locals: { merchant: } %>
       </div>
-      <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Transaction::Merchant::COLORS[0] %>">
+      <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Merchant::COLORS[0] %>">
         <%= f.hidden_field :color, data: { select_target: "input", merchant_avatar_target: "color" } %>
         <ul data-select-target="list" class="flex gap-2 items-center">
-          <% Transaction::Merchant::COLORS.each do |color| %>
+          <% Merchant::COLORS.each do |color| %>
             <li tabindex="0" data-select-target="option" data-action="click->select#selectOption" data-value="<%= color %>" class="flex shrink-0 justify-center items-center w-6 h-6 cursor-pointer hover:bg-gray-200 rounded-full">
               <div style="background-color: <%= color %>" class="shrink-0 w-4 h-4 rounded-full"></div>
             </li>

app/views/merchants/_list.html.erb

@@ -2,7 +2,7 @@
 <% merchants.each.with_index do |merchant, index| %>
   <div class="flex justify-between items-center p-4 bg-white">
     <div class="flex w-full items-center gap-2.5">
-      <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>
+      <%= render partial: "merchants/avatar", locals: { merchant: } %>
       <p class="text-gray-900 text-sm truncate">
         <%= merchant.name %>
       </p>
@@ -13,13 +13,13 @@
       </button>
       <div data-menu-target="content" class="absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs w-48 hidden">
         <div class="border-t border-b border-alpha-black-100 p-1">
-          <%= button_to edit_transaction_merchant_path(merchant),
+          <%= button_to edit_merchant_path(merchant),
                         method: :get,
                         class: "flex w-full gap-1 items-center text-sm hover:bg-gray-50 rounded-lg px-3 py-2",
                         data: { turbo_frame: "modal" } do %>
             <%= lucide_icon("pencil-line", class: "w-5 h-5 mr-2") %> <%= t(".edit") %>
           <% end %>
-          <%= button_to transaction_merchant_path(merchant),
+          <%= button_to merchant_path(merchant),
                         method: :delete,
                         class: "flex w-full gap-1 items-center text-sm text-red-600 hover:text-red-800 hover:bg-gray-50 rounded-lg px-3 py-2",
                         data: {

app/views/merchants/index.html.erb

@@ -4,7 +4,7 @@
 <div class="space-y-4">
   <div class="flex items-center justify-between">
     <h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>
-    <%= link_to new_transaction_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
+    <%= link_to new_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
       <%= lucide_icon("plus", class: "w-5 h-5") %>
       <span><%= t(".new_short") %></span>
     <% end %>
@@ -14,7 +14,7 @@
       <div class="flex justify-center items-center py-20">
         <div class="text-center flex flex-col items-center max-w-[300px]">
           <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
-          <%= link_to new_transaction_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
+          <%= link_to new_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
             <%= lucide_icon("plus", class: "w-5 h-5") %>
             <span><%= t(".new_long") %></span>
           <% end %>
@@ -27,7 +27,7 @@
           <span class="text-gray-400 mx-2">&middot;</span>
           <p><%= @merchants.count %></p>
         </div>
-        <%= render partial: "transactions/merchants/list", locals: { merchants: @merchants } %>
+        <%= render partial: "merchants/list", locals: { merchants: @merchants } %>
       </div>
     <% end %>
   </div>

app/views/settings/_nav.html.erb

@@ -53,7 +53,7 @@
       <%= sidebar_link_to t(".categories_label"), categories_path, icon: "tags" %>
     </li>
     <li>
-      <%= sidebar_link_to t(".merchants_label"), transaction_merchants_path, icon: "store" %>
+      <%= sidebar_link_to t(".merchants_label"), merchants_path, icon: "store" %>
     </li>
     <li>
       <%= sidebar_link_to t(".rules_label"), transaction_rules_path, icon: "list-checks" %>

app/views/transactions/bulk_edit.html.erb

@@ -29,7 +29,7 @@
                   <div class="pb-6 space-y-2">
                     <%= form.date_field :date, label: t(".date_label"), max: Date.current %>
                     <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>
-                    <%= form.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>
+                    <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>
                   </div>
                 </details>
 

app/views/transactions/rules/index.html.erb

@@ -9,7 +9,7 @@
     </div>
   </div>
   <div class="flex justify-between gap-4">
-    <%= previous_setting("Merchants", transaction_merchants_path) %>
+    <%= previous_setting("Merchants", merchants_path) %>
     <%= next_setting("Imports", imports_path) %>
   </div>
 </div>

app/views/transactions/searches/filters/_merchant_filter.html.erb

@@ -5,7 +5,7 @@
     <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
-    <% Current.family.transaction_merchants.alphabetically.each do |merchant| %>
+    <% Current.family.merchants.alphabetically.each do |merchant| %>
       <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= merchant.name %>">
         <%= form.check_box :merchants,
                            {

app/views/transactions/show.html.erb

@@ -30,7 +30,7 @@
 
               <% unless @transaction.marked_as_transfer %>
                 <%= f.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
-                <%= f.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
+                <%= f.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
               <% end %>
 
               <%= f.collection_select :account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".account_placeholder"), label: t(".account_label"), class: "text-gray-500" }, { class: "form-field__input cursor-not-allowed text-gray-400", disabled: "disabled" } %>