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
Modals UI fixes
Damian Legawiec2317bdd1a02b
diff --git a/admin/app/views/spree/admin/assets/edit.html.erb b/admin/app/views/spree/admin/assets/edit.html.erbindex 4ada6b63a0..2ad4c6d5f8 100644--- a/admin/app/views/spree/admin/assets/edit.html.erb+++ b/admin/app/views/spree/admin/assets/edit.html.erb@@ -10,7 +10,7 @@<div class="modal-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>"><%= render 'active_storage/upload_form', form: f, field_name: :attachment, width: 200, height: 200, can_delete: false %></div>- <div class="modal-body border-bottom pb-3" style="min-height: 200px">+ <div class="modal-body" style="min-height: 200px"><div class="form-group"><%= f.label :alt, Spree.t(:alt_text) %><%= f.text_area :alt, rows: 4, class: 'form-control' %>diff --git a/admin/app/views/spree/admin/line_items/new.html.erb b/admin/app/views/spree/admin/line_items/new.html.erbindex 4d78cd2587..223bde34b8 100644--- a/admin/app/views/spree/admin/line_items/new.html.erb+++ b/admin/app/views/spree/admin/line_items/new.html.erb@@ -4,7 +4,7 @@<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_variant) %></h5><button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" /></div>- <div class="modal-body border-bottom pb-3">+ <div class="modal-body"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %><%= form.hidden_field :param_name, value: 'line_item' %>@@ -20,7 +20,7 @@</p></div></div>- <div class="modal-footer border-top d-flex justify-content-between">+ <div class="modal-footer d-flex justify-content-between"><div class="d-flex gap-2 m-0 align-items-center"><%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %><%= form.number_field :quantity, class: "form-control" %>diff --git a/admin/app/views/spree/admin/orders/_line_items.html.erb b/admin/app/views/spree/admin/orders/_line_items.html.erbindex 6957f8f012..9cad266c17 100644--- a/admin/app/views/spree/admin/orders/_line_items.html.erb+++ b/admin/app/views/spree/admin/orders/_line_items.html.erb@@ -13,7 +13,7 @@</div><% end %><% if @order.completed? %>- <button class="btn btn-light btn-sm text-muted" type="button" data-toggle="collapse" data-target="#line-items" aria-expanded="false" aria-controls="collapseExample">+ <button class="btn btn-light btn-sm" type="button" data-toggle="collapse" data-target="#line-items" aria-expanded="false" aria-controls="collapseExample"><%= Spree.t(:show_details) %><%= icon('selector', height: 12, class: 'mr-0 ml-1') %></button>diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erbindex b279964e7c..f57d1c5326 100644--- a/admin/app/views/spree/admin/orders/_payments.html.erb+++ b/admin/app/views/spree/admin/orders/_payments.html.erb@@ -29,7 +29,7 @@<span class="text-success font-weight-normal"><%= icon('check') %> <%= Spree.t(:not_risky) %></span><% end %></span>- <%= link_to '#risk-analysis', class: 'btn btn-light btn-sm text-muted', data: { toggle: 'collapse' } do %>+ <%= link_to '#risk-analysis', class: 'btn btn-light btn-sm', data: { toggle: 'collapse' } do %><%= Spree.t(:show_details) %><%= icon('selector', height: 12, class: 'mr-0 ml-1') %><% end %>diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erbindex a00baf3793..1b8173449f 100644--- a/admin/app/views/spree/admin/products/_filters.html.erb+++ b/admin/app/views/spree/admin/products/_filters.html.erb@@ -13,7 +13,7 @@<div class="col-12 col-lg-6"><div class="form-group"><%= f.label :taxons_id_in, Spree.t(:taxons) %>- <% @categories = Spree::Taxon.where(id: params.dig(:q, :taxons_id_in)).pluck(:pretty_name, :id) if params.dig(+ <% @categories = current_store.taxons.where(id: params.dig(:q, :taxons_id_in)).pluck(:pretty_name, :id) if params.dig(:q,:taxons_id_in,) %>diff --git a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erbindex ae10904b66..9761580311 100644--- a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb@@ -4,7 +4,7 @@<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5><button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" /></div>- <div class="modal-body border-bottom pb-3">+ <div class="modal-body"><%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %><%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %><%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>@@ -18,7 +18,7 @@</p></div></div>- <div class="modal-footer border-top">+ <div class="modal-footer"><%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %></div><% end %>diff --git a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erbindex 9947019406..0843758849 100644--- a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb@@ -5,7 +5,7 @@<h5 class="modal-title" id="stock_transfer_modal_label"><%= Spree.t(:add_variant) %></h5><button type="button" class="btn-close" data-action="search-picker#closeAndClear" data-dismiss="modal" aria-label="Close" /></div>- <div class="modal-body border-bottom pb-3">+ <div class="modal-body"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %><%= form.hidden_field :param_name, value: 'stock_transfer' %>@@ -22,7 +22,7 @@</p></div></div>- <div class="modal-footer border-top d-flex justify-content-between">+ <div class="modal-footer d-flex justify-content-between"><%= button_tag Spree.t(:add_selected_variant), class: "btn btn-primary text-center", disabled: true, data: { search_picker_target: :submit, action: 'stock-transfer#add search-picker#closeAndClear', dismiss: 'modal' } %></div></div>diff --git a/admin/app/views/spree/admin/store_credits/_list.html.erb b/admin/app/views/spree/admin/store_credits/_list.html.erbindex b7c199aa18..3a56067bda 100644--- a/admin/app/views/spree/admin/store_credits/_list.html.erb+++ b/admin/app/views/spree/admin/store_credits/_list.html.erb@@ -28,7 +28,7 @@<% else %><div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-link', data: { 'turbo-frame': '_top' } if can?(:create, Spree::StoreCredit) %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-link ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::StoreCredit) %></div><% end %>