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
ERBlint backend
Matthew Kennedyf6dffb03a9c4
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erbindex 50de6bd59a..e59086b17f 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.first? %><li class="first page-item"><%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erbindex de230de77c..a7f00c7d12 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb@@ -3,8 +3,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<li class="page gap disabled page-item d-none d-lg-flex"><a href="#" onclick="return false;" class="page-link"><%= raw(t 'views.pagination.truncate') %>diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erbindex fc9fb49398..3b56140331 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.last? %><li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %><%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erbindex b6a4cfff77..c4fb9882ec 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.last? %><li class="next_page page-item"><%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erbindex 65bb712f19..a5d6ef1821 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb@@ -5,8 +5,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<li class="page<%= ' active' if page.current? %> page-item"><%= link_to page,url,diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erbindex a0f645d357..61a9735f0d 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb@@ -4,8 +4,8 @@total_pages: total number of pagesper_page: number of items to fetch per pageremote: data-remote- paginator: the paginator that renders the pagination tags inside--%>+ paginator: the paginator that renders the pagination tags inside -%>+<% pagination_class ||= '' %><%= paginator.render do %>diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erbindex 6d2fec7ec7..0512c58066 100644--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.first? %><li class="prev page-item"><%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>diff --git a/backend/app/views/spree/admin/general_settings/edit.html.erb b/backend/app/views/spree/admin/general_settings/edit.html.erbindex 1043e0b33e..787396b4ca 100644--- a/backend/app/views/spree/admin/general_settings/edit.html.erb+++ b/backend/app/views/spree/admin/general_settings/edit.html.erb@@ -39,7 +39,7 @@<%#-------------------------------------------------%><div class="card mb-3" id="general-settings-cache" data-hook="general_settings_cache"><div class="card-header">- <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache)%></h1>+ <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache) %></h1></div><div class="card-body">@@ -61,7 +61,7 @@<div class="card mb-3" id="general-settings-currency" data-hook="general_settings_currency"><div class="card-header"><h1 class="card-title mb-0 h5">- <%= Spree.t(:currency_settings)%>+ <%= Spree.t(:currency_settings) %></h1></div>@@ -79,7 +79,7 @@<div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores"><div class="card-header"><h1 class="card-title mb-0 h5">- <%= Spree.t(:multiple_stores)%>+ <%= Spree.t(:multiple_stores) %></h1></div><div class="card-body">diff --git a/backend/app/views/spree/admin/images/edit.html.erb b/backend/app/views/spree/admin/images/edit.html.erbindex 26f0c4c720..8e77052118 100644--- a/backend/app/views/spree/admin/images/edit.html.erb+++ b/backend/app/views/spree/admin/images/edit.html.erb@@ -6,7 +6,7 @@<div data-hook="edit_image" class="card mb-3"><div class="card-header"><h1 class="card-title mb-0 h5">- <%= @image.attachment_file_name%>+ <%= @image.attachment_file_name %></h1></div><div class="card-body">diff --git a/backend/app/views/spree/admin/log_entries/index.html.erb b/backend/app/views/spree/admin/log_entries/index.html.erbindex e4e142b25c..2d2b1e5fd6 100644--- a/backend/app/views/spree/admin/log_entries/index.html.erb+++ b/backend/app/views/spree/admin/log_entries/index.html.erb@@ -1,4 +1,4 @@-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments }%>+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %><% content_for :page_title do %>/diff --git a/backend/app/views/spree/admin/option_types/index.html.erb b/backend/app/views/spree/admin/option_types/index.html.erbindex f5f17a14f4..06e7218a09 100644--- a/backend/app/views/spree/admin/option_types/index.html.erb+++ b/backend/app/views/spree/admin/option_types/index.html.erb@@ -24,7 +24,7 @@</thead><tbody id="sortVert"><% @option_types.each do |option_type| %>- <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">+ <tr class="spree_option_type <%= cycle('odd', 'even') %>" id="<%= spree_dom_id option_type %>" data-hook="option_row"><td class="move-handle text-center"><%= svg_icon name: "sort.svg", width: '18', height: '18' %></td>diff --git a/backend/app/views/spree/admin/orders/_adjustments.html.erb b/backend/app/views/spree/admin/orders/_adjustments.html.erbindex 91529ba923..95b863f259 100644--- a/backend/app/views/spree/admin/orders/_adjustments.html.erb+++ b/backend/app/views/spree/admin/orders/_adjustments.html.erb@@ -9,8 +9,8 @@<table class="table table-bordered"><thead><tr>- <th><%= Spree.t('name')%></th>- <th><%= Spree.t('amount')%></th>+ <th><%= Spree.t('name') %></th>+ <th><%= Spree.t('amount') %></th></tr></thead><tbody id="order-charges" data-hook="order_details_adjustments">diff --git a/backend/app/views/spree/admin/orders/_form.html.erb b/backend/app/views/spree/admin/orders/_form.html.erbindex 9205d43cbb..a599792238 100644--- a/backend/app/views/spree/admin/orders/_form.html.erb+++ b/backend/app/views/spree/admin/orders/_form.html.erb@@ -12,18 +12,15 @@<%= render "spree/admin/orders/adjustments",adjustments: @order.line_item_adjustments,order: order,- title: Spree.t(:line_item_adjustments)- %>+ title: Spree.t(:line_item_adjustments) %><%= render "spree/admin/orders/adjustments",adjustments: @order.shipment_adjustments,order: order,- title: Spree.t(:shipment_adjustments)- %>+ title: Spree.t(:shipment_adjustments) %><%= render "spree/admin/orders/adjustments",adjustments: @order.adjustments,order: order,- title: Spree.t(:order_adjustments)- %>+ title: Spree.t(:order_adjustments) %><% if order.line_items.exists? %><div class="alert alert-success" id="order-total" data-hook="order_details_total">@@ -46,8 +43,7 @@:id, :tracking, :number, :state, :stock_location_id], include: [:inventory_units, :stock_location- ]).to_json- %>+ ]).to_json %>);<% end %>diff --git a/backend/app/views/spree/admin/orders/_line_items.html.erb b/backend/app/views/spree/admin/orders/_line_items.html.erbindex 4ece8add34..00ecb4e1b5 100644--- a/backend/app/views/spree/admin/orders/_line_items.html.erb+++ b/backend/app/views/spree/admin/orders/_line_items.html.erb@@ -24,7 +24,7 @@</td><td class="line-item-name text-center"><%= link_to item.name, edit_admin_product_path(item.variant.product) %>- <br />+ <br><%= "(#{item.options_text})" if item.options_text.present? %></td><td class="line-item-price text-center"><%= item.single_money.to_html %></td>diff --git a/backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb b/backend/app/views/spree/admin/orders/_line_items_edit_form.html.erbindex 67fe47556d..71b5a4b3a5 100644--- a/backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb+++ b/backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb@@ -7,18 +7,15 @@<%= render "spree/admin/orders/adjustments",adjustments: @order.line_item_adjustments,order: order,- title: Spree.t(:line_item_adjustments)- %>+ title: Spree.t(:line_item_adjustments) %><%= render "spree/admin/orders/adjustments",adjustments: @order.shipment_adjustments,order: order,- title: Spree.t(:shipment_adjustments)- %>+ title: Spree.t(:shipment_adjustments) %><%= render "spree/admin/orders/adjustments",adjustments: @order.adjustments,order: order,- title: Spree.t(:order_adjustments)- %>+ title: Spree.t(:order_adjustments) %><% if order.line_items.exists? %><div class="alert alert-success" id="order-total" data-hook="order_details_total">diff --git a/backend/app/views/spree/admin/orders/_order_actions.html.erb b/backend/app/views/spree/admin/orders/_order_actions.html.erbindex 5310debc9a..b58d0f8eda 100644--- a/backend/app/views/spree/admin/orders/_order_actions.html.erb+++ b/backend/app/views/spree/admin/orders/_order_actions.html.erb@@ -6,7 +6,6 @@<%= button_link_to Spree.t(:resend, scope: 'admin.order.events', default: Spree.t(:resend)),resend_admin_order_url(order),method: :post,- icon: 'envelope.svg'- %>+ icon: 'envelope.svg' %><% end %><% end %>diff --git a/backend/app/views/spree/admin/orders/_risk_analysis.html.erb b/backend/app/views/spree/admin/orders/_risk_analysis.html.erbindex d5992e549f..78a90acc60 100644--- a/backend/app/views/spree/admin/orders/_risk_analysis.html.erb+++ b/backend/app/views/spree/admin/orders/_risk_analysis.html.erb@@ -3,10 +3,10 @@<div class="table-responsive"><table class="table table-condensed table-bordered"><thead>- <th><%= Spree.t('risk')%></th>- <th><%= Spree.t('status')%></th>+ <th><%= Spree.t('risk') %></th>+ <th><%= Spree.t('status') %></th></thead>- <tbody id="risk-analysis" data-hook="order_details_adjustments" class="with-border">+ <tbody id="risk-analysis" data-hook="order_details_adjustments" class="with-border"><tr class=""><td><strong><%= Spree.t(:failed_payment_attempts) %>:</strong>diff --git a/backend/app/views/spree/admin/orders/_shipment.html.erb b/backend/app/views/spree/admin/orders/_shipment.html.erbindex 9799c6ed50..afa874c830 100644--- a/backend/app/views/spree/admin/orders/_shipment.html.erb+++ b/backend/app/views/spree/admin/orders/_shipment.html.erb@@ -71,7 +71,6 @@</td></tr>-<tr class="edit-tracking is-hidden total"><td colspan="5"><label><%= Spree.t(:tracking_number) %>:</label>diff --git a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erbindex b7c2d6dedf..8b3a2b7eb5 100644--- a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb+++ b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb@@ -6,7 +6,7 @@<td class="item-name"><%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %>- <br />+ <br><%= "(#{item.variant.options_text})" if item.variant.options_text.present? %><% if item.variant.sku.present? %><strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>diff --git a/backend/app/views/spree/admin/orders/cart.html.erb b/backend/app/views/spree/admin/orders/cart.html.erbindex 2a2410ae74..4ab274581a 100644--- a/backend/app/views/spree/admin/orders/cart.html.erb+++ b/backend/app/views/spree/admin/orders/cart.html.erb@@ -14,7 +14,7 @@<% if @order.line_items.empty? %><div class="alert alert-warning">- <%= Spree.t(:your_order_is_empty_add_product)%>+ <%= Spree.t(:your_order_is_empty_add_product) %></div><% end %>diff --git a/backend/app/views/spree/admin/orders/edit.html.erb b/backend/app/views/spree/admin/orders/edit.html.erbindex caf13de9b6..14218eefa5 100644--- a/backend/app/views/spree/admin/orders/edit.html.erb+++ b/backend/app/views/spree/admin/orders/edit.html.erb@@ -18,7 +18,7 @@<% if @order.line_items.empty? %><div class="alert alert-warning">- <%= Spree.t(:your_order_is_empty_add_product)%>+ <%= Spree.t(:your_order_is_empty_add_product) %></div><% end %>diff --git a/backend/app/views/spree/admin/payment_methods/index.html.erb b/backend/app/views/spree/admin/payment_methods/index.html.erbindex 9bff1c3cb4..7132f6c6ab 100644--- a/backend/app/views/spree/admin/payment_methods/index.html.erb+++ b/backend/app/views/spree/admin/payment_methods/index.html.erb@@ -20,7 +20,7 @@</tr></thead><tbody id="sortVert">- <% @payment_methods.each do |method|%>+ <% @payment_methods.each do |method| %><tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows"><td class="move-handle text-center"><% if can?(:edit, method) %>diff --git a/backend/app/views/spree/admin/payments/_form.html.erb b/backend/app/views/spree/admin/payments/_form.html.erbindex 4c4af69576..1ecbb336d6 100644--- a/backend/app/views/spree/admin/payments/_form.html.erb+++ b/backend/app/views/spree/admin/payments/_form.html.erb@@ -19,12 +19,11 @@<div class="payment-methods my-3" id="payment_method_<%= method.id %>"><% if method.source_required? %>- <%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",+ <%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",locals: {payment_method: method,previous_cards: method.reusable_sources(@order)- }- %>+ } %><% end %></div><% end %>diff --git a/backend/app/views/spree/admin/payments/show.html.erb b/backend/app/views/spree/admin/payments/show.html.erbindex 1235498001..8c03815675 100644--- a/backend/app/views/spree/admin/payments/show.html.erb+++ b/backend/app/views/spree/admin/payments/show.html.erb@@ -18,8 +18,7 @@<%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",locals: {payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment- }-%>+ } %><div class="alert alert-success" data-hook="amount"><%= Spree.t(:amount) %>: <%= @payment.display_amount.to_html %>diff --git a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erbindex 7062c196b8..9ea0b9472c 100644--- a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb+++ b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb@@ -32,7 +32,7 @@<%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %><%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %><span id="card_type" style="display:none;">- ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>+ ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span><span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>)</span>diff --git a/backend/app/views/spree/admin/prices/_variant_prices.html.erb b/backend/app/views/spree/admin/prices/_variant_prices.html.erbindex 9e1bff5ddc..4200d2d920 100644--- a/backend/app/views/spree/admin/prices/_variant_prices.html.erb+++ b/backend/app/views/spree/admin/prices/_variant_prices.html.erb@@ -2,11 +2,11 @@<div id="variant_prices-table-wrapper"><table class="table sortable"><colgroup>- <col style="width: 15%" />- <col style="width: 30%" />- <col style="width: 15%" />- <col style="width: 20%" />- <col style="width: 20%" />+ <col style="width: 15%">+ <col style="width: 30%">+ <col style="width: 15%">+ <col style="width: 20%">+ <col style="width: 20%"></colgroup><thead><tr data-hook="variant_prices_header">diff --git a/backend/app/views/spree/admin/prices/index.html.erb b/backend/app/views/spree/admin/prices/index.html.erbindex f611d9ad01..1091cc6933 100644--- a/backend/app/views/spree/admin/prices/index.html.erb+++ b/backend/app/views/spree/admin/prices/index.html.erb@@ -6,7 +6,7 @@<% end %><form>- <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"/>+ <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"></form><%= form_tag nil, { class: 'form-horizontal' } do %>diff --git a/backend/app/views/spree/admin/product_properties/index.html.erb b/backend/app/views/spree/admin/product_properties/index.html.erbindex 1be20f53d1..5b0d95046f 100644--- a/backend/app/views/spree/admin/product_properties/index.html.erb+++ b/backend/app/views/spree/admin/product_properties/index.html.erb@@ -52,7 +52,6 @@});<% end %>-<style>div.ui-helper-hidden-accessible {display:none;}</style>diff --git a/backend/app/views/spree/admin/products/_form.html.erb b/backend/app/views/spree/admin/products/_form.html.erbindex df7e183e3a..ef5ac8b82f 100644--- a/backend/app/views/spree/admin/products/_form.html.erb+++ b/backend/app/views/spree/admin/products/_form.html.erb@@ -1,6 +1,4 @@-<div data-hook="admin_product_form_fields">-<div class="row"><div class="col-12 col-md-8" data-hook="admin_product_form_left">@@ -68,7 +66,7 @@<div class="input-group datePickerFrom"data-wrap="true"- data-max-date="<%= @product.discontinue_on %>" >+ data-max-date="<%= @product.discontinue_on %>"><%= f.text_field :available_on,value: datepicker_field_value(@product.available_on),@@ -81,7 +79,6 @@<% end %></div>-<div data-hook="admin_product_form_discontinue_on"><%= f.field_container :discontinue_on, class: ['form-group'] do %><%= f.label :discontinue_on, Spree.t(:discontinue_on) %>@@ -89,7 +86,7 @@<div class="input-group datePickerTo"data-wrap="true"- data-min-date="<%= @product.available_on %>" >+ data-min-date="<%= @product.available_on %>"><%= f.text_field :discontinue_on,value: datepicker_field_value(@product.discontinue_on),@@ -195,7 +192,7 @@<%= f.label :taxon_ids, Spree.t(:taxons) %><% if can? :modify, Spree::Classification %>- <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>+ <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %><% elsif @product.taxons.any? %><ul class="text_list"><% @product.taxons.each do |taxon| %>diff --git a/backend/app/views/spree/admin/products/stock.html.erb b/backend/app/views/spree/admin/products/stock.html.erbindex c76dcb925e..45bdd107b1 100644--- a/backend/app/views/spree/admin/products/stock.html.erb+++ b/backend/app/views/spree/admin/products/stock.html.erb@@ -33,8 +33,8 @@class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %><%= Spree.t(:track_inventory) %><%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,- class: 'variant_track_inventory',- id: "variant_track_inventory_#{variant.id}" %>+ class: 'variant_track_inventory',+ id: "variant_track_inventory_#{variant.id}" %><% end %></div><% end if can?(:update, @product) && can?(:update, variant) %>diff --git a/backend/app/views/spree/admin/promotions/_actions.html.erb b/backend/app/views/spree/admin/promotions/_actions.html.erbindex 286045fd16..83732a627c 100644--- a/backend/app/views/spree/admin/promotions/_actions.html.erb+++ b/backend/app/views/spree/admin/promotions/_actions.html.erb@@ -8,7 +8,7 @@<% options = options_for_select( Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %><div class="form-group">- <%= label_tag :action_type, Spree.t(:add_action_of_type)%>+ <%= label_tag :action_type, Spree.t(:add_action_of_type) %><%= select_tag 'action_type', options, class: 'select2' %></div><div class="form-actions">@@ -31,5 +31,4 @@<%= button Spree.t('actions.update'), 'save.svg' %></div><% end %>-</div>diff --git a/backend/app/views/spree/admin/promotions/_form.html.erb b/backend/app/views/spree/admin/promotions/_form.html.erbindex dbcf53e328..20e2fab1b0 100644--- a/backend/app/views/spree/admin/promotions/_form.html.erb+++ b/backend/app/views/spree/admin/promotions/_form.html.erb@@ -1,6 +1,6 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>-<div class="row" id="general_fields" >+<div class="row" id="general_fields"><div class="col-12 col-md-3"><%= f.field_container :name, class: ['form-group'] do %><%= f.label :name %>@@ -64,7 +64,7 @@data-wrap="true"data-enable-time="true"data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"- data-max-date="<%= @promotion.expires_at %>" >+ data-max-date="<%= @promotion.expires_at %>"><%= f.datetime_field :starts_at,class: 'form-control shadow-none',placeholder: Spree.t('starting_from'),@@ -78,9 +78,9 @@<%= f.label :expires_at %><div class="input-group datePickerTo"data-wrap="true"- data-enable-time= 'true'- data-date-format= "<%= Spree.t('js_date_time', scope: 'date_picker') %>"- data-min-date="<%= @promotion.starts_at %>" >+ data-enable-time='true'+ data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"+ data-min-date="<%= @promotion.starts_at %>"><%= f.datetime_field :expires_at,placeholder:Spree.t('ends_at'),class: 'form-control shadow-none',diff --git a/backend/app/views/spree/admin/promotions/index.html.erb b/backend/app/views/spree/admin/promotions/index.html.erbindex 0b0ee57531..acfcc978dc 100644--- a/backend/app/views/spree/admin/promotions/index.html.erb+++ b/backend/app/views/spree/admin/promotions/index.html.erb@@ -64,7 +64,7 @@<td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td><td><%= promotion.code %></td><td><%= promotion.description %></td>- <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>+ <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td><td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td><td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td><td class="actions actions-2" data-hook="admin_promotions_index_row_actions">diff --git a/backend/app/views/spree/admin/promotions/rules/_taxon.html.erb b/backend/app/views/spree/admin/promotions/rules/_taxon.html.erbindex 5670d8267e..83f857a241 100644--- a/backend/app/views/spree/admin/promotions/rules/_taxon.html.erb+++ b/backend/app/views/spree/admin/promotions/rules/_taxon.html.erb@@ -1,7 +1,7 @@<div class="card-body"><div class="form-group taxons_rule_taxons"><%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>- <%= select_tag "#{param_prefix}[taxon_ids_string]", nil, class: 'taxon_picker d-block w-100', id: :product_taxon_ids %>+ <%= select_tag "#{param_prefix}[taxon_ids_string]", nil, class: 'taxon_picker d-block w-100', id: :product_taxon_ids %></div><div class="form-group mb-0"><%= label_tag Spree.t('taxon_rule.label') %>diff --git a/backend/app/views/spree/admin/prototypes/_form.html.erb b/backend/app/views/spree/admin/prototypes/_form.html.erbindex 9d65265a86..edf8a3349f 100644--- a/backend/app/views/spree/admin/prototypes/_form.html.erb+++ b/backend/app/views/spree/admin/prototypes/_form.html.erb@@ -1,6 +1,6 @@<div data-hook="admin_prototype_form_fields"><%= f.field_container :name, class: ['form-group'] do %>- <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />+ <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br><%= f.text_field :name, class: 'form-control' %><%= f.error_message_on :name %><% end %>diff --git a/backend/app/views/spree/admin/prototypes/show.html.erb b/backend/app/views/spree/admin/prototypes/show.html.erbindex 29322226e0..aca0438912 100644--- a/backend/app/views/spree/admin/prototypes/show.html.erb+++ b/backend/app/views/spree/admin/prototypes/show.html.erb@@ -13,7 +13,7 @@<% ot.option_values.each do |ov| %><li><%= label_tag "option_value_#{ov.id}" do %>- <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>+ <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %><div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div><% end %></li>diff --git a/backend/app/views/spree/admin/refunds/edit.html.erb b/backend/app/views/spree/admin/refunds/edit.html.erbindex 488f0d77ba..7fd446b95a 100644--- a/backend/app/views/spree/admin/refunds/edit.html.erb+++ b/backend/app/views/spree/admin/refunds/edit.html.erb@@ -11,11 +11,11 @@<fieldset><div data-hook="admin_refund_form_fields"><div class="form-group">- <%= f.label :amount, Spree.t(:amount) %><br/>+ <%= f.label :amount, Spree.t(:amount) %><br><%= @refund.amount %></div><div class="form-group">- <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>+ <%= f.label :refund_reason_id, Spree.t(:reason) %><br><%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2'}) %></div></div>diff --git a/backend/app/views/spree/admin/refunds/new.html.erb b/backend/app/views/spree/admin/refunds/new.html.erbindex 035395581b..7a0ac1f97b 100644--- a/backend/app/views/spree/admin/refunds/new.html.erb+++ b/backend/app/views/spree/admin/refunds/new.html.erb@@ -11,11 +11,11 @@<fieldset><div data-hook="admin_refund_form_fields"><div class="form-group">- <%= f.label :payment_amount, Spree.t(:payment_amount) %><br/>+ <%= f.label :payment_amount, Spree.t(:payment_amount) %><br><%= @refund.payment.amount %></div><div class="form-group">- <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>+ <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br><%= @refund.payment.credit_allowed %></div><%= f.field_container :amount, class: ['form-group'] do %>diff --git a/backend/app/views/spree/admin/roles/index.html.erb b/backend/app/views/spree/admin/roles/index.html.erbindex 9e1665fc70..fdc3461071 100644--- a/backend/app/views/spree/admin/roles/index.html.erb+++ b/backend/app/views/spree/admin/roles/index.html.erb@@ -16,7 +16,7 @@</tr></thead><tbody>- <% @roles.each do |role|%>+ <% @roles.each do |role| %><tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows"><td><%= role.name %></td><td class="actions text-right">diff --git a/backend/app/views/spree/admin/shared/_error_messages.html.erb b/backend/app/views/spree/admin/shared/_error_messages.html.erbindex f314f1ba6d..ca9a2af7c3 100644--- a/backend/app/views/spree/admin/shared/_error_messages.html.erb+++ b/backend/app/views/spree/admin/shared/_error_messages.html.erb@@ -1,7 +1,7 @@<% if target && target.errors.any? %><div id="errorExplanation" class="errorExplanation alert alert-danger" data-hook><p>- <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br/>+ <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br></p><ul class="ul-with-markup"><% target.errors.full_messages.each do |msg| %>diff --git a/backend/app/views/spree/admin/shared/_header.html.erb b/backend/app/views/spree/admin/shared/_header.html.erbindex 877d147c98..66f5a80227 100644--- a/backend/app/views/spree/admin/shared/_header.html.erb+++ b/backend/app/views/spree/admin/shared/_header.html.erb@@ -1,5 +1,4 @@<header class="header logged-in">-<nav class="navbar fixed-top navbar-dark align-items-middle"><div class="col-3 col-sm-4 p-0 d-lg-none"><button@@ -23,5 +22,4 @@<%= render partial: 'spree/admin/shared/account_nav' %></div></nav>-</header>diff --git a/backend/app/views/spree/admin/shared/_main_menu.html.erb b/backend/app/views/spree/admin/shared/_main_menu.html.erbindex 45511bb17c..f56f98b8fd 100644--- a/backend/app/views/spree/admin/shared/_main_menu.html.erb+++ b/backend/app/views/spree/admin/shared/_main_menu.html.erb@@ -30,7 +30,7 @@<% if can? :admin, Spree::Admin::ReportsController %><ul class="nav nav-sidebar border-bottom" id="sidebarReport">- <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg' %>+ <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg' %></ul><% end %>diff --git a/backend/app/views/spree/admin/shared/_refunds.html.erb b/backend/app/views/spree/admin/shared/_refunds.html.erbindex 1a49bd4edc..e4f9a3e5d8 100644--- a/backend/app/views/spree/admin/shared/_refunds.html.erb+++ b/backend/app/views/spree/admin/shared/_refunds.html.erb@@ -15,7 +15,7 @@</thead><tbody><% refunds.each do |refund| %>- <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">+ <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle') %>"><td><%= pretty_time(refund.created_at) %></td><td><%= link_to refund.payment.number, spree.admin_order_payment_path(refund.payment.order, refund.payment) %></td><td class="amount"><%= refund.display_amount %></td>diff --git a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erbindex 4eb112a225..5f052125c2 100644--- a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb+++ b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb@@ -5,7 +5,7 @@<div class="col-12 col-md-6 mb-3 mb-md-0"><div class="input-group datePickerFrom"data-wrap="true"- data-max-date="<%= params[:q][:completed_at_lt] %>" >+ data-max-date="<%= params[:q][:completed_at_lt] %>"><%= s.text_field :completed_at_gt,class: 'form-control shadow-none',placeholder: Spree.t(:starting_from),@@ -19,7 +19,7 @@<div class="col-12 col-md-6 mt-3 mt-md-0"><div class="input-group datePickerTo"data-wrap="true"- data-min-date="<%= params[:q][:completed_at_gt] %>" >+ data-min-date="<%= params[:q][:completed_at_gt] %>"><%= s.text_field :completed_at_lt,class: 'form-control shadow-none',diff --git a/backend/app/views/spree/admin/shipping_categories/index.html.erb b/backend/app/views/spree/admin/shipping_categories/index.html.erbindex 3770cd0788..52a8939ce8 100644--- a/backend/app/views/spree/admin/shipping_categories/index.html.erb+++ b/backend/app/views/spree/admin/shipping_categories/index.html.erb@@ -16,7 +16,7 @@</tr></thead><tbody>- <% @shipping_categories.each do |shipping_category|%>+ <% @shipping_categories.each do |shipping_category| %><tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row"><td><%= shipping_category.name %></td><td class="actions actions-2 text-right">@@ -27,7 +27,7 @@<% end %></tbody></table>-</div>+</div><% else %><div class="alert alert-info no-objects-found"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingCategory)) %>,diff --git a/backend/app/views/spree/admin/shipping_methods/index.html.erb b/backend/app/views/spree/admin/shipping_methods/index.html.erbindex f3abd672cf..4d8c3224ba 100644--- a/backend/app/views/spree/admin/shipping_methods/index.html.erb+++ b/backend/app/views/spree/admin/shipping_methods/index.html.erb@@ -19,7 +19,7 @@</tr></thead><tbody>- <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>+ <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method| %><tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows"><td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td><td>@@ -37,7 +37,7 @@<% end %></tbody></table>-</div>+</div><% else %><div class="alert alert-info no-objects-found"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingMethod)) %>,diff --git a/backend/app/views/spree/admin/states/index.html.erb b/backend/app/views/spree/admin/states/index.html.erbindex 8c2b9c7537..7677134a38 100644--- a/backend/app/views/spree/admin/states/index.html.erb+++ b/backend/app/views/spree/admin/states/index.html.erb@@ -8,11 +8,11 @@<div data-hook="country" class="form-group"><%= label_tag :country, Spree.t(:country) %>- <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">+ <select id="country" class='observe_field select2' data-base-url="<%= admin_states_path(format: :js) %>?country_id=" data-update="#state-list"><%= options_from_collection_for_select(@countries, :id, :name, @country.id) %></select></div><div id="state-list" data-hook>- <%= render partial: 'state_list'%>+ <%= render partial: 'state_list' %></div>diff --git a/backend/app/views/spree/admin/stock_locations/_form.html.erb b/backend/app/views/spree/admin/stock_locations/_form.html.erbindex 618350e86f..a82b2c6ce9 100644--- a/backend/app/views/spree/admin/stock_locations/_form.html.erb+++ b/backend/app/views/spree/admin/stock_locations/_form.html.erb@@ -3,7 +3,7 @@<div class="col-12 col-md-9" data-hook="stock_location_names"><div data-hook="stock_location_name"><%= f.field_container :name, class: ['form-group'] do %>- <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />+ <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br><%= f.text_field :name, class: 'form-control', required: true %><%= f.error_message_on :name %><% end %>diff --git a/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb b/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erbindex baf4dd3327..6dc377db6d 100644--- a/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb+++ b/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb@@ -1,6 +1,6 @@<%= form_tag transfer_stock_admin_stock_locations_path do %><fieldset>- <legend><%= Spree.t(:move_stock_between_locations)%></legend>+ <legend><%= Spree.t(:move_stock_between_locations) %></legend><div data-hook="admin_stock_movements_form_fields" class="row"><div class="col-12 col-md-5"><div class="form-group" id="stock_movement_transfer_from_field">diff --git a/backend/app/views/spree/admin/stock_locations/index.html.erb b/backend/app/views/spree/admin/stock_locations/index.html.erbindex 8584b3fea3..96a28d3c77 100644--- a/backend/app/views/spree/admin/stock_locations/index.html.erb+++ b/backend/app/views/spree/admin/stock_locations/index.html.erb@@ -20,8 +20,8 @@<tbody><% @stock_locations.each do |stock_location|@edit_url = spree.edit_admin_stock_location_path(stock_location)- @delete_url = spree.admin_stock_location_path(stock_location)- %>+ @delete_url = spree.admin_stock_location_path(stock_location) %>+<tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row"><td><%= display_name(stock_location) %></td><td><%= link_to Spree.t(:stock_movements), spree.admin_stock_location_stock_movements_path(stock_location.id) %> </td>diff --git a/backend/app/views/spree/admin/stock_movements/index.html.erb b/backend/app/views/spree/admin/stock_movements/index.html.erbindex 6ace30a050..bd63f59fa6 100644--- a/backend/app/views/spree/admin/stock_movements/index.html.erb+++ b/backend/app/views/spree/admin/stock_movements/index.html.erb@@ -23,7 +23,7 @@</tr></thead><tbody>- <% @stock_movements.each do |stock_movement|%>+ <% @stock_movements.each do |stock_movement| %><tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows"><td><%= display_variant(stock_movement) %>diff --git a/backend/app/views/spree/admin/stock_transfers/new.html.erb b/backend/app/views/spree/admin/stock_transfers/new.html.erbindex c30f77f45a..18384e3e6a 100644--- a/backend/app/views/spree/admin/stock_transfers/new.html.erb+++ b/backend/app/views/spree/admin/stock_transfers/new.html.erb@@ -66,7 +66,7 @@<div class="form-group" id="stock_movement_variant_id_field"><%= label_tag 'variant_id', Spree.t(:variant) %><div class="input-group">- <%= select_tag 'transfer_variant', nil, class: 'd-block w-100', id: 'transfer_variant' %>+ <%= select_tag 'transfer_variant', nil, class: 'd-block w-100', id: 'transfer_variant' %></div></div></div>diff --git a/backend/app/views/spree/admin/stock_transfers/show.html.erb b/backend/app/views/spree/admin/stock_transfers/show.html.erbindex a57f808de9..529b5d67f8 100644--- a/backend/app/views/spree/admin/stock_transfers/show.html.erb+++ b/backend/app/views/spree/admin/stock_transfers/show.html.erb@@ -40,5 +40,4 @@<%= render partial: 'stock_movements', object: @stock_transfer.destination_movements %></fieldset><% end %>-</fieldset>diff --git a/backend/app/views/spree/admin/stores/_form.html.erb b/backend/app/views/spree/admin/stores/_form.html.erbindex c2d92ffc45..753c1e106c 100644--- a/backend/app/views/spree/admin/stores/_form.html.erb+++ b/backend/app/views/spree/admin/stores/_form.html.erb@@ -14,7 +14,7 @@<%= image_tag main_app.url_for(@store.logo) %><% end %><%= f.field_container :logo, class: ['form-group'] do %>- <%= f.label :logo, Spree.t(:logo) %><br />+ <%= f.label :logo, Spree.t(:logo) %><br><%= f.file_field :logo %><%= f.error_message_on :logo %><% end %>@@ -24,7 +24,7 @@<%= image_tag main_app.url_for(@store.mailer_logo.variant(resize: '244x104>')) %><% end %><%= f.field_container :mailer_logo, class: ['form-group'] do %>- <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br />+ <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br><%= f.file_field :mailer_logo, accept: 'image/png, image/jpeg' %><%= f.error_message_on :mailer_logo %><% end %>@@ -43,7 +43,7 @@<%= f.error_message_on :code %><% end %><%= f.field_container :url, class: ['form-group'] do %>- <%= f.label :url, raw(Spree.t(:url) + required_span_tag) %>+ <%= f.label :url, raw(Spree.t(:url) + required_span_tag) %><div class="input-group mb-3"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon3">https://</span>@@ -68,12 +68,12 @@<%= f.error_message_on :seo_title %><% end %><%= f.field_container :meta_description, class: ['form-group'] do %>- <%= f.label :meta_description, Spree.t(:meta_description) %>+ <%= f.label :meta_description, Spree.t(:meta_description) %><%= f.text_area :meta_description, class: 'form-control' %><%= f.error_message_on :meta_description %><% end %><%= f.field_container :meta_keywords, class: ['form-group'] do %>- <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>+ <%= f.label :meta_keywords, Spree.t(:meta_keywords) %><%= f.text_field :meta_keywords, class: 'form-control' %><%= f.error_message_on :meta_keywords %><% end %>@@ -182,7 +182,7 @@</div><%= f.field_container :facebook, class: ['form-group'] do %>- <%= f.label :facebook, Spree.t(:facebook) %>+ <%= f.label :facebook, Spree.t(:facebook) %><div class="input-group mb-3"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon3">https://facebook.com</span>@@ -192,7 +192,7 @@<%= f.error_message_on :facebook %><% end %><%= f.field_container :twitter, class: ['form-group'] do %>- <%= f.label :twitter, Spree.t(:twitter) %>+ <%= f.label :twitter, Spree.t(:twitter) %><div class="input-group mb-3"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon3">https://twitter.com</span>@@ -202,7 +202,7 @@<%= f.error_message_on :twitter %><% end %><%= f.field_container :instagram, class: ['form-group'] do %>- <%= f.label :instagram, Spree.t(:instagram) %>+ <%= f.label :instagram, Spree.t(:instagram) %><div class="input-group mb-3"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon3">https://instagram.com</span>@@ -226,17 +226,17 @@</div><%= f.field_container :description, class: ['form-group'] do %>- <%= f.label :description, Spree.t(:description) %>+ <%= f.label :description, Spree.t(:description) %><%= f.text_area :description, class: 'form-control' %><%= f.error_message_on :description %><% end %><%= f.field_container :address, class: ['form-group'] do %>- <%= f.label :address, Spree.t(:address) %>+ <%= f.label :address, Spree.t(:address) %><%= f.text_area :address, class: 'form-control' %><%= f.error_message_on :address %><% end %><%= f.field_container :contact_phone, class: ['form-group'] do %>- <%= f.label :contact_phone, Spree.t(:contact_phone) %>+ <%= f.label :contact_phone, Spree.t(:contact_phone) %><%= f.text_field :contact_phone, class: 'form-control' %><%= f.error_message_on :contact_phone %><% end %>diff --git a/backend/app/views/spree/admin/tax_categories/index.html.erb b/backend/app/views/spree/admin/tax_categories/index.html.erbindex 72772e2fce..fd6052d076 100644--- a/backend/app/views/spree/admin/tax_categories/index.html.erb+++ b/backend/app/views/spree/admin/tax_categories/index.html.erb@@ -21,8 +21,8 @@<tbody><% @tax_categories.each do |tax_category|@edit_url = edit_admin_tax_category_path(tax_category)- @delete_url = admin_tax_category_path(tax_category)- %>+ @delete_url = admin_tax_category_path(tax_category) %>+<tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row"><td><%= tax_category.name %></td><td><%= tax_category.tax_code %></td>diff --git a/backend/app/views/spree/admin/tax_rates/index.html.erb b/backend/app/views/spree/admin/tax_rates/index.html.erbindex 0b8d7a5a1d..b2f0b6a056 100644--- a/backend/app/views/spree/admin/tax_rates/index.html.erb+++ b/backend/app/views/spree/admin/tax_rates/index.html.erb@@ -22,15 +22,15 @@</tr></thead><tbody>- <% @tax_rates.each do |tax_rate|%>+ <% @tax_rates.each do |tax_rate| %><tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">- <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>- <td><%=tax_rate.name %></td>- <td><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>- <td><%=tax_rate.amount %></td>+ <td><%= tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>+ <td><%= tax_rate.name %></td>+ <td><%= tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>+ <td><%= tax_rate.amount %></td><td><%= active_badge(tax_rate.included_in_price?) %></td><td><%= active_badge(tax_rate.show_rate_in_label?) %></td>- <td><%=tax_rate.calculator.to_s %></td>+ <td><%= tax_rate.calculator.to_s %></td><td class="actions actions-2 text-right"><%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %><%= link_to_delete(tax_rate, no_text: true) if can? :delete, tax_rate %>diff --git a/backend/app/views/spree/admin/taxonomies/_js_head.html.erb b/backend/app/views/spree/admin/taxonomies/_js_head.html.erbindex aa10791a2f..0f54ad9cf9 100644--- a/backend/app/views/spree/admin/taxonomies/_js_head.html.erb+++ b/backend/app/views/spree/admin/taxonomies/_js_head.html.erb@@ -3,6 +3,5 @@$(document).ready(function(){setup_taxonomy_tree(taxonomy_id);});- "- %>+ " %><% end %>diff --git a/backend/app/views/spree/admin/taxonomies/_list.html.erb b/backend/app/views/spree/admin/taxonomies/_list.html.erbindex 3506eca1c1..309670fbd1 100644--- a/backend/app/views/spree/admin/taxonomies/_list.html.erb+++ b/backend/app/views/spree/admin/taxonomies/_list.html.erb@@ -9,7 +9,7 @@</thead><tbody id="sortVert"><% @taxonomies.each do |taxonomy| %>- <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" >+ <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row"><td class="move-handle"><%= svg_icon name: "sort.svg", width: '18', height: '18' %></td>diff --git a/backend/app/views/spree/admin/taxons/_form.html.erb b/backend/app/views/spree/admin/taxons/_form.html.erbindex acb51f21ab..58571a1b1d 100644--- a/backend/app/views/spree/admin/taxons/_form.html.erb+++ b/backend/app/views/spree/admin/taxons/_form.html.erb@@ -33,8 +33,7 @@<% if @taxon.icon.present? %><%= link_to Spree.t(:remove_image),remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id),- method: :delete- %>+ method: :delete %><% end %><% end %>diff --git a/backend/app/views/spree/admin/taxons/_taxon_table.html.erb b/backend/app/views/spree/admin/taxons/_taxon_table.html.erbindex ede7a1088a..c6b38ceacb 100644--- a/backend/app/views/spree/admin/taxons/_taxon_table.html.erb+++ b/backend/app/views/spree/admin/taxons/_taxon_table.html.erb@@ -8,12 +8,12 @@</tr></thead><tbody>- <% taxons.each do |taxon| %>+ <% taxons.each do |taxonp| %><tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row"><td><%= taxon.name %></td><td><%= taxon_path taxon %></td><td class="actions">- <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete.svg) + ' ' + Spree.t(:remove) %>+ <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: Spree.t(:remove) %></td></tr><% end %>diff --git a/backend/app/views/spree/admin/users/_form.html.erb b/backend/app/views/spree/admin/users/_form.html.erbindex 6f9b17a9f6..392d041c4a 100644--- a/backend/app/views/spree/admin/users/_form.html.erb+++ b/backend/app/views/spree/admin/users/_form.html.erb@@ -17,7 +17,6 @@</div><% end %></div>-</div><div data-hook="admin_user_form_password_fields" class="col-12 col-md-6">diff --git a/backend/app/views/spree/admin/users/edit.html.erb b/backend/app/views/spree/admin/users/edit.html.erbindex acc21957dc..186ae4ef95 100644--- a/backend/app/views/spree/admin/users/edit.html.erb+++ b/backend/app/views/spree/admin/users/edit.html.erb@@ -49,7 +49,7 @@<%= button Spree.t('clear_key', scope: 'api'), 'delete.svg', 'submit', class: "btn-danger" %><% end %>- <span class="or"><%= Spree.t(:or)%></span>+ <span class="or"><%= Spree.t(:or) %></span><%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %><%= button Spree.t('regenerate_key', scope: 'api'), 'recycle.svg' %>diff --git a/backend/app/views/spree/admin/users/index.html.erb b/backend/app/views/spree/admin/users/index.html.erbindex 6ebd9f13b0..ef37c2bb35 100644--- a/backend/app/views/spree/admin/users/index.html.erb+++ b/backend/app/views/spree/admin/users/index.html.erb@@ -56,9 +56,9 @@</tr></thead><tbody>- <% @users.each do |user|%>+ <% @users.each do |user| %><tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">- <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>+ <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td><td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right"><%= link_to_edit user, no_text: true if can?(:edit, user) %><%= link_to_delete user, no_text: true if can?(:delete, user) %>diff --git a/backend/app/views/spree/admin/users/items.html.erb b/backend/app/views/spree/admin/users/items.html.erbindex d1eb698f4d..678c9e1040 100644--- a/backend/app/views/spree/admin/users/items.html.erb+++ b/backend/app/views/spree/admin/users/items.html.erb@@ -31,7 +31,7 @@</td><td class="item-name"><%= item.name %>- <br />+ <br><%= "(#{item.options_text})" if item.options_text.present? %><% if item.sku.present? %><strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>diff --git a/backend/app/views/spree/admin/variants/_form.html.erb b/backend/app/views/spree/admin/variants/_form.html.erbindex 298be4dd18..8040abb5bd 100644--- a/backend/app/views/spree/admin/variants/_form.html.erb+++ b/backend/app/views/spree/admin/variants/_form.html.erb@@ -42,7 +42,7 @@<div class="form-group" data-hook="discontinue_on"><%= f.label :discontinue_on, Spree.t(:discontinue_on) %><%= f.error_message_on :discontinue_on %>- <div class="input-group datepicker" data-wrap="true" >+ <div class="input-group datepicker" data-wrap="true"><%= f.text_field :discontinue_on,value: datepicker_field_value(@variant.discontinue_on),placeholder: Spree.t(:select_a_date),diff --git a/backend/app/views/spree/admin/zones/_country_members.html.erb b/backend/app/views/spree/admin/zones/_country_members.html.erbindex 2cac5a1b4e..90410d736b 100644--- a/backend/app/views/spree/admin/zones/_country_members.html.erb+++ b/backend/app/views/spree/admin/zones/_country_members.html.erb@@ -12,5 +12,5 @@<%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { multiple: true, class: "select2" } %><% end %></div>- </div>+ </div></div>diff --git a/backend/app/views/spree/admin/zones/_form.html.erb b/backend/app/views/spree/admin/zones/_form.html.erbindex 53a1b53e1b..ade55836bd 100644--- a/backend/app/views/spree/admin/zones/_form.html.erb+++ b/backend/app/views/spree/admin/zones/_form.html.erb@@ -2,7 +2,7 @@<div class="col-12 col-lg-6" data-hook="admin_zone_form_fields"><div class="card mb-3"><div class="card-header">- <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings)%></h1>+ <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings) %></h1></div><div class="card-body">@@ -43,7 +43,7 @@</div></div><div class="col-12 col-lg-6">- <%= render partial: 'state_members', locals: { zone_form: zone_form }%>+ <%= render partial: 'state_members', locals: { zone_form: zone_form } %><%= render partial: 'country_members', locals: { zone_form: zone_form } %></div></div>diff --git a/backend/app/views/spree/admin/zones/new.html.erb b/backend/app/views/spree/admin/zones/new.html.erbindex c09e5156d5..dc648f1672 100644--- a/backend/app/views/spree/admin/zones/new.html.erb+++ b/backend/app/views/spree/admin/zones/new.html.erb@@ -6,6 +6,6 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %><%= form_for [:admin, @zone] do |zone_form| %>- <%= render partial: 'form', locals: { zone_form: zone_form } %>+ <%= render partial: 'form', locals: { zone_form: zone_form } %><%= render partial: 'spree/admin/shared/new_resource_links' %><% end %>diff --git a/backend/app/views/spree/layouts/admin.html.erb b/backend/app/views/spree/layouts/admin.html.erbindex 49be9d69c8..dfe927e108 100644--- a/backend/app/views/spree/layouts/admin.html.erb+++ b/backend/app/views/spree/layouts/admin.html.erb@@ -57,8 +57,8 @@<%#-------------------------------------------------%><%# Main content %><%#-------------------------------------------------%>- <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12' %>" id="content" data-hook>- <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>+ <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12' %>" id="content" data-hook>+ <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter) %><%= yield %></div>@@ -87,6 +87,5 @@<%# Alerts %><%#-------------------------------------------------%><%= flash_alert(flash) %>-</body></html>