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
Allow more customization of products' templates in the admin panel (#12415)
Damian Kaczmarczyk7326cfabff59
diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erbnew file mode 100644index 0000000000..89067b7d60--- /dev/null+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb@@ -0,0 +1,116 @@+<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">+ <div+ class="+ bulk-panel-container animate__animated animate__bounceInUp animate__faster+ "+ >+ <div data-toggle="modal" data-target="#bulk-modal">+ <% if can?(:activate, Spree::Product) %>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :active) %>"+ data-turbo-frame="bulk_modal"+ class="btn btn-primary mr-2 d-vendor"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_status_update_admin_products_path(status: :active) %>"+ >+ <%= icon("check") %>+ <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :active) %>+ </a>+ <% end %>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft) %>"+ data-turbo-frame="bulk_modal"+ class="btn btn-light mr-2"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_status_update_admin_products_path(status: :draft) %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :draft) %>+ </a>+ </div>++ <div class="dropdown dropup mr-3 ml-1" role="group">+ <button+ type="button"+ data-display="static"+ class="btn btn-light px-2 h-100"+ data-placement="bottom"+ data-toggle="dropdown"+ aria-expanded="false"+ >+ <%= icon("dots", class: "mr-0") %>+ </button>+ <div+ class="dropdown-menu dropdown-menu-left"+ aria-labelledby="btnGroupDrop1"+ data-toggle="modal"+ data-target="#bulk-modal"+ >+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived) %>"+ data-turbo-frame="bulk_modal"+ class="dropdown-item"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_status_update_admin_products_path(status: :archived) %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :archived) %>+ </a>+ <% if can?(:manage, Spree::Classification) %>+ <div class="dropdown-divider"></div>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :add_to_taxons) %>"+ data-turbo-frame="bulk_modal"+ class="dropdown-item"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_add_to_taxons_admin_products_path %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.add_to_taxons") %>+ </a>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :remove_from_taxons) %>"+ data-turbo-frame="bulk_modal"+ class="dropdown-item"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_remove_from_taxons_admin_products_path %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.remove_from_taxons") %>+ </a>+ <% end %>++ <% if can?(:manage_tags, Spree::Product) %>+ <div class="dropdown-divider"></div>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :add_tags) %>"+ data-turbo-frame="bulk_modal"+ class="dropdown-item"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_add_tags_admin_products_path %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.add_tags") %>+ </a>+ <a+ href="<%= spree.bulk_modal_admin_products_path(kind: :remove_tags) %>"+ data-turbo-frame="bulk_modal"+ class="dropdown-item"+ data-action="click->bulk-operation#setBulkAction"+ data-url="<%= spree.bulk_remove_tags_admin_products_path %>"+ >+ <%= Spree.t("admin.bulk_ops.products.title.remove_tags") %>+ </a>+ <% end %>+ </div>+ </div>++ <span>+ <strong data-bulk-operation-target="counter"></strong>+ <%= Spree.t("admin.products.selected") %>+ </span>++ <button+ type="button"+ class="btn-close ml-2"+ data-dismiss="modal"+ aria-label="<%= Spree.t(:close) %>"+ data-action="bulk-operation#cancel"+ />+ </div>+</div>diff --git a/admin/app/views/spree/admin/products/_edit_page_title.html.erb b/admin/app/views/spree/admin/products/_edit_page_title.html.erbnew file mode 100644index 0000000000..0bfce334a1--- /dev/null+++ b/admin/app/views/spree/admin/products/_edit_page_title.html.erb@@ -0,0 +1,3 @@+<%= page_header_back_button spree.admin_products_path, @product %>+<span class="mr-3"><%= @product.name %></span>+<span class="mr-3"><%= product_status(@product) %></span>diff --git a/admin/app/views/spree/admin/products/_form.html.erb b/admin/app/views/spree/admin/products/_form.html.erbindex fa78c5533c..7567fc3e5c 100644--- a/admin/app/views/spree/admin/products/_form.html.erb+++ b/admin/app/views/spree/admin/products/_form.html.erb@@ -9,11 +9,13 @@<%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %><%= render 'spree/admin/products/form/shipping', f: f %><%= render 'spree/admin/products/form/properties', f: f %>+ <%= render 'spree/admin/products/form/extra_form', f: f %></div><div class="col-md-4"><%= render 'spree/admin/products/form/status', f: f %><%= render 'spree/admin/products/form/categorization', f: f %><%= render 'spree/admin/products/form/stores', f: f if Spree::Store.accessible_by(current_ability).count > 1 %>+ <%= render 'spree/admin/products/form/extra_form_sidebar', f: f %><%= render 'spree/admin/shared/seo',f: f,@@ -24,4 +26,4 @@slug_path: 'products',placeholder: Spree.t('admin.products.seo.placeholder') %></div>-</div>\ No newline at end of file+</div>diff --git a/admin/app/views/spree/admin/products/_list.html.erb b/admin/app/views/spree/admin/products/_list.html.erbindex 81d9ba8dc3..bfcc0073dc 100644--- a/admin/app/views/spree/admin/products/_list.html.erb+++ b/admin/app/views/spree/admin/products/_list.html.erb@@ -2,80 +2,7 @@<div data-controller="bulk-operation" data-action="keydown.esc->bulk-operation#cancel" tabindex="0"><%= form_tag spree.admin_products_path, method: :put, data: { 'bulk-operation-target': 'form' } do %><%= render 'spree/admin/shared/bulk_modal' %>- <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">- <div class="bulk-panel-container animate__animated animate__bounceInUp animate__faster">- <div data-toggle="modal" data-target="#bulk-modal">- <% if can?(:activate, Spree::Product) %>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :active) %>"- data-turbo-frame="bulk_modal" class="btn btn-primary mr-2 d-vendor"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_status_update_admin_products_path(status: :active) %>">- <%= icon('check') %>- <%= Spree.t('admin.bulk_ops.products.title.set_status', status: :active) %>- </a>- <% end %>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft) %>"- data-turbo-frame="bulk_modal"- class="btn btn-light mr-2"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_status_update_admin_products_path(status: :draft) %>"- >- <%= Spree.t('admin.bulk_ops.products.title.set_status', status: :draft) %>- </a>- </div>-- <div class="dropdown dropup mr-3 ml-1" role="group">- <button type="button" data-display="static" class="btn btn-light px-2 h-100" data-placement="bottom" data-toggle="dropdown" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-left" aria-labelledby="btnGroupDrop1" data-toggle="modal" data-target="#bulk-modal">- <a href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived) %>"- data-turbo-frame="bulk_modal" class="dropdown-item"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_status_update_admin_products_path(status: :archived) %>">- <%= Spree.t('admin.bulk_ops.products.title.set_status', status: :archived) %>- </a>- <% if can?(:manage, Spree::Classification) %>- <div class="dropdown-divider"></div>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :add_to_taxons) %>"- data-turbo-frame="bulk_modal" class="dropdown-item"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_add_to_taxons_admin_products_path %>">- <%= Spree.t('admin.bulk_ops.products.title.add_to_taxons') %>- </a>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :remove_from_taxons) %>"- data-turbo-frame="bulk_modal" class="dropdown-item"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_remove_from_taxons_admin_products_path %>">- <%= Spree.t('admin.bulk_ops.products.title.remove_from_taxons') %>- </a>- <% end %>-- <% if can?(:manage_tags, Spree::Product) %>- <div class="dropdown-divider"></div>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :add_tags) %>"- data-turbo-frame="bulk_modal" class="dropdown-item"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_add_tags_admin_products_path %>">- <%= Spree.t('admin.bulk_ops.products.title.add_tags') %>- </a>- <a href="<%= spree.bulk_modal_admin_products_path(kind: :remove_tags) %>"- data-turbo-frame="bulk_modal" class="dropdown-item"- data-action="click->bulk-operation#setBulkAction"- data-url="<%= spree.bulk_remove_tags_admin_products_path %>">- <%= Spree.t('admin.bulk_ops.products.title.remove_tags') %>- </a>- <% end %>- </div>- </div>-- <span>- <strong data-bulk-operation-target="counter"></strong> <%= Spree.t('admin.products.selected') %>- </span>-- <button type="button" class="btn-close ml-2" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" data-action="bulk-operation#cancel" />- </div>- </div>+ <%= render 'spree/admin/products/bulk_operations' %><div class="table-responsive"><table class="table" id="listing_products">@@ -83,16 +10,25 @@<tr><th scope="col" class="pr-0 w-5"><div class="custom-control custom-checkbox ml-1">- <input type="checkbox" class="custom-control-input" id="checkAllMasterCheckbox" data-bulk-operation-target="checkboxAll">+ <input+ type="checkbox"+ class="custom-control-input"+ id="checkAllMasterCheckbox"+ data-bulk-operation-target="checkboxAll"+ ><label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label></div></th><th scope="col">- <%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %>+ <%= sort_link @search,+ :name,+ Spree.t(:name),+ { default_order: "desc" },+ { title: "admin_products_listing_name_title" } %></th><th scope="col" class="text-center"><%= Spree.t(:status) %>- <%= help_bubble(Spree.t('admin.products.help_bubble')) %>+ <%= help_bubble(Spree.t("admin.products.help_bubble")) %></th><th scope="col"><%= Spree.t(:inventory) %></th><% if defined?(current_vendor) %>diff --git a/admin/app/views/spree/admin/products/edit.html.erb b/admin/app/views/spree/admin/products/edit.html.erbindex 17405b6cde..c3717793f6 100644--- a/admin/app/views/spree/admin/products/edit.html.erb+++ b/admin/app/views/spree/admin/products/edit.html.erb@@ -10,9 +10,7 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %><% content_for :page_title do %>- <%= page_header_back_button spree.admin_products_path, @product %>- <span class="mr-3"><%= @product.name %></span>- <%= product_status(@product) %>+ <%= render 'spree/admin/products/edit_page_title' %><% end %><%= form_for [:admin, @product] do |f| %>diff --git a/admin/app/views/spree/admin/products/form/_extra_form.html.erb b/admin/app/views/spree/admin/products/form/_extra_form.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/products/form/_extra_form_sidebar.erb b/admin/app/views/spree/admin/products/form/_extra_form_sidebar.erbnew file mode 100644index 0000000000..e69de29bb2