Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Clean up code.

Matthew Kennedya84bd9bcb3bf
diff --git a/backend/app/views/spree/admin/payment_methods/edit.html.erb b/backend/app/views/spree/admin/payment_methods/edit.html.erb
index 2b193027ea..0d8e4a7f91 100644
--- a/backend/app/views/spree/admin/payment_methods/edit.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/edit.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:payment_methods), admin_payment_methods_path %> /
+ <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_path %> /
<%= @payment_method.name %>
<% end %>
diff --git a/backend/app/views/spree/admin/payment_methods/new.html.erb b/backend/app/views/spree/admin/payment_methods/new.html.erb
index 3c451196f1..7a4288b4d8 100644
--- a/backend/app/views/spree/admin/payment_methods/new.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/new.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:payment_methods), admin_payment_methods_path %> /
+ <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_path %> /
<%= Spree.t(:new_payment_method) %>
<% end %>
diff --git a/backend/app/views/spree/admin/products/index.html.erb b/backend/app/views/spree/admin/products/index.html.erb
index f262f6dedf..d33ec86e59 100644
--- a/backend/app/views/spree/admin/products/index.html.erb
+++ b/backend/app/views/spree/admin/products/index.html.erb
@@ -6,10 +6,6 @@
<%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_product' } %>
<% end if can?(:create, Spree::Product) %>
-<%# content_for :page_tabs do %>
- <%#= render 'spree/admin/shared/store_filter', query: :stores_id_in, all_stores_path: spree.admin_products_path %>
-<%# end %>
-
<% content_for :table_filter do %>
<div data-hook="admin_products_sidebar">
diff --git a/backend/app/views/spree/admin/shared/_order_tabs.html.erb b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
index 3a4bcb3b79..46f98e6067 100644
--- a/backend/app/views/spree/admin/shared/_order_tabs.html.erb
+++ b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:orders), admin_orders_path %> /
+ <%= link_to Spree.t(:orders), spree.admin_orders_path %> /
<%= link_to @order.number, spree.edit_admin_order_path(@order) %>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb b/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
index ded2d19056..682f158faf 100644
--- a/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
+++ b/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
@@ -1,5 +1,5 @@
<ul id="sidebar-product" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
- <%= tab :products, url: admin_products_path, match_path: '/products' %>
+ <%= tab :products, match_path: '/products' %>
<%= tab :option_types, match_path: '/option_types' %>
<%= tab :properties %>
<%= tab :prototypes %>
diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rb
index 3aa6cc15a7..dc97d57e0f 100644
--- a/core/app/models/spree/payment_method.rb
+++ b/core/app/models/spree/payment_method.rb
@@ -12,8 +12,6 @@ module Spree
validates :name, presence: true
- self.whitelisted_ransackable_associations = %w[stores]
-
has_and_belongs_to_many :stores
with_options dependent: :restrict_with_error do