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
Improve forms rendering
Damian Legawiec355064edf6a9
diff --git a/admin/app/views/spree/admin/custom_domains/edit.html.erb b/admin/app/views/spree/admin/custom_domains/edit.html.erbindex acbbe4c5d6..316a12b6c6 100644--- a/admin/app/views/spree/admin/custom_domains/edit.html.erb+++ b/admin/app/views/spree/admin/custom_domains/edit.html.erb@@ -3,11 +3,10 @@<%= @custom_domain.url %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-<%= 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>diff --git a/admin/app/views/spree/admin/custom_domains/new.html.erb b/admin/app/views/spree/admin/custom_domains/new.html.erbindex 3a46b466d5..33e14ea6a2 100644--- a/admin/app/views/spree/admin/custom_domains/new.html.erb+++ b/admin/app/views/spree/admin/custom_domains/new.html.erb@@ -3,11 +3,10 @@<%= Spree.t(:new_custom_domain) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-<%= 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>diff --git a/admin/app/views/spree/admin/integrations/new.html.erb b/admin/app/views/spree/admin/integrations/new.html.erbindex 3e79dc7286..38d46b8c15 100644--- a/admin/app/views/spree/admin/integrations/new.html.erb+++ b/admin/app/views/spree/admin/integrations/new.html.erb@@ -3,14 +3,13 @@<%= Spree.t('actions.connect') %> <%= @integration.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %>-<%= form_for @integration, as: :integration, url: spree.admin_integrations_path do |form| %><%= form.hidden_field :type %><%= form.hidden_field :active, value: true %><div class="row"><div class="col-lg-6 offset-lg-3">+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %><%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %><%= render 'spree/admin/shared/new_resource_links' %></div>diff --git a/admin/app/views/spree/admin/oauth_applications/edit.html.erb b/admin/app/views/spree/admin/oauth_applications/edit.html.erbindex 1620f3fc6c..e8ee066196 100644--- a/admin/app/views/spree/admin/oauth_applications/edit.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/edit.html.erb@@ -3,11 +3,10 @@<%= @oauth_application.name.capitalize %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>-<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 %>diff --git a/admin/app/views/spree/admin/oauth_applications/new.html.erb b/admin/app/views/spree/admin/oauth_applications/new.html.erbindex 66f04eddce..5c89a2fb14 100644--- a/admin/app/views/spree/admin/oauth_applications/new.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/new.html.erb@@ -7,10 +7,9 @@<%= Spree.t('admin.oauth_applications.new') %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>-<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">diff --git a/admin/app/views/spree/admin/pages/_form.html.erb b/admin/app/views/spree/admin/pages/_form.html.erbindex c7ed10024c..34c9daec5f 100644--- a/admin/app/views/spree/admin/pages/_form.html.erb+++ b/admin/app/views/spree/admin/pages/_form.html.erb@@ -1,29 +1,23 @@-<% vertical ||= false %>-<div class="row">- <div class="<%= vertical ? 'col-lg-12' : 'col-lg-8' %>">- <div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">- <h5 class="card-title">- <%= Spree.t(:details) %>- </h5>- </div>- <div class="card-body">- <div class="form-group">- <%= f.label :name, Spree.t(:name) %>- <%= f.text_field :name, class: 'form-control', required: true, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName', seo_form_target: 'sourceTitleInput' }, autofocus: true %>- </div>- </div>- </div>+<div class="card mb-4">+ <div class="card-header d-flex align-items-center justify-content-between">+ <h5 class="card-title">+ <%= Spree.t(:details) %>+ </h5></div>- <div class="<%= vertical ? 'col-lg-12' : 'col-lg-4' %>">- <%= render 'spree/admin/shared/seo',- f: f,- title: @page.name,- meta_title: @page.meta_title,- description: nil,- slug_attribute_name: "page[slug]",- slug: @page.slug,- slug_path: 'pages',- placeholder: 'Add a title to see how this page might appear in a search engine listing' %>+ <div class="card-body">+ <div class="form-group">+ <%= f.label :name, Spree.t(:name) %>+ <%= f.text_field :name, class: 'form-control', required: true, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName', seo_form_target: 'sourceTitleInput' }, autofocus: true %>+ </div></div></div>+<%= render 'spree/admin/shared/seo',+ f: f,+ title: @page.name,+ meta_title: @page.meta_title,+ description: nil,+ slug_attribute_name: "page[slug]",+ slug: @page.slug,+ slug_path: 'pages',+ placeholder: 'Add a title to see how this page might appear in a search engine listing' %>+diff --git a/admin/app/views/spree/admin/pages/new.html.erb b/admin/app/views/spree/admin/pages/new.html.erbindex 49da65edf7..d6c63e81f7 100644--- a/admin/app/views/spree/admin/pages/new.html.erb+++ b/admin/app/views/spree/admin/pages/new.html.erb@@ -5,7 +5,13 @@<% content_for :title do %><%= Spree.t(:new_page) %><% end %>-<%= form_with model: @page, url: spree.admin_pages_path, data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>- <%= render 'form', f: f, vertical: false %>- <%= render 'spree/admin/shared/new_resource_links', f: f %>-<% end %>++<div class="row">+ <div class="col-lg-6 offset-lg-3">+ <%= form_with model: @page, url: spree.admin_pages_path, data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @page } %>+ <%= render 'form', f: f, vertical: false %>+ <%= render 'spree/admin/shared/new_resource_links', f: f %>+ <% end %>+ </div>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/post_categories/edit.html.erb b/admin/app/views/spree/admin/post_categories/edit.html.erbindex d48967829c..1a08e742bd 100644--- a/admin/app/views/spree/admin/post_categories/edit.html.erb+++ b/admin/app/views/spree/admin/post_categories/edit.html.erb@@ -3,11 +3,10 @@<%= @post_category.title %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>-<%= form_for [:admin, @post_category] do |f| %><div class="row">- <div class="col-lg-8">+ <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>diff --git a/admin/app/views/spree/admin/post_categories/new.html.erb b/admin/app/views/spree/admin/post_categories/new.html.erbindex 0668996ba9..f2d01982e9 100644--- a/admin/app/views/spree/admin/post_categories/new.html.erb+++ b/admin/app/views/spree/admin/post_categories/new.html.erb@@ -3,11 +3,10 @@<%= Spree.t(:new_post_category) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>-<%= form_for [:admin, @post_category] do |f| %><div class="row">- <div class="col-lg-8">+ <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>diff --git a/admin/app/views/spree/admin/refunds/new.html.erb b/admin/app/views/spree/admin/refunds/new.html.erbindex 5e8b3809d9..bfb18df978 100644--- a/admin/app/views/spree/admin/refunds/new.html.erb+++ b/admin/app/views/spree/admin/refunds/new.html.erb@@ -1,4 +1,9 @@-<div class="row mt-4">+<% content_for :page_title do %>+ <%= page_header_back_button spree.edit_admin_order_path(@order) %>+ <%= Spree.t(:new_refund) %>+<% end %>++<div class="row"><div class="col-lg-6 offset-lg-3"><%= render 'spree/admin/shared/error_messages', target: @refund %>diff --git a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb b/admin/app/views/spree/admin/reimbursement_types/edit.html.erbindex 9ad58248e7..c5184f9e6b 100644--- a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/edit.html.erb@@ -3,11 +3,10 @@<%= @reimbursement_type.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>-<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 %>diff --git a/admin/app/views/spree/admin/reimbursement_types/new.html.erb b/admin/app/views/spree/admin/reimbursement_types/new.html.erbindex ddbc2a609d..bd2baf61fb 100644--- a/admin/app/views/spree/admin/reimbursement_types/new.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/new.html.erb@@ -3,12 +3,10 @@<%= Spree.t(:new_reimbursement_type) %><% end %>--<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>-<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 %>diff --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 1558cbf9ab..495c24f9c9 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@@ -3,11 +3,10 @@<%= @object.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-<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 %>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 1a34d1a343..25aafaae02 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@@ -3,11 +3,10 @@<%= page_title %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-<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 %>diff --git a/admin/app/views/spree/admin/shipping_categories/edit.html.erb b/admin/app/views/spree/admin/shipping_categories/edit.html.erbindex 64a6c23708..4043fe4f96 100644--- a/admin/app/views/spree/admin/shipping_categories/edit.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/edit.html.erb@@ -3,9 +3,12 @@<%= @shipping_category.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>-<%= form_for [:admin, @shipping_category] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: 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 %>diff --git a/admin/app/views/spree/admin/shipping_categories/new.html.erb b/admin/app/views/spree/admin/shipping_categories/new.html.erbindex bdc76b9173..3ac2606b4b 100644--- a/admin/app/views/spree/admin/shipping_categories/new.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/new.html.erb@@ -3,11 +3,12 @@<%= Spree.t(:new_shipping_category) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>-<%= form_for [:admin, @shipping_category] do |f| %>- <fieldset>- <%= render partial: 'form', locals: { f: f } %>- <%= render partial: 'spree/admin/shared/new_resource_links' %>- </fieldset>+ <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 %>diff --git a/admin/app/views/spree/admin/stock_locations/_form.html.erb b/admin/app/views/spree/admin/stock_locations/_form.html.erbindex b4996c90ca..eecf97ec2d 100644--- a/admin/app/views/spree/admin/stock_locations/_form.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_form.html.erb@@ -1,56 +1,40 @@-<div class="row">- <div class="col-12">- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:general_settings) %>- </h5>- </div>- <div class="card-body" >- <div class="row">- <div class="col-12 col-lg-6">- <div class="form-group">- <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>- <%= f.error_message_on :name %>- </div>- </div>- <div class="col-12 col-lg-6">- <div class="form-group">- <%= f.label :admin_name, Spree.t(:internal_name) %>- <%= f.text_field :admin_name, class: 'form-control', label: false %>- </div>- </div>+<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:general_settings) %>+ </h5>+ </div>+ <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: f.object.new_record? %>+ <%= f.error_message_on :name %>+ </div>+ <div class="form-group">+ <%= f.label :admin_name, Spree.t(:internal_name) %>+ <%= f.text_field :admin_name, class: 'form-control', label: false %>+ </div>+ <% unless f.object.default? %>+ <div class="form-group">+ <div class="custom-control custom-checkbox">+ <%= f.check_box :active, class: 'custom-control-input' %>+ <%= f.label :active, class: 'custom-control-label' %></div>- <% unless f.object.default? %>- <div class="row mt-3">- <div class="col-12">- <div class="form-group">- <div class="custom-control custom-checkbox">- <%= f.check_box :active, class: 'custom-control-input' %>- <%= f.label :active, class: 'custom-control-label' %>- </div>- </div>- </div>- </div>- <% end %></div>- </div>+ <% end %></div>- <div class="col-12">- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:address) %>- </h5>- </div>- <div class="card-body">- <%= render 'spree/addresses/form',- address_name: 'address',- address_form: f,- address_type: 'stock_location',- address: f.object %>- </div>- </div>+</div>+<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:address) %>+ </h5>+ </div>+ <div class="card-body pb-0">+ <%= render 'spree/addresses/form',+ address_name: 'address',+ address_form: f,+ address_type: 'stock_location',+ address: f.object %></div></div>diff --git a/admin/app/views/spree/admin/stock_locations/edit.html.erb b/admin/app/views/spree/admin/stock_locations/edit.html.erbindex 8b8e481a9d..0ce2ce35ac 100644--- a/admin/app/views/spree/admin/stock_locations/edit.html.erb+++ b/admin/app/views/spree/admin/stock_locations/edit.html.erb@@ -2,8 +2,13 @@<%= page_header_back_button spree.admin_stock_locations_path %><%= @stock_location.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>+<%= form_for [:admin, @stock_location] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: 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 %>diff --git a/admin/app/views/spree/admin/stock_locations/new.html.erb b/admin/app/views/spree/admin/stock_locations/new.html.erbindex 164a673beb..f10da5cfaf 100644--- a/admin/app/views/spree/admin/stock_locations/new.html.erb+++ b/admin/app/views/spree/admin/stock_locations/new.html.erb@@ -2,10 +2,13 @@<%= page_header_back_button spree.admin_stock_locations_path %><%= Spree.t(:new_stock_location) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>+<%= form_for [:admin, @stock_location] do |f| %>- <fieldset>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>- </fieldset>+ <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 %>diff --git a/admin/app/views/spree/admin/store_credits/new.html.erb b/admin/app/views/spree/admin/store_credits/new.html.erbindex 49fd583f8f..84da45414a 100644--- a/admin/app/views/spree/admin/store_credits/new.html.erb+++ b/admin/app/views/spree/admin/store_credits/new.html.erb@@ -7,11 +7,10 @@<%= Spree.t(:new_store_credit) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>-<%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %><div class="row"><div class="col-lg-6 offset-lg-3">+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %><div class="card mb-4"><div class="card-header"><h5 class="card-title">diff --git a/admin/app/views/spree/admin/tax_categories/_form.html.erb b/admin/app/views/spree/admin/tax_categories/_form.html.erbindex 51f2b29ad8..4d7ce86849 100644--- a/admin/app/views/spree/admin/tax_categories/_form.html.erb+++ b/admin/app/views/spree/admin/tax_categories/_form.html.erb@@ -14,7 +14,7 @@<div class="form-group"><%= f.label :description, Spree.t(:description) %><br>- <%= f.text_field :description, class: 'form-control' %>+ <%= f.text_area :description, class: 'form-control' %></div><div class="custom-control custom-checkbox">diff --git a/admin/app/views/spree/admin/tax_categories/edit.html.erb b/admin/app/views/spree/admin/tax_categories/edit.html.erbindex a1a9f8d821..259468004b 100644--- a/admin/app/views/spree/admin/tax_categories/edit.html.erb+++ b/admin/app/views/spree/admin/tax_categories/edit.html.erb@@ -3,9 +3,12 @@<%= @tax_category.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>-<%= form_for [:admin, @tax_category] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: 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 %>diff --git a/admin/app/views/spree/admin/tax_categories/new.html.erb b/admin/app/views/spree/admin/tax_categories/new.html.erbindex 09dfcc2eb8..bd06960ade 100644--- a/admin/app/views/spree/admin/tax_categories/new.html.erb+++ b/admin/app/views/spree/admin/tax_categories/new.html.erb@@ -3,9 +3,12 @@<%= Spree.t(:new_tax_category) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>-<%= form_for [:admin, @tax_category] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>+ <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 %>diff --git a/admin/app/views/spree/admin/tax_rates/_form.html.erb b/admin/app/views/spree/admin/tax_rates/_form.html.erbindex 233d566807..548dcb14bd 100644--- a/admin/app/views/spree/admin/tax_rates/_form.html.erb+++ b/admin/app/views/spree/admin/tax_rates/_form.html.erb@@ -6,40 +6,42 @@</div><div class="card-body">- <div class="row">- <div class="col-12 col-lg-6">- <div class="form-group">- <%= f.label :name, Spree.t(:name) %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>- <%= f.error_message_on :name %>- </div>- <div class="form-group">- <%= f.label :amount, Spree.t(:rate) %>- <%= f.number_field :amount, class: 'form-control', min: 0, step: 0.0001, required: true %>- <%= f.error_message_on :amount %>- <small class="form-text text-muted">- <%= Spree.t(:tax_rate_amount_explanation) %>- </small>- </div>- <div class="custom-control custom-checkbox mb-3">- <%= f.check_box :included_in_price, class: 'custom-control-input' %>- <%= f.label :included_in_price, class: 'custom-control-label' %>- </div>+ <div class="form-group">+ <%= f.label :name, Spree.t(:name) %>+ <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>+ <%= f.error_message_on :name %>+ </div>+ <div class="form-group">+ <%= f.label :amount, Spree.t(:rate) %>+ <%= f.number_field :amount, class: 'form-control', min: 0, step: 0.0001, required: true %>+ <%= f.error_message_on :amount %>+ <small class="form-text text-muted">+ <%= Spree.t(:tax_rate_amount_explanation) %>+ </small>+ </div>++ <div class="form-group">+ <%= f.label :zone_id, Spree.t(:zone) %>+ <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, { class: 'custom-select' }) %>+ </div>+ <div class="form-group">+ <%= f.label :tax_category_id, Spree.t(:tax_category) %>+ <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, { class: 'custom-select' }) %>+ </div>++ <hr class="my-4" />++ <div class="form-group">+ <div class="custom-control custom-checkbox">+ <%= f.check_box :included_in_price, class: 'custom-control-input' %>+ <%= f.label :included_in_price, class: 'custom-control-label' %></div>+ </div>- <div class="col-12 col-lg-6">- <div class="form-group">- <%= f.label :zone_id, Spree.t(:zone) %>- <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, { class: 'custom-select' }) %>- </div>- <div class="form-group">- <%= f.label :tax_category_id, Spree.t(:tax_category) %>- <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, { class: 'custom-select' }) %>- </div>- <div class="custom-control custom-checkbox">- <%= f.check_box :show_rate_in_label, class: 'custom-control-input' %>- <%= f.label :show_rate_in_label, class: 'custom-control-label' %>- </div>+ <div class="form-group">+ <div class="custom-control custom-checkbox">+ <%= f.check_box :show_rate_in_label, class: 'custom-control-input' %>+ <%= f.label :show_rate_in_label, class: 'custom-control-label' %></div></div></div>diff --git a/admin/app/views/spree/admin/tax_rates/edit.html.erb b/admin/app/views/spree/admin/tax_rates/edit.html.erbindex 1884f60e11..103c4db077 100644--- a/admin/app/views/spree/admin/tax_rates/edit.html.erb+++ b/admin/app/views/spree/admin/tax_rates/edit.html.erb@@ -3,9 +3,12 @@<%= @tax_rate.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>-<%= form_for [:admin, @tax_rate] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: 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 %>diff --git a/admin/app/views/spree/admin/tax_rates/new.html.erb b/admin/app/views/spree/admin/tax_rates/new.html.erbindex 70431d0a34..a0b24bc11c 100644--- a/admin/app/views/spree/admin/tax_rates/new.html.erb+++ b/admin/app/views/spree/admin/tax_rates/new.html.erb@@ -3,12 +3,12 @@<%= Spree.t(:new_tax_rate) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>-<%= form_for [:admin, @tax_rate] do |f| %>- <fieldset>- <%= render 'form', f: f %>-- <%= render 'spree/admin/shared/new_resource_links' %>- </fieldset>+ <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 %>diff --git a/admin/app/views/spree/admin/taxonomies/edit.html.erb b/admin/app/views/spree/admin/taxonomies/edit.html.erbindex 3ef4fa1392..1a073d1196 100644--- a/admin/app/views/spree/admin/taxonomies/edit.html.erb+++ b/admin/app/views/spree/admin/taxonomies/edit.html.erb@@ -7,14 +7,12 @@<%= link_to_edit_translations(@taxonomy) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>-<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' %>diff --git a/admin/app/views/spree/admin/taxonomies/new.html.erb b/admin/app/views/spree/admin/taxonomies/new.html.erbindex e0fdd02002..2bcef19aa5 100644--- a/admin/app/views/spree/admin/taxonomies/new.html.erb+++ b/admin/app/views/spree/admin/taxonomies/new.html.erb@@ -2,7 +2,6 @@<%= page_header_back_button spree.admin_taxonomies_path %><%= Spree.t(:new_taxonomy) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %><div class="row"><div class="col-lg-6 offset-lg-3">diff --git a/admin/app/views/spree/admin/zones/_form.html.erb b/admin/app/views/spree/admin/zones/_form.html.erbindex a8aa65b88e..0f6c9e3829 100644--- a/admin/app/views/spree/admin/zones/_form.html.erb+++ b/admin/app/views/spree/admin/zones/_form.html.erb@@ -1,48 +1,44 @@-<div class="row">- <div class="col-12 col-lg-6">- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title"><%= Spree.t(:general_settings) %></h5>- </div>+<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title"><%= Spree.t(:general_settings) %></h5>+ </div>- <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 %>- </div>+ <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 %>+ </div>- <div class="form-group">- <%= zone_form.label :description, Spree.t(:description) %>- <%= zone_form.text_field :description, class: 'form-control' %>- </div>+ <div class="form-group">+ <%= zone_form.label :description, Spree.t(:description) %>+ <%= zone_form.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' %>- </div>- </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' %>+ </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' } %>- <%= 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' } %>- <%= label_tag :state_based, Spree.t(:state_based), 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' } %>+ <%= 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' } %>+ <%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %></div></div></div>- <div class="col-12 col-lg-6">- <% if @zone.country? %>- <%= render partial: 'country_members', locals: { zone_form: zone_form } %>- <% else %>- <%= render partial: 'state_members', locals: { zone_form: zone_form } %>- <% end %>- </div></div>++<% if @zone.country? %>+ <%= render partial: 'country_members', locals: { zone_form: zone_form } %>+<% else %>+ <%= render partial: 'state_members', locals: { zone_form: zone_form } %>+<% end %>+diff --git a/admin/app/views/spree/admin/zones/edit.html.erb b/admin/app/views/spree/admin/zones/edit.html.erbindex 609459b107..d9225f4795 100644--- a/admin/app/views/spree/admin/zones/edit.html.erb+++ b/admin/app/views/spree/admin/zones/edit.html.erb@@ -3,10 +3,12 @@<%= @zone.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>-<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |f| %>- <%= render 'form', zone_form: f %>-- <%= render 'spree/admin/shared/edit_resource_links', f: 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 %>diff --git a/admin/app/views/spree/admin/zones/new.html.erb b/admin/app/views/spree/admin/zones/new.html.erbindex 541f922e1a..974f91b987 100644--- a/admin/app/views/spree/admin/zones/new.html.erb+++ b/admin/app/views/spree/admin/zones/new.html.erb@@ -3,9 +3,12 @@<%= Spree.t(:new_market) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>-<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |zone_form| %>- <%= render partial: 'form', locals: { zone_form: zone_form } %>- <%= render 'spree/admin/shared/new_resource_links' %>+ <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 %>