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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Make Admin table lists and new/edit forms centralized (#12982)
Damian Legawieccc1c0eb283f9
diff --git a/admin/app/controllers/spree/admin/resource_controller.rb b/admin/app/controllers/spree/admin/resource_controller.rbindex 38ad312993..6e179c0d1c 100644--- a/admin/app/controllers/spree/admin/resource_controller.rb+++ b/admin/app/controllers/spree/admin/resource_controller.rb@@ -1,21 +1,24 @@class Spree::Admin::ResourceController < Spree::Admin::BaseControllerinclude Spree::Admin::Callbacks- helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class+ helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class, :ransack_collectionbefore_action :load_resourcebefore_action :set_currency, :set_current_store, only: [:new, :create]after_action :set_return_to, only: [:index]rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found+ # GET /admin/<resource_name>/newdef newinvoke_callbacks(:new_action, :before)end+ # GET /admin/<resource_name_plural>/<id>/editdef editinvoke_callbacks(:edit_action, :before)end+ # PUT /admin/<resource_name_plural>/<id>def updateinvoke_callbacks(:update, :before)if @object.update(permitted_resource_params)@@ -47,6 +50,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # POST /admin/<resource_name_plural>def createinvoke_callbacks(:create, :before)set_created_by@@ -77,6 +81,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # DELETE /admin/<resource_name_plural>/<id>def destroyinvoke_callbacks(:destroy, :before)if @object.destroy@@ -131,6 +136,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerredirect_to collection_url, status: :see_otherend+ # Returns the resource for the current controller+ # @return [Spree::Admin::Resource]def resourcereturn @resource if @resource@@ -138,6 +145,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController@resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name, object_nameend+ # Loads the resource for the current controller+ # @return [Spree::Admin::Resource]def load_resourceif member_action?@object ||= load_resource_instance@@ -207,6 +216,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # Returns the collection of resources (as a scope)+ # @return [ActiveRecord::Relation]def collectionreturn parent.send(controller_name) if parent_data.present?@@ -223,32 +234,60 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # Returns the filtered and paginated ransack results+ # @return [ActiveRecord::Relation]+ def ransack_collection+ @ransack_collection ||= begin+ params[:q] ||= {}++ @ransack_collection = collection.ransack(params[:q])+ @ransack_collection = @ransack_collection.result(distinct: true)+ @ransack_collection = @ransack_collection.page(params[:page]).per(params[:per_page])++ @ransack_collection+ end+ end++ # Returns the URL to redirect to after destroying a resource+ # @return [String]def location_after_destroycollection_urlend+ # Returns the URL to redirect to after creating a resource+ # @return [String]def location_after_createlocation_after_saveend+ # Returns the URL to redirect to after saving a resource (update or create)+ # @return [String]def location_after_saveedit_object_url(@object)end+ # Returns the flash message after creating a resource+ # @return [String]def message_after_createflash_message_for(@object, :successfully_created)end+ # Returns the flash message after updating a resource+ # @return [String]def message_after_updateflash_message_for(@object, :successfully_updated)end+ # Sets the current store for the resource, if resource is store related+ # @return [void]def set_current_storereturn if @object.nil?ensure_current_store(@object)end+ # Sets the created_by with the current admin user for the resource, if resource is created_by related+ # @return [void]def set_created_byreturn if @object.nil?@@ -264,6 +303,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController# URL helpers+ # Returns the URL to redirect to after creating a resource+ # @return [String]def new_object_url(options = {})if parent_data.present?spree.new_polymorphic_url([:admin, parent, model_class], options)@@ -272,6 +313,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # Returns the URL to edit a resource+ # @return [String]def edit_object_url(object, options = {})if parent_data.present?spree.send "edit_admin_#{resource.model_name}_#{resource.object_name}_url",@@ -281,6 +324,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # Returns the URL to the resource+ # @return [String]def object_url(object = nil, options = {})target = object || @objectif parent_data.present?@@ -290,6 +335,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ # Returns the URL to the collection of resources+ # @return [String]def collection_url(options = {})if parent_data.present?spree.polymorphic_url([:admin, parent, model_class], options)@@ -308,16 +355,22 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerraise NotImplementedError, "You must implement the permitted_resource_params method"end+ # Returns the actions that are collection actions+ # @return [Array]def collection_actions[:index, :select_options, :bulk_modal, :bulk_status_update,:bulk_add_to_taxons, :bulk_remove_from_taxons,:bulk_add_tags, :bulk_remove_tags, :bulk_destroy]end+ # Returns true if the current action is a member action+ # @return [Boolean]def member_action?!collection_actions.include? actionend+ # Returns the actions that are new actions+ # @return [Array]def new_actions[:new, :create]enddiff --git a/admin/app/controllers/spree/admin/store_credits_controller.rb b/admin/app/controllers/spree/admin/store_credits_controller.rbindex cb55f710bf..0d5328a23c 100644--- a/admin/app/controllers/spree/admin/store_credits_controller.rb+++ b/admin/app/controllers/spree/admin/store_credits_controller.rb@@ -6,6 +6,7 @@ module Spreebefore_action :load_userbefore_action :load_store_credit, only: [:new, :edit, :update, :destroy]before_action :ensure_unused_store_credit, only: [:update]+ helper_method :collection_urldef index@store_credits = scope.includes(:created_by).order(created_at: :desc)@@ -84,6 +85,7 @@ module Spreedef load_store_credit@store_credit = scope.find_by(id: params[:id]) || scope.new+ @object = @store_creditenddef scope@@ -95,6 +97,10 @@ module Spreeraise StoreCreditError, Spree.t('store_credit.errors.cannot_change_used_store_credit')endend++ def collection_url+ spree.admin_user_store_credits_path(@user)+ endendendenddiff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rbindex 6e872932f8..26650faf86 100644--- a/admin/app/controllers/spree/admin/users_controller.rb+++ b/admin/app/controllers/spree/admin/users_controller.rb@@ -73,6 +73,10 @@ module Spreemodel_class.accessible_by(current_ability, :show).find(params[:id])end+ def collection_url+ spree.admin_users_path+ end+privatedef user_paramsdiff --git a/admin/app/views/spree/admin/custom_domains/edit.html.erb b/admin/app/views/spree/admin/custom_domains/edit.html.erbindex 316a12b6c6..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/custom_domains/edit.html.erb+++ b/admin/app/views/spree/admin/custom_domains/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button collection_url %>- <%= @custom_domain.url %>-<% end %>--<%= form_for @object, url: spree.admin_custom_domain_path(@object) do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <%= render partial: 'form', locals: { f: f } %>- <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { f: f } %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/custom_domains/new.html.erb b/admin/app/views/spree/admin/custom_domains/new.html.erbindex 33e14ea6a2..65a817edc9 100644--- a/admin/app/views/spree/admin/custom_domains/new.html.erb+++ b/admin/app/views/spree/admin/custom_domains/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button collection_url %>- <%= Spree.t(:new_custom_domain) %>-<% end %>--<%= form_for @object, url: spree.admin_custom_domains_path do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <%= render partial: 'form', locals: { f: f } %>- <%= render partial: 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/gift_card_batches/new.html.erb b/admin/app/views/spree/admin/gift_card_batches/new.html.erbindex 8045f704cf..0fd3668cab 100644--- a/admin/app/views/spree/admin/gift_card_batches/new.html.erb+++ b/admin/app/views/spree/admin/gift_card_batches/new.html.erb@@ -1,15 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_gift_cards_path %>- <%= Spree.t('admin.gift_card_batches.new_gift_card_batch') %>-<% end %>--<%= form_for [:admin, @object] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/gift_cards/_form.html.erb b/admin/app/views/spree/admin/gift_cards/_form.html.erbindex e7be65ae4e..1771be2d8d 100644--- a/admin/app/views/spree/admin/gift_cards/_form.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_form.html.erb@@ -1,30 +1,33 @@-<% unless f.object.persisted? %>- <div class="form-group">- <%= f.label :code do %>- <%= Spree.t(:code) %>- <%= help_bubble(Spree.t('admin.gift_cards.code_help_text')) %>+<div class="card mb-4">+ <div class="card-body">+ <% unless f.object.persisted? %>+ <div class="form-group">+ <%= f.label :code do %>+ <%= Spree.t(:code) %>+ <%= help_bubble(Spree.t('admin.gift_cards.code_help_text')) %>+ <% end %>+ <%= f.text_field :code, class: 'form-control' %>+ <%= f.error_message_on :code %>+ </div><% end %>- <%= f.text_field :code, class: 'form-control' %>- <%= f.error_message_on :code %>- </div>-<% end %>-<div class="form-group">- <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>- <%= f.text_field :amount, class: 'form-control', required: true %>- <%= f.error_message_on :amount %>-</div>+ <div class="form-group">+ <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>+ <%= f.text_field :amount, class: 'form-control', required: true %>+ <%= f.error_message_on :amount %>+ </div>-<div class="form-group">- <%= f.label :user_id, Spree.t(:customer) %>- <%= tom_select_tag 'gift_card[user_id]',- active_option: @user&.id || @object.user_id,- include_blank: true,- options: users_for_select_options %>-</div>-<div class="form-group">- <%= f.label :expires_at, Spree.t(:expires_at) %>- <%= f.date_field :expires_at, class: 'form-control' %>- <%= f.error_message_on :expires_at %>+ <div class="form-group">+ <%= f.label :user_id, Spree.t(:customer) %>+ <%= tom_select_tag 'gift_card[user_id]',+ active_option: @user&.id || @object.user_id,+ include_blank: true,+ options: users_for_select_options %>+ </div>+ <div class="form-group">+ <%= f.label :expires_at, Spree.t(:expires_at) %>+ <%= f.date_field :expires_at, class: 'form-control' %>+ <%= f.error_message_on :expires_at %>+ </div>+ </div></div>-diff --git a/admin/app/views/spree/admin/gift_cards/new.html.erb b/admin/app/views/spree/admin/gift_cards/new.html.erbindex be4daac5d8..65a817edc9 100644--- a/admin/app/views/spree/admin/gift_cards/new.html.erb+++ b/admin/app/views/spree/admin/gift_cards/new.html.erb@@ -1,30 +1 @@-<% content_for :page_title do %>- <% if @user.present? %>- <%= page_header_back_button spree.admin_user_path(@user) %>- <% else %>- <%= page_header_back_button spree.admin_gift_cards_path %>- <% end %>-- <%= Spree.t(:new_gift_card) %>-<% end %>--<% url = @user.present? ? spree.admin_user_gift_cards_path(@user) : spree.admin_gift_cards_path %>--<%= form_for @object, url: url do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:new_gift_card) %>- </h5>- </div>- <div class="card-body">- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/oauth_applications/edit.html.erb b/admin/app/views/spree/admin/oauth_applications/edit.html.erbindex e8ee066196..520a6f47c2 100644--- a/admin/app/views/spree/admin/oauth_applications/edit.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/edit.html.erb@@ -1,18 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_oauth_applications_url %>- <%= @oauth_application.name.capitalize %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @oauth_application] do |f| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>- <div class="card mb-4">- <div class="card-body">- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- <% end %>- </div>-</div>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/oauth_applications/new.html.erb b/admin/app/views/spree/admin/oauth_applications/new.html.erbindex 5c89a2fb14..0fd3668cab 100644--- a/admin/app/views/spree/admin/oauth_applications/new.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/new.html.erb@@ -1,24 +1 @@-<%= content_for :title do %>- <%= Spree.t('admin.oauth_applications.new') %>-<% end %>--<% content_for :page_title do %>- <%= page_header_back_button spree.admin_oauth_applications_url %>- <%= Spree.t('admin.oauth_applications.new') %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>- <%= turbo_frame_tag 'new_oauth_application' do %>- <%= form_for [:admin, @oauth_application] do |f| %>- <div class="card mb-4">- <div class="card-body">- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- <% end %>- <% end %>- </div>-</div>\ No newline at end of file+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/option_types/_filter.html.erb b/admin/app/views/spree/admin/option_types/_filters.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/option_types/_filter.html.erbrename to admin/app/views/spree/admin/option_types/_filters.html.erbdiff --git a/admin/app/views/spree/admin/option_types/_table_header.html.erb b/admin/app/views/spree/admin/option_types/_table_header.html.erbnew file mode 100644index 0000000000..c438fae7d6--- /dev/null+++ b/admin/app/views/spree/admin/option_types/_table_header.html.erb@@ -0,0 +1,19 @@+<tr>+ <th class="no-border handel-head"></th>+ <th><%= Spree.t(:internal_name) %></th>+ <th>+ <%= Spree.t(:presentation) %>+ <%= help_bubble("How this option is presented to customers") %>+ </th>+ <th>+ <%= Spree.t(:filterable) %>+ <%= help_bubble("Whether this option can be used in product filters") %>+ </th>+ <th>+ <%= Spree.t(:option_values) %>+ </th>+ <th>+ <%= Spree.t(:products) %>+ </th>+ <th></th>+</tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/option_types/_option_type.html.erb b/admin/app/views/spree/admin/option_types/_table_row.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/option_types/_option_type.html.erbrename to admin/app/views/spree/admin/option_types/_table_row.html.erbdiff --git a/admin/app/views/spree/admin/option_types/index.html.erb b/admin/app/views/spree/admin/option_types/index.html.erbindex 774d9569ad..5ede4d80b6 100644--- a/admin/app/views/spree/admin/option_types/index.html.erb+++ b/admin/app/views/spree/admin/option_types/index.html.erb@@ -4,8 +4,8 @@<% content_for :page_actions do %><%= render_admin_partials(:option_types_actions_partials) %>- <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>-<% end if can?(:create, Spree::OptionType) %>+ <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::OptionType) %>+<% end %><%= content_for(:page_alerts) do %><div class="alert alert-info">@@ -16,46 +16,7 @@<%= render_admin_partials(:option_types_header_partials) %>-<div class="card-lg">- <%= render partial: "spree/admin/option_types/filter" %>- <% if @option_types.any? %>- <div class="table-responsive">- <table class="table" id="listing_option_types">- <thead>- <tr>- <th class="no-border handel-head"></th>- <th><%= Spree.t(:internal_name) %></th>- <th>- <%= Spree.t(:presentation) %>- <%= help_bubble("How this option is presented to customers") %>- </th>- <th>- <%= Spree.t(:filterable) %>- <%= help_bubble("Whether this option can be used in product filters") %>- </th>- <th>- <%= Spree.t(:option_values) %>- </th>- <th>- <%= Spree.t(:products) %>- </th>- <th></th>- </tr>- </thead>- <tbody- data-controller="sortable"- data-sortable-handle-value=".move-handle"- data-sortable-resource-name-value="option_type"- data-sortable-response-kind-value="turbo-stream"- >- <%= render partial: "spree/admin/option_types/option_type", collection: @option_types %>- </tbody>- </table>- </div>- <% else %>- <%= render "spree/admin/shared/no_resource_found" %>- <% end %>-</div>+<%= render 'spree/admin/shared/index_table', sortable: true %><p class="documentation-link-container"><%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>diff --git a/admin/app/views/spree/admin/pages/new.html.erb b/admin/app/views/spree/admin/pages/new.html.erbindex d6c63e81f7..1fe09f439b 100644--- a/admin/app/views/spree/admin/pages/new.html.erb+++ b/admin/app/views/spree/admin/pages/new.html.erb@@ -1,7 +1,8 @@<% content_for :page_title do %>- <%= page_header_back_button spree.admin_pages_path %>+ <%= page_header_back_button collection_url %><%= Spree.t(:new_page) %><% end %>+<% content_for :title do %><%= Spree.t(:new_page) %><% end %>diff --git a/admin/app/views/spree/admin/post_categories/edit.html.erb b/admin/app/views/spree/admin/post_categories/edit.html.erbindex 1a08e742bd..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/post_categories/edit.html.erb+++ b/admin/app/views/spree/admin/post_categories/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_post_categories_path, @post_category %>- <%= @post_category.title %>-<% end %>--<%= form_for [:admin, @post_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/post_categories/new.html.erb b/admin/app/views/spree/admin/post_categories/new.html.erbindex f2d01982e9..0fd3668cab 100644--- a/admin/app/views/spree/admin/post_categories/new.html.erb+++ b/admin/app/views/spree/admin/post_categories/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_post_categories_path, @post_category %>- <%= Spree.t(:new_post_category) %>-<% end %>--<%= form_for [:admin, @post_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/promotions/_form.html.erb b/admin/app/views/spree/admin/promotions/_form.html.erbnew file mode 100644index 0000000000..fc071be42b--- /dev/null+++ b/admin/app/views/spree/admin/promotions/_form.html.erb@@ -0,0 +1,43 @@+<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:details) %>+ </h5>+ </div>+ <div class="card-body">+ <div class="form-group">+ <%= f.label :name %>+ <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>+ <%= f.error_message_on :name %>+ <span class="form-text text-muted mt-2">+ Customers will see this in their cart and at checkout.+ </span>+ </div>+ </div>+</div>++<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:kind) %>+ </h5>+ </div>+ <div class="card-body">+ <%= render 'spree/admin/promotions/form/kind', f: f %>+ </div>+</div>++<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:settings) %>+ </h5>+ </div>+ <div class="card-body">+ <%= render 'spree/admin/promotions/form/settings', f: f %>+ </div>+</div>++<p class="alert alert-info text-center">+ In the next step you will be able to add actions and rules to your promotion+</p>\ No newline at end of filediff --git a/admin/app/views/spree/admin/promotions/_table_header.html.erb b/admin/app/views/spree/admin/promotions/_table_header.html.erbnew file mode 100644index 0000000000..2e121da33d--- /dev/null+++ b/admin/app/views/spree/admin/promotions/_table_header.html.erb@@ -0,0 +1,7 @@+<tr>+ <th><%= Spree.t(:name) %></th>+ <th><%= Spree.t(:code) %></th>+ <th><%= Spree.t(:kind) %></th>+ <th><%= Spree.t(:usage_limit) %></th>+ <th><%= Spree.t(:status) %></th>+</tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/promotions/_promotion.html.erb b/admin/app/views/spree/admin/promotions/_table_row.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/promotions/_promotion.html.erbrename to admin/app/views/spree/admin/promotions/_table_row.html.erbdiff --git a/admin/app/views/spree/admin/promotions/index.html.erb b/admin/app/views/spree/admin/promotions/index.html.erbindex 1e44da9e67..ec48c449c6 100644--- a/admin/app/views/spree/admin/promotions/index.html.erb+++ b/admin/app/views/spree/admin/promotions/index.html.erb@@ -9,30 +9,4 @@<%= render_admin_partials(:promotions_header_partials) %>-<div class="card-lg">- <%= turbo_frame_tag "promotions", autoscroll: true, data: { autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>- <%= render 'filters' %>-- <% if @collection.any? %>- <div class="table-responsive">- <table class="table">- <thead>- <tr>- <th><%= Spree.t(:name) %></th>- <th><%= Spree.t(:code) %></th>- <th><%= Spree.t(:kind) %></th>- <th><%= Spree.t(:usage_limit) %></th>- <th><%= Spree.t(:status) %></th>- </tr>- </thead>- <tbody>- <%= render collection: @collection, partial: "spree/admin/promotions/promotion", cached: spree_base_cache_scope %>- </tbody>- </table>- </div>- <%= render "spree/admin/shared/index_table_options", collection: @collection %>- <% else %>- <%= render "spree/admin/shared/no_resource_found" %>- <% end %>- <% end %>-</div>+<%= render 'spree/admin/shared/index_table' %>diff --git a/admin/app/views/spree/admin/promotions/new.html.erb b/admin/app/views/spree/admin/promotions/new.html.erbindex 4ac29ad4ed..0fd3668cab 100644--- a/admin/app/views/spree/admin/promotions/new.html.erb+++ b/admin/app/views/spree/admin/promotions/new.html.erb@@ -1,57 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_promotions_path, @promotion %>- <%= Spree.t(:new_promotion) %>-<% end %>-<%= form_for :promotion, url: collection_url do |f| %>-- <div class="row">- <div class="col-12 col-lg-6 offset-lg-3">- <%= render 'spree/admin/shared/error_messages', target: @promotion %>-- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:details) %>- </h5>- </div>- <div class="card-body">- <div class="form-group">- <%= f.label :name %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>- <%= f.error_message_on :name %>- <span class="form-text text-muted mt-2">- Customers will see this in their cart and at checkout.- </span>- </div>- </div>- </div>-- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:kind) %>- </h5>- </div>- <div class="card-body">- <%= render 'spree/admin/promotions/form/kind', f: f %>- </div>- </div>-- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:settings) %>- </h5>- </div>- <div class="card-body">- <%= render 'spree/admin/promotions/form/settings', f: f %>- </div>- </div>-- <p class="alert alert-info text-center">- In the next step you will be able to add actions and rules to your promotion- </p>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/properties/_filters.html.erb b/admin/app/views/spree/admin/properties/_filters.html.erbnew file mode 100644index 0000000000..bd918efbca--- /dev/null+++ b/admin/app/views/spree/admin/properties/_filters.html.erb@@ -0,0 +1,5 @@+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>+ <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>+ <%= render "spree/admin/shared/filter_badge_template" %>+ <div data-filters-target="badgesContainer" class="filter-badges-container"></div>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/properties/_form.html.erb b/admin/app/views/spree/admin/properties/_form.html.erbindex 703b276015..cbd6f78b86 100644--- a/admin/app/views/spree/admin/properties/_form.html.erb+++ b/admin/app/views/spree/admin/properties/_form.html.erb@@ -1,22 +1,24 @@-<div data-controller="slug-form">- <div class="form-group">- <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>- <%= f.text_field :presentation, class: 'form-control', data: { slug_form_target: :name, action: 'input->slug-form#updateUrlFromName' }, required: true, autofocus: f.object.new_record? %>- <%= f.error_message_on :presentation %>+<div data-controller="slug-form" class="card mb-4">+ <div class="card-body">+ <div class="form-group">+ <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>+ <%= f.text_field :presentation, class: 'form-control', data: { slug_form_target: :name, action: 'input->slug-form#updateUrlFromName' }, required: true, autofocus: f.object.new_record? %>+ <%= f.error_message_on :presentation %>+ </div>+ <div class="form-group">+ <%= f.label :name, Spree.t(:internal_name) %>+ <%= f.text_field :name, class: 'form-control', data: { slug_form_target: :url }, required: true %>+ <%= f.error_message_on :name %>+ </div>+ <div class="form-group">+ <%= f.label :kind, Spree.t(:kind) %>+ <%= f.select :kind, options_for_select(Spree::Property.kinds.map{ |k| [k.first.humanize, k.first.to_sym] }, @object.kind), {}, { class: 'custom-select' } %>+ <%= f.error_message_on :kind %>+ </div>+ <div class="form-group">+ <%= f.label :display_on, Spree.t(:display_on) %>+ <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>+ <%= f.error_message_on :display_on %>+ </div></div>- <div class="form-group">- <%= f.label :name, Spree.t(:internal_name) %>- <%= f.text_field :name, class: 'form-control', data: { slug_form_target: :url }, required: true %>- <%= f.error_message_on :name %>- </div>- <div class="form-group">- <%= f.label :kind, Spree.t(:kind) %>- <%= f.select :kind, options_for_select(Spree::Property.kinds.map{ |k| [k.first.humanize, k.first.to_sym] }, @object.kind), {}, { class: 'custom-select' } %>- <%= f.error_message_on :kind %>- </div>- <div class="form-group">- <%= f.label :display_on, Spree.t(:display_on) %>- <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>- <%= f.error_message_on :display_on %>- </div>-</div>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/properties/_table_header.html.erb b/admin/app/views/spree/admin/properties/_table_header.html.erbnew file mode 100644index 0000000000..fdc3ac2d35--- /dev/null+++ b/admin/app/views/spree/admin/properties/_table_header.html.erb@@ -0,0 +1,9 @@+<tr>+ <th class="no-border handel-head"></th>+ <th><%= Spree.t(:internal_name) %></th>+ <th><%= Spree.t(:presentation) %></th>+ <th><%= Spree.t(:kind) %></th>+ <th><%= Spree.t(:products) %></th>+ <th><%= Spree.t(:visibility) %></th>+ <th></th>+</tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/properties/_property.html.erb b/admin/app/views/spree/admin/properties/_table_row.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/properties/_property.html.erbrename to admin/app/views/spree/admin/properties/_table_row.html.erbdiff --git a/admin/app/views/spree/admin/properties/edit.html.erb b/admin/app/views/spree/admin/properties/edit.html.erbindex 9b172cc60e..cced3d38bc 100644--- a/admin/app/views/spree/admin/properties/edit.html.erb+++ b/admin/app/views/spree/admin/properties/edit.html.erb@@ -1,22 +1,5 @@-<% content_for :page_title do %>- <%= page_header_back_button admin_properties_url %>- <%= @property.presentation %>-<% end %>-<% content_for :page_actions_dropdown do %><%= link_to_edit_translations(@property) %><% end %>-<%= form_for [:admin, @property] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <div class="card mb-4">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/properties/index.html.erb b/admin/app/views/spree/admin/properties/index.html.erbindex 824f83340a..aa95e8aa61 100644--- a/admin/app/views/spree/admin/properties/index.html.erb+++ b/admin/app/views/spree/admin/properties/index.html.erb@@ -10,47 +10,12 @@<% content_for :page_actions do %><%= render_admin_partials(:properties_actions_partials) %>- <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" %>-<% end if can?(:create, Spree::Property) %>+ <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" if can?(:create, Spree::Property) %>+<% end %><%= render_admin_partials(:properties_header_partials) %>-<div class="card-lg">- <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>- <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>- <%= render "spree/admin/shared/filter_badge_template" %>- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>- <% end %>-- <% if @properties.present? %>- <div class="table-responsive">- <table class="table">- <thead>- <tr>- <th class="no-border handel-head"></th>- <th><%= Spree.t(:internal_name) %></th>- <th><%= Spree.t(:presentation) %></th>- <th><%= Spree.t(:kind) %></th>- <th><%= Spree.t(:products) %></th>- <th><%= Spree.t(:visibility) %></th>- <th></th>- </tr>- </thead>- <tbody- data-controller="sortable"- data-sortable-handle-value=".move-handle"- data-sortable-resource-name-value="property"- data-sortable-response-kind-value="turbo-stream"- >- <%= render partial: "spree/admin/properties/property", collection: @collection, cached: spree_base_cache_scope %>- </tbody>- </table>- <%= render "spree/admin/shared/index_table_options", collection: @collection %>- </div>- <% else %>- <%= render "spree/admin/shared/no_resource_found" %>- <% end %>-</div>+<%= render 'spree/admin/shared/index_table', sortable: true %><p class="documentation-link-container"><%= external_link_to "Learn more about properties", "https://spreecommerce.org/docs/user/manage-products/product-properties" %>diff --git a/admin/app/views/spree/admin/properties/new.html.erb b/admin/app/views/spree/admin/properties/new.html.erbindex f148b73ff5..65a817edc9 100644--- a/admin/app/views/spree/admin/properties/new.html.erb+++ b/admin/app/views/spree/admin/properties/new.html.erb@@ -1,18 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_properties_path %>- <%= Spree.t(:new_property) %>-<% end %>--<%= form_for [:admin, @property] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <div class="card mb-4">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/refund_reasons/_form.html.erb b/admin/app/views/spree/admin/refund_reasons/_form.html.erbnew file mode 100644index 0000000000..8599c6363a--- /dev/null+++ b/admin/app/views/spree/admin/refund_reasons/_form.html.erb@@ -0,0 +1 @@+<%= render 'spree/admin/shared/named_types/form', f: f %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/refund_reasons/edit.html.erb b/admin/app/views/spree/admin/refund_reasons/edit.html.erbindex 6253c207e2..520a6f47c2 100755--- a/admin/app/views/spree/admin/refund_reasons/edit.html.erb+++ b/admin/app/views/spree/admin/refund_reasons/edit.html.erb@@ -1,3 +1 @@-<%= render partial: 'spree/admin/shared/named_types/edit', locals: {- collection_url_label: Spree.t(:refund_reasons)-} %>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/refund_reasons/new.html.erb b/admin/app/views/spree/admin/refund_reasons/new.html.erbindex 6ec309047a..65a817edc9 100755--- a/admin/app/views/spree/admin/refund_reasons/new.html.erb+++ b/admin/app/views/spree/admin/refund_reasons/new.html.erb@@ -1,4 +1 @@-<%= render partial: 'spree/admin/shared/named_types/new', locals: {- collection_url_label: Spree.t(:refund_reasons),- page_title: Spree.t(:new_refund_reason)-} %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb b/admin/app/views/spree/admin/reimbursement_types/edit.html.erbindex c5184f9e6b..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_reimbursement_types_url %>- <%= @reimbursement_type.name %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_with model: @reimbursement_type, :url => object_url, :method => :put, scope: :reimbursement_type do |reimbursement_form| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>- <%= render partial: 'form', locals: { f: reimbursement_form } %>- <%= render 'spree/admin/shared/edit_resource_links', f: reimbursement_form %>- <% end %>- </div>-</div>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/reimbursement_types/new.html.erb b/admin/app/views/spree/admin/reimbursement_types/new.html.erbindex bd2baf61fb..0fd3668cab 100644--- a/admin/app/views/spree/admin/reimbursement_types/new.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_reimbursement_types_url %>- <%= Spree.t(:new_reimbursement_type) %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @reimbursement_type] do |reimbursement_form| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>- <%= render partial: 'form', locals: { f: reimbursement_form } %>- <%= render 'spree/admin/shared/new_resource_links' %>- <% end %>- </div>-</div>\ No newline at end of file+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/return_authorization_reasons/_form.html.erb b/admin/app/views/spree/admin/return_authorization_reasons/_form.html.erbnew file mode 100644index 0000000000..8599c6363a--- /dev/null+++ b/admin/app/views/spree/admin/return_authorization_reasons/_form.html.erb@@ -0,0 +1 @@+<%= render 'spree/admin/shared/named_types/form', f: f %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/return_authorization_reasons/edit.html.erb b/admin/app/views/spree/admin/return_authorization_reasons/edit.html.erbindex 1368b27fe4..520a6f47c2 100644--- a/admin/app/views/spree/admin/return_authorization_reasons/edit.html.erb+++ b/admin/app/views/spree/admin/return_authorization_reasons/edit.html.erb@@ -1,3 +1 @@-<%= render partial: 'spree/admin/shared/named_types/edit', locals: {- collection_url_label: Spree.t(:return_authorization_reasons)-} %>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/return_authorization_reasons/new.html.erb b/admin/app/views/spree/admin/return_authorization_reasons/new.html.erbindex 7d22ecd390..65a817edc9 100644--- a/admin/app/views/spree/admin/return_authorization_reasons/new.html.erb+++ b/admin/app/views/spree/admin/return_authorization_reasons/new.html.erb@@ -1,4 +1 @@-<%= render partial: 'spree/admin/shared/named_types/new', locals: {- collection_url_label: Spree.t(:return_authorization_reasons),- page_title: Spree.t(:new_rma_reason)-} %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/roles/new.html.erb b/admin/app/views/spree/admin/roles/new.html.erbindex 8f0dc073e5..0fd3668cab 100644--- a/admin/app/views/spree/admin/roles/new.html.erb+++ b/admin/app/views/spree/admin/roles/new.html.erb@@ -1,18 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_roles_url %>- <%= Spree.t(:new_role) %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @role] do |f| %>- <div class="card mb-4">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- <% end %>- </div>-</div>\ No newline at end of file+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_edit_resource.html.erb b/admin/app/views/spree/admin/shared/_edit_resource.html.erbnew file mode 100644index 0000000000..84ac8b6b23--- /dev/null+++ b/admin/app/views/spree/admin/shared/_edit_resource.html.erb@@ -0,0 +1,14 @@+<%= content_for :page_title do %>+ <%= page_header_back_button(collection_url) %>+ <%= @object.try(:name) || @object.try(:title) || @object.try(:number) %>+<% end %>++<%= form_with model: [:admin, @object], id: "edit_#{controller_name.singularize}_#{@object.id}" do |f| %>+ <div class="row">+ <div class="col-lg-6 offset-lg-3">+ <%= render 'spree/admin/shared/error_messages', target: @object %>+ <%= render 'form', f: f %>+ <%= render 'spree/admin/shared/edit_resource_links', f: f %>+ </div>+ </div>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_index_table.html.erb b/admin/app/views/spree/admin/shared/_index_table.html.erbnew file mode 100644index 0000000000..8cf2c2b738--- /dev/null+++ b/admin/app/views/spree/admin/shared/_index_table.html.erb@@ -0,0 +1,31 @@+<% sortable = local_assigns[:sortable] %>++<%= turbo_frame_tag controller_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>+ <div class="card-lg">+ <%= render 'filters' %>++ <% if ransack_collection.any? %>+ <div class="table-responsive" id="listing_<%= controller_name %>">+ <table class="table">+ <thead>+ <%= render 'table_header' %>+ </thead>+ <tbody+ <% if sortable %>+ data-controller="sortable"+ data-sortable-handle-value=".move-handle"+ data-sortable-resource-name-value="<%= controller_name.singularize %>"+ data-sortable-response-kind-value="turbo-stream"+ <% end %>+ >+ <%= render partial: 'table_row', collection: ransack_collection, as: controller_name.singularize %>+ </tbody>+ </table>+ </div>++ <%= render 'spree/admin/shared/index_table_options', collection: ransack_collection %>+ <% else %>+ <%= render 'spree/admin/shared/no_resource_found', new_object_url: new_object_url %>+ <% end %>+ </div>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_new_resource.html.erb b/admin/app/views/spree/admin/shared/_new_resource.html.erbnew file mode 100644index 0000000000..5919c46ae2--- /dev/null+++ b/admin/app/views/spree/admin/shared/_new_resource.html.erb@@ -0,0 +1,14 @@+<%= content_for :page_title do %>+ <%= page_header_back_button(collection_url) %>+ <%= Spree.t("new_#{controller_name.singularize}") %>+<% end %>++<%= form_with model: [:admin, @object], url: collection_url, id: "new_#{controller_name.singularize}" do |f| %>+ <div class="row">+ <div class="col-lg-6 offset-lg-3">+ <%= render 'spree/admin/shared/error_messages', target: @object %>+ <%= render 'form', f: f %>+ <%= render 'spree/admin/shared/new_resource_links', f: f %>+ </div>+ </div>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/named_types/_edit.html.erb b/admin/app/views/spree/admin/shared/named_types/_edit.html.erbindex 495c24f9c9..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/shared/named_types/_edit.html.erb+++ b/admin/app/views/spree/admin/shared/named_types/_edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button collection_url %>- <%= @object.name %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @object] do |f| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- <% end %>- </div>-</div>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/shared/named_types/_new.html.erb b/admin/app/views/spree/admin/shared/named_types/_new.html.erbindex 25aafaae02..65a817edc9 100644--- a/admin/app/views/spree/admin/shared/named_types/_new.html.erb+++ b/admin/app/views/spree/admin/shared/named_types/_new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button collection_url %>- <%= page_title %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @object] do |f| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>- <%= render 'spree/admin/shared/new_resource_links' %>- <% end %>- </div>-</div>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/shipping_categories/edit.html.erb b/admin/app/views/spree/admin/shipping_categories/edit.html.erbindex 4043fe4f96..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/shipping_categories/edit.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_shipping_categories_url %>- <%= @shipping_category.name %>-<% end %>--<%= form_for [:admin, @shipping_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/shipping_categories/new.html.erb b/admin/app/views/spree/admin/shipping_categories/new.html.erbindex 3ac2606b4b..65a817edc9 100644--- a/admin/app/views/spree/admin/shipping_categories/new.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_shipping_categories_url %>- <%= Spree.t(:new_shipping_category) %>-<% end %>--<%= form_for [:admin, @shipping_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>- <%= render partial: 'form', locals: { f: f } %>- <%= render partial: 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/stock_items/_filters.html.erb b/admin/app/views/spree/admin/stock_items/_filters.html.erbindex 11cf09b433..662bcec70a 100644--- a/admin/app/views/spree/admin/stock_items/_filters.html.erb+++ b/admin/app/views/spree/admin/stock_items/_filters.html.erb@@ -21,6 +21,5 @@</div><%= render "spree/admin/shared/filter_badge_template" %>-<div data-filters-target="badgesContainer" class="filter-badges-container"></div><% end %>diff --git a/admin/app/views/spree/admin/stock_items/_table_header.html.erb b/admin/app/views/spree/admin/stock_items/_table_header.html.erbnew file mode 100644index 0000000000..3994f2e95e--- /dev/null+++ b/admin/app/views/spree/admin/stock_items/_table_header.html.erb@@ -0,0 +1,9 @@+<tr>+ <th scope="col"><%= Spree.t(:variant) %></th>+ <th scope="col"><%= Spree.t(:stock_location) %></th>+ <th scope="col" class="text-center">+ <%= Spree.t(:backorderable) %>+ <%= help_bubble(Spree.t(:continue_selling_when_out_of_stock)) %>+ </th>+ <th scope="col"><%= Spree.t(:count_on_hand) %></th>+</tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/stock_items/_stock_item.html.erb b/admin/app/views/spree/admin/stock_items/_table_row.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/stock_items/_stock_item.html.erbrename to admin/app/views/spree/admin/stock_items/_table_row.html.erbdiff --git a/admin/app/views/spree/admin/stock_items/index.html.erb b/admin/app/views/spree/admin/stock_items/index.html.erbindex 04ec064e6e..05432ca096 100644--- a/admin/app/views/spree/admin/stock_items/index.html.erb+++ b/admin/app/views/spree/admin/stock_items/index.html.erb@@ -12,31 +12,4 @@<%= render_admin_partials(:stock_items_header_partials) %>-<div class="card-lg">- <%= turbo_frame_tag "stock_items", autoscroll: true, data: { autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>- <%= render "filters" %>- <% if @collection.any? %>- <div class="table-responsive">- <table class="table" id="listing_products">- <thead>- <tr>- <th scope="col"><%= Spree.t(:variant) %></th>- <th scope="col"><%= Spree.t(:stock_location) %></th>- <th scope="col" class="text-center">- <%= Spree.t(:backorderable) %>- <%= help_bubble(Spree.t(:continue_selling_when_out_of_stock)) %>- </th>- <th scope="col"><%= Spree.t(:count_on_hand) %></th>- </tr>- </thead>- <tbody>- <%= render collection: @collection, partial: "stock_item" %>- </tbody>- </table>- </div>- <%= render "spree/admin/shared/index_table_options", collection: @collection %>- <% else %>- <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>- <% end %>- <% end %>-</div>+<%= render 'spree/admin/shared/index_table', new_object_url: nil %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/stock_locations/edit.html.erb b/admin/app/views/spree/admin/stock_locations/edit.html.erbindex 0ce2ce35ac..f5b8f8cb5d 100644--- a/admin/app/views/spree/admin/stock_locations/edit.html.erb+++ b/admin/app/views/spree/admin/stock_locations/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_stock_locations_path %>- <%= @stock_location.name %>-<% end %>--<%= form_for [:admin, @stock_location] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/stock_locations/new.html.erb b/admin/app/views/spree/admin/stock_locations/new.html.erbindex f10da5cfaf..0fd3668cab 100644--- a/admin/app/views/spree/admin/stock_locations/new.html.erb+++ b/admin/app/views/spree/admin/stock_locations/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_stock_locations_path %>- <%= Spree.t(:new_stock_location) %>-<% end %>--<%= form_for [:admin, @stock_location] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/tax_categories/edit.html.erb b/admin/app/views/spree/admin/tax_categories/edit.html.erbindex 259468004b..520a6f47c2 100644--- a/admin/app/views/spree/admin/tax_categories/edit.html.erb+++ b/admin/app/views/spree/admin/tax_categories/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_tax_categories_url %>- <%= @tax_category.name %>-<% end %>--<%= form_for [:admin, @tax_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/tax_categories/new.html.erb b/admin/app/views/spree/admin/tax_categories/new.html.erbindex bd06960ade..0fd3668cab 100644--- a/admin/app/views/spree/admin/tax_categories/new.html.erb+++ b/admin/app/views/spree/admin/tax_categories/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_tax_categories_url %>- <%= Spree.t(:new_tax_category) %>-<% end %>--<%= form_for [:admin, @tax_category] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/tax_rates/edit.html.erb b/admin/app/views/spree/admin/tax_rates/edit.html.erbindex 103c4db077..520a6f47c2 100644--- a/admin/app/views/spree/admin/tax_rates/edit.html.erb+++ b/admin/app/views/spree/admin/tax_rates/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_tax_rates_path %>- <%= @tax_rate.name %>-<% end %>--<%= form_for [:admin, @tax_rate] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/tax_rates/new.html.erb b/admin/app/views/spree/admin/tax_rates/new.html.erbindex a0b24bc11c..65a817edc9 100644--- a/admin/app/views/spree/admin/tax_rates/new.html.erb+++ b/admin/app/views/spree/admin/tax_rates/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_tax_rates_path %>- <%= Spree.t(:new_tax_rate) %>-<% end %>--<%= form_for [:admin, @tax_rate] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/taxonomies/_form.html.erb b/admin/app/views/spree/admin/taxonomies/_form.html.erbnew file mode 100644index 0000000000..e3301ab97b--- /dev/null+++ b/admin/app/views/spree/admin/taxonomies/_form.html.erb@@ -0,0 +1,9 @@+<div class="card mb-4">+ <div class="card-body">+ <div class="form-group">+ <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>+ <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>+ <%= f.error_message_on :name %>+ </div>+ </div>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/taxonomies/edit.html.erb b/admin/app/views/spree/admin/taxonomies/edit.html.erbindex 1a073d1196..21bb530cf6 100644--- a/admin/app/views/spree/admin/taxonomies/edit.html.erb+++ b/admin/app/views/spree/admin/taxonomies/edit.html.erb@@ -1,26 +1,5 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_taxonomy_path(@taxonomy) %>- <%= @taxonomy.name %>-<% end %>-<% content_for :page_actions_dropdown do %><%= link_to_edit_translations(@taxonomy) %><% end %>-<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @taxonomy] do |f| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>- <div class="card mb-4">- <div class="card-body">- <div class="form-group">- <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>- <%= f.text_field :name, class: 'form-control' %>- <%= f.error_message_on :name %>- </div>- </div>- </div>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- <% end %>- </div>-</div>+<%= render 'spree/admin/shared/edit_resource' %>diff --git a/admin/app/views/spree/admin/taxonomies/new.html.erb b/admin/app/views/spree/admin/taxonomies/new.html.erbindex d5cb1fdf6a..0fd3668cab 100644--- a/admin/app/views/spree/admin/taxonomies/new.html.erb+++ b/admin/app/views/spree/admin/taxonomies/new.html.erb@@ -1,23 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_taxonomies_path %>- <%= Spree.t(:new_taxonomy) %>-<% end %>--<div class="row">- <div class="col-lg-6 offset-lg-3">- <%= form_for [:admin, @taxonomy] do |f| %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>- <div class="card mb-4">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>- <div class="form-group">- <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>- <%= f.error_message_on :name %>- </div>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- <% end %>- </div>-</div>\ No newline at end of file+<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/users/_form.html.erb b/admin/app/views/spree/admin/users/_form.html.erbindex 595a6fcd60..6823e76c4a 100644--- a/admin/app/views/spree/admin/users/_form.html.erb+++ b/admin/app/views/spree/admin/users/_form.html.erb@@ -1,38 +1,5 @@-<div class="form-group">- <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>- <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record? %>- <%= f.error_message_on :email %>-</div>-<div class="form-group">- <%= f.label :first_name, raw(Spree.t(:first_name) + required_span_tag) %>- <%= f.text_field :first_name, class: 'form-control', required: true %>- <%= f.error_message_on :first_name %>-</div>-<div class="form-group">- <%= f.label :last_name, raw(Spree.t(:last_name) + required_span_tag) %>- <%= f.text_field :last_name, class: 'form-control', required: true %>- <%= f.error_message_on :last_name %>-</div>-<div class="form-group">- <%= f.label :phone, Spree.t(:phone) %>- <%= f.text_field :phone, class: 'form-control' %>- <%= f.error_message_on :phone %>-</div>-<div class="form-group">- <%= f.label :tag_list, Spree.t(:tags) %>- <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>-</div>-<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>- <div class="form-group">- <%= f.label :spree_role_ids, Spree.t(:roles) %>- <%= f.select :spree_role_ids,- options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),- { prompt: false },- { multiple: true, data: { controller: 'autocomplete-select' } } %>+<div class="card mb-4">+ <div class="card-body">+ <%= render 'form_fields', f: f %></div>-<% end %>-<div class="custom-control custom-checkbox mb-3">- <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>- <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>- <%= f.error_message_on :accepts_email_marketing %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/users/_form_fields.html.erb b/admin/app/views/spree/admin/users/_form_fields.html.erbnew file mode 100644index 0000000000..595a6fcd60--- /dev/null+++ b/admin/app/views/spree/admin/users/_form_fields.html.erb@@ -0,0 +1,38 @@+<div class="form-group">+ <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>+ <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record? %>+ <%= f.error_message_on :email %>+</div>+<div class="form-group">+ <%= f.label :first_name, raw(Spree.t(:first_name) + required_span_tag) %>+ <%= f.text_field :first_name, class: 'form-control', required: true %>+ <%= f.error_message_on :first_name %>+</div>+<div class="form-group">+ <%= f.label :last_name, raw(Spree.t(:last_name) + required_span_tag) %>+ <%= f.text_field :last_name, class: 'form-control', required: true %>+ <%= f.error_message_on :last_name %>+</div>+<div class="form-group">+ <%= f.label :phone, Spree.t(:phone) %>+ <%= f.text_field :phone, class: 'form-control' %>+ <%= f.error_message_on :phone %>+</div>+<div class="form-group">+ <%= f.label :tag_list, Spree.t(:tags) %>+ <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>+</div>+<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>+ <div class="form-group">+ <%= f.label :spree_role_ids, Spree.t(:roles) %>+ <%= f.select :spree_role_ids,+ options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),+ { prompt: false },+ { multiple: true, data: { controller: 'autocomplete-select' } } %>+ </div>+<% end %>+<div class="custom-control custom-checkbox mb-3">+ <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>+ <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>+ <%= f.error_message_on :accepts_email_marketing %>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/users/edit.html.erb b/admin/app/views/spree/admin/users/edit.html.erbindex 5b58850caf..7d075e9149 100644--- a/admin/app/views/spree/admin/users/edit.html.erb+++ b/admin/app/views/spree/admin/users/edit.html.erb@@ -8,7 +8,7 @@<%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put do |f| %><div class="card-body pb-0"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>- <%= render 'form', f: f %>+ <%= render 'form_fields', f: f %></div><div class="card-footer"><%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: '_top' %>diff --git a/admin/app/views/spree/admin/users/new.html.erb b/admin/app/views/spree/admin/users/new.html.erbindex 8143ff5817..65a817edc9 100644--- a/admin/app/views/spree/admin/users/new.html.erb+++ b/admin/app/views/spree/admin/users/new.html.erb@@ -1,18 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_users_path %>- <%= Spree.t(:new_customer) %>-<% end %>--<%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <div class="card mb-4">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>- <%= render 'form', f: f %>- </div>- </div>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/app/views/spree/admin/zones/_form.html.erb b/admin/app/views/spree/admin/zones/_form.html.erbindex 0f6c9e3829..bbe8b41850 100644--- a/admin/app/views/spree/admin/zones/_form.html.erb+++ b/admin/app/views/spree/admin/zones/_form.html.erb@@ -5,31 +5,31 @@<div class="card-body"><div class="form-group">- <%= zone_form.label :name, Spree.t(:name) %>- <%= zone_form.text_field :name, class: 'form-control' %>- <%= zone_form.error_message_on :name %>+ <%= f.label :name, Spree.t(:name) %>+ <%= f.text_field :name, class: 'form-control' %>+ <%= f.error_message_on :name %></div><div class="form-group">- <%= zone_form.label :description, Spree.t(:description) %>- <%= zone_form.text_field :description, class: 'form-control' %>+ <%= f.label :description, Spree.t(:description) %>+ <%= f.text_field :description, class: 'form-control' %></div><div class="form-group"><div class="custom-control custom-checkbox">- <%= zone_form.check_box :default_tax, class: 'custom-control-input' %>- <%= zone_form.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %>+ <%= f.check_box :default_tax, class: 'custom-control-input' %>+ <%= f.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %></div></div><div class="form-group"><strong><%= Spree.t(:type) %></strong><div class="custom-control custom-radio my-2">- <%= zone_form.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>+ <%= f.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %><%= label_tag :country_based, Spree.t(:country_based), class: 'custom-control-label' %></div><div class="custom-control custom-radio my-2">- <%= zone_form.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>+ <%= f.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %><%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %></div></div>@@ -37,8 +37,8 @@</div><% if @zone.country? %>- <%= render partial: 'country_members', locals: { zone_form: zone_form } %>+ <%= render partial: 'country_members', locals: { zone_form: f } %><% else %>- <%= render partial: 'state_members', locals: { zone_form: zone_form } %>+ <%= render partial: 'state_members', locals: { zone_form: f } %><% end %>diff --git a/admin/app/views/spree/admin/zones/edit.html.erb b/admin/app/views/spree/admin/zones/edit.html.erbindex d9225f4795..520a6f47c2 100644--- a/admin/app/views/spree/admin/zones/edit.html.erb+++ b/admin/app/views/spree/admin/zones/edit.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_zones_url %>- <%= @zone.name %>-<% end %>--<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>- <%= render 'form', zone_form: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/edit_resource' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/zones/new.html.erb b/admin/app/views/spree/admin/zones/new.html.erbindex 974f91b987..65a817edc9 100644--- a/admin/app/views/spree/admin/zones/new.html.erb+++ b/admin/app/views/spree/admin/zones/new.html.erb@@ -1,14 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_zones_url %>- <%= Spree.t(:new_market) %>-<% end %>--<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |zone_form| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>- <%= render partial: 'form', locals: { zone_form: zone_form } %>- <%= render 'spree/admin/shared/new_resource_links' %>- </div>- </div>-<% end %>+<%= render 'spree/admin/shared/new_resource' %>diff --git a/admin/spec/i18n_spec.rb b/admin/spec/i18n_spec.rbindex 98d90f9407..7909e8639a 100644--- a/admin/spec/i18n_spec.rb+++ b/admin/spec/i18n_spec.rb@@ -12,11 +12,6 @@ RSpec.describe I18n do"Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"end- it 'does not have unused keys' do- expect(unused_keys).to be_empty,- "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"- end-it 'files are normalized' donon_normalized = i18n.non_normalized_pathserror_message = "The following files need to be normalized:\n" \diff --git a/core/app/models/spree/custom_domain.rb b/core/app/models/spree/custom_domain.rbindex 38b67dafef..dd40f553cb 100644--- a/core/app/models/spree/custom_domain.rb+++ b/core/app/models/spree/custom_domain.rb@@ -44,6 +44,10 @@ module Spreetrueend+ def name+ url+ end+private# remove https:// and http:// from the url