spree_backend 4.3.0 → 4.4.0.rc1

data/app/views/spree/admin/oauth_applications/index.html.erb

@@ -0,0 +1,51 @@
+<% content_for :page_title do %>
+  <%= Spree.t('admin.oauth_applications.list') %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
+<% end if can? :create, Spree::OauthApplication %>
+
+<% if @oauth_applications.any? %>
+  <div class="table-responsive mt-4">
+    <table class="table">
+      <thead>
+        <tr data-hook="admin_roles_index_headers">
+          <th><%= Spree.t(:name) %></th>
+          <th><%= Spree.t('admin.oauth_applications.uid') %></th>
+          <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @oauth_applications.each do |application| %>
+          <tr id="<%= spree_dom_id application %>" data-hook="admin_roles_index_rows">
+            <td><%= application.name %></td>
+            <td>
+              <div class="input-group" data-controller="password-toggle">
+                <%= password_field_tag :password, application.uid, class: 'form-control unhide text-muted border-0 bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
+                <div class="input-group-append">
+                  <%= button_tag class: 'btn btn-link', data: { action: 'click->password-toggle#password' } do %>
+                    <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+                  <% end %>
+                </div>
+              </div>
+            </td>
+            <td><%= application.scopes %></td>
+            <td class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit(application, no_text: true) if can? :edit, application %>
+                <%= link_to_delete(application, no_text: true) if can? :destroy, application %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% else %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::OauthApplication)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::OauthApplication %>!
+  </div>
+<% end %>

data/app/views/spree/admin/oauth_applications/new.html.erb

@@ -0,0 +1,15 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.oauth_applications.list'), spree.admin_oauth_applications_url %> /
+  <%= Spree.t('admin.oauth_applications.new') %>
+<% end %>
+
+<%= 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| %>
+    <fieldset>
+      <%= render partial: 'form', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
+    </fieldset>
+  <% end %>
+<% end %>

data/app/views/spree/admin/option_types/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_option_type_form_fields" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: "form-control" %>
       <%= f.error_message_on :name %>
@@ -8,7 +8,7 @@
   </div>
 
   <div class="col-12 col-md-6">
-    <%= f.field_container :presentation, class: ['form-group'] do %>
+    <%= f.field_container :presentation do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
       <%= f.text_field :presentation, class: "form-control" %>
       <%= f.error_message_on :presentation %>
@@ -16,7 +16,7 @@
   </div>
 
   <div class="col-12 col-md-6">
-    <%= f.field_container :filterable, class: ['form-group'] do %>
+    <%= f.field_container :filterable do %>
       <%= label_tag :option_type_filterable do %>
         <%= f.check_box :filterable %>
         <%= Spree.t(:filterable) %>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -3,8 +3,8 @@
     <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
-  <td class="name"><%= f.text_field :name, class: "form-control" %></td>
-  <td class="presentation"><%= f.text_field :presentation, class: "form-control" %></td>
+  <td class="name"><%= f.text_field :name, class: "form-control", required: true %></td>
+  <td class="presentation"><%= f.text_field :presentation, class: "form-control", required: true %></td>
   <td class="actions">
     <span class="d-flex justify-content-end">
       <%= link_to_icon_remove_fields f %>

data/app/views/spree/admin/orders/_channel_form.html.erb

@@ -2,7 +2,7 @@
   <%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
     <fieldset>
     <div data-hook="admin_order_channel_field">
-      <%= f.field_container :channel, class: %w[form-group] do %>
+      <%= f.field_container :channel do %>
         <%= f.label :channel, Spree.t(:channel) %>
         <%= f.text_field :channel, name: 'channel', class: 'form-control' %>
         <%= f.error_message_on :channel %>

data/app/views/spree/admin/orders/_form.html.erb

@@ -33,6 +33,7 @@
 
   <script>
     var order_number = '<%= @order.number %>';
+    var order_id = '<%= @order.id %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -25,6 +25,7 @@
 
   <script>
     var order_number = '<%= @order.number %>';
+    var order_id = '<%= @order.id %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>

data/app/views/spree/admin/orders/_order_actions.html.erb

@@ -8,4 +8,10 @@
           method: :post,
           icon: 'envelope.svg' %>
   <% end %>
+
+  <% if (can? :update, @order) && @order.some_digital? %>
+    <%= button_link_to Spree.t('admin.digitals.reset_download_links'),
+        reset_digitals_admin_order_url(@order),
+        icon: 'hdd.svg' %>
+  <% end %>
 <% end %>

data/app/views/spree/admin/orders/_search.html.erb

@@ -0,0 +1,151 @@
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+
+    <%= search_form_for [:admin, @search] do |f| %>
+    <div class="row">
+
+      <div class="date-range-filter col-12 col-lg-8">
+        <div class="form-group">
+          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+          <div class="row pb-0">
+            <div class="col-12 col-md-6 mb-3 mb-md-0">
+              <div class="input-group datePickerFrom"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-max-date="<%= params[:q][:created_at_lt] %>">
+                <%= f.text_field :created_at_gt,
+                  class: 'form-control js-filterable shadow-none',
+                    value: params[:q][:created_at_gt],
+                    placeholder: Spree.t(:starting_from),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+              </div>
+            </div>
+            <div class="col-12 col-md-6 mt-3 mt-md-0">
+              <div class="input-group datePickerTo"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-min-date="<%= params[:q][:created_at_gt] %>">
+
+                <%= f.text_field :created_at_lt,
+                  class: 'form-control js-filterable shadow-none',
+                    value: params[:q][:created_at_lt],
+                    placeholder: Spree.t(:ending_at),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+                </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
+          <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_state_eq, Spree.t(:status) %>
+          <%= f.select :state_eq,
+            Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
+            { include_blank: true },
+            class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
+          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+          <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+          <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_email_cont, Spree.t(:email) %>
+          <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+          <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_channel_eq, Spree.t(:channel) %>
+          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12">
+        <%= f.field_container :completed_at_not_null do %>
+          <div class="custom-control custom-checkbox">
+            <%= f.check_box :completed_at_not_null, {checked: @show_only_completed, class: 'custom-control-input'}, '1', '0' %>
+            <%= f.label :completed_at_not_null, Spree.t(:show_only_complete_orders), class: 'custom-control-label' %>
+          </div>
+        <% end %>
+
+        <%= f.field_container :considered_risky_eq do %>
+          <div class="custom-control custom-checkbox">
+            <%= f.check_box :considered_risky_eq, {checked: params[:q][:considered_risky_eq] == '1', class: 'custom-control-input'}, '1', '' %>
+            <%= f.label :considered_risky_eq, Spree.t(:show_only_considered_risky), class: 'custom-control-label' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <div data-hook="admin_orders_index_search_buttons" class="form-actions">
+      <%= button Spree.t(:filter_results), 'search.svg' %>
+    </div>
+
+    <% end %>
+
+  </div>
+
+<% end %>

data/app/views/spree/admin/orders/index.html.erb

@@ -10,159 +10,10 @@
       id: 'admin_new_order' %>
 <% end if can? :create, Spree::Order %>
 
-<% content_for :table_filter do %>
-  <div data-hook="admin_orders_index_search">
-
-    <%= search_form_for [:admin, @search] do |f| %>
-    <div class="row">
-
-      <div class="date-range-filter col-12 col-lg-8">
-        <div class="form-group">
-          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-          <div class="row pb-0">
-            <div class="col-12 col-md-6 mb-3 mb-md-0">
-              <div class="input-group datePickerFrom"
-                   data-wrap="true"
-                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-                   data-max-date="<%= params[:q][:created_at_lt] %>">
-                <%= f.text_field :created_at_gt,
-                  class: 'form-control js-filterable shadow-none',
-                    value: params[:q][:created_at_gt],
-                    placeholder: Spree.t(:starting_from),
-                    'data-input':'' %>
-                <%= render partial: 'spree/admin/shared/cal_close' %>
-              </div>
-            </div>
-            <div class="col-12 col-md-6 mt-3 mt-md-0">
-              <div class="input-group datePickerTo"
-                   data-wrap="true"
-                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-                   data-min-date="<%= params[:q][:created_at_gt] %>">
-
-                <%= f.text_field :created_at_lt,
-                  class: 'form-control js-filterable shadow-none',
-                    value: params[:q][:created_at_lt],
-                    placeholder: Spree.t(:ending_at),
-                    'data-input':'' %>
-                <%= render partial: 'spree/admin/shared/cal_close' %>
-                </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
-          <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_state_eq, Spree.t(:status) %>
-          <%= f.select :state_eq,
-            Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
-            { include_blank: true },
-            class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-          <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-          <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_email_cont, Spree.t(:email) %>
-          <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
-          <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_channel_eq, Spree.t(:channel) %>
-          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12">
-        <%= f.field_container :completed_at_not_null do %>
-          <div class="custom-control custom-checkbox">
-            <%= f.check_box :completed_at_not_null, {checked: @show_only_completed, class: 'custom-control-input'}, '1', '0' %>
-            <%= f.label :completed_at_not_null, Spree.t(:show_only_complete_orders), class: 'custom-control-label' %>
-          </div>
-        <% end %>
-
-        <%= f.field_container :considered_risky_eq do %>
-          <div class="custom-control custom-checkbox">
-            <%= f.check_box :considered_risky_eq, {checked: params[:q][:considered_risky_eq] == '1', class: 'custom-control-input'}, '1', '' %>
-            <%= f.label :considered_risky_eq, Spree.t(:show_only_considered_risky), class: 'custom-control-label' %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-
-    <div data-hook="admin_orders_index_search_buttons" class="form-actions">
-      <%= button Spree.t(:filter_results), 'search.svg' %>
-    </div>
-
-    <% end %>
-
-  </div>
-
-<% end %>
+<%= render "search" if @orders.any? || params[:q].present? %>
 
 <% if @orders.any? %>
+
 <div data-nav-x-wrapper>
   <div data-nav-x-container>
     <table class="table" id="listing_orders" data-hook data-nav-x-content>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -13,13 +13,13 @@
             <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
           </div>
           <hr class="my-4">
-          <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
+          <%= field_container :payment_method, :name, 'data-hook' => 'name' do %>
             <%= label_tag :payment_method_name, Spree.t(:name) %>
             <%= text_field :payment_method, :name, class: 'form-control' %>
             <%= error_message_on :payment_method, :name %>
           <% end %>
 
-          <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
+          <%= field_container :payment_method, :description, 'data-hook' => 'description' do %>
             <%= label_tag :payment_method_description, Spree.t(:description) %>
             <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
           <% end %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -13,7 +13,7 @@
     </thead>
     <tbody>
       <% payments.each do |payment| %>
-        <tr id="<%= dom_id(payment) %>" data-hook="payments_row" data-number="<%= payment.number %>">
+        <tr id="<%= dom_id(payment) %>" data-hook="payments_row" data-number="<%= payment.number %>" data-id="<%= payment.id %>">
           <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
           <td><%= pretty_time(payment.created_at) %></td>
           <td class="amount text-center"><%= payment.display_amount %></td>

data/app/views/spree/admin/products/_form.html.erb

@@ -3,7 +3,7 @@
 
     <div class="col-12 col-md-8" data-hook="admin_product_form_left">
       <div data-hook="admin_product_form_name">
-        <%= f.field_container :name, class: ['form-group'] do %>
+        <%= f.field_container :name do %>
           <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
           <%= f.text_field :name, class: 'form-control title' %>
           <%= f.error_message_on :name %>
@@ -11,7 +11,7 @@
       </div>
 
       <div data-hook="admin_product_form_slug">
-        <%= f.field_container :slug, class: ['form-group'] do %>
+        <%= f.field_container :slug do %>
           <%= f.label :slug, raw(Spree.t(:slug) + required_span_tag) %>
           <%= f.text_field :slug, class: 'form-control title' %>
           <%= f.error_message_on :slug %>
@@ -19,7 +19,7 @@
       </div>
 
       <div data-hook="admin_product_form_description">
-        <%= f.field_container :description, class: ['form-group'] do %>
+        <%= f.field_container :description do %>
           <%= f.label :description, Spree.t(:description) %>
           <%= f.text_area :description, { rows: "#{unless @product.has_variants? then '29' else '30' end}", class: "form-control #{"spree-rte" if product_wysiwyg_editor_enabled? }" } %>
           <%= f.error_message_on :description %>
@@ -29,7 +29,7 @@
 
     <div class="col-12 col-md-4" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
-        <%= f.field_container :price, class: ['form-group'] do %>
+        <%= f.field_container :price do %>
           <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
           <div class="input-group">
             <div class="input-group-prepend">
@@ -42,7 +42,7 @@
       </div>
 
       <div>
-        <%= f.field_container :compare_at_price, class: ['form-group'] do %>
+        <%= f.field_container :compare_at_price do %>
           <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
           <div class="input-group">
             <div class="input-group-prepend">
@@ -55,14 +55,14 @@
       </div>
 
       <div data-hook="admin_product_form_cost_price" class="alpha two columns">
-        <%= f.field_container :cost_price, class: ['form-group'] do %>
+        <%= f.field_container :cost_price do %>
           <%= f.label :cost_price, Spree.t(:cost_price) %>
           <%= f.text_field :cost_price, value: number_to_currency(@product.cost_price, unit: ''), class: 'form-control' %>
           <%= f.error_message_on :cost_price %>
         <% end %>
       </div>
       <div data-hook="admin_product_form_cost_currency" class="omega two columns">
-        <%= f.field_container :cost_currency, class: ['form-group'] do %>
+        <%= f.field_container :cost_currency do %>
           <%= f.label :cost_currency, Spree.t(:cost_currency) %>
           <%= f.select :cost_currency, currency_options(@product.cost_currency), {}, { class: 'select2' } %>
           <%= f.error_message_on :cost_currency %>
@@ -70,7 +70,7 @@
       </div>
 
       <div data-hook="admin_product_form_available_on">
-        <%= f.field_container :available_on, class: ['form-group'] do %>
+        <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
@@ -91,7 +91,7 @@
       </div>
 
       <div data-hook="admin_product_form_discontinue_on">
-        <%= f.field_container :discontinue_on, class: ['form-group'] do %>
+        <%= f.field_container :discontinue_on do %>
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
 
@@ -112,7 +112,7 @@
       </div>
 
       <div data-hook="admin_product_form_promotionable">
-        <%= f.field_container :promotionable, class: ['form-group'] do %>
+        <%= f.field_container :promotionable do %>
           <%= f.check_box :promotionable %>
           <%= f.label :promotionable, Spree.t(:promotionable) %>
           <%= f.error_message_on :promotionable %>
@@ -120,7 +120,7 @@
       </div>
 
       <div data-hook="admin_product_form_sku">
-        <%= f.field_container :master_sku, class: ['form-group'] do %>
+        <%= f.field_container :master_sku do %>
           <%= f.label :master_sku, Spree.t(:master_sku) %>
           <%= f.text_field :sku, size: 16, class: 'form-control' %>
         <% end %>
@@ -181,7 +181,7 @@
       <% end %>
 
       <div data-hook="admin_product_form_shipping_categories">
-        <%= f.field_container :shipping_category, class: ['form-group'] do %>
+        <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :shipping_category %>
@@ -189,7 +189,7 @@
       </div>
 
       <div data-hook="admin_product_form_tax_category">
-        <%= f.field_container :tax_category, class: ['form-group'] do %>
+        <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
           <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :tax_category %>
@@ -200,7 +200,7 @@
   </div>
 
   <div data-hook="admin_product_form_taxons">
-    <%= f.field_container :taxons, class: ['form-group'] do %>
+    <%= f.field_container :taxons do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
@@ -224,7 +224,7 @@
   </div>
 
   <div data-hook="admin_product_form_option_types">
-    <%= f.field_container :option_types, class: ['form-group'] do %>
+    <%= f.field_container :option_types do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
@@ -250,7 +250,7 @@
 
   <% if @stores.count > 1 %>
     <div data-hook="admin_product_form_stores">
-      <%= f.field_container :stores, class: ['form-group'] do %>
+      <%= f.field_container :stores do %>
         <%= f.label :product_stores, Spree.t(:stores) %>
         <%= collection_select(:product, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
       <% end %>
@@ -259,21 +259,21 @@
 
   <div data-hook="admin_product_form_meta">
     <div data-hook="admin_product_form_meta_title">
-      <%= f.field_container :meta_title, class: ['form-group'] do %>
+      <%= f.field_container :meta_title do %>
         <%= f.label :meta_title, Spree.t(:meta_title) %>
         <%= f.text_field :meta_title, class: 'form-control' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_keywords">
-      <%= f.field_container :meta_keywords, class: ['form-group'] do %>
+      <%= f.field_container :meta_keywords do %>
         <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
         <%= f.text_field :meta_keywords, class: 'form-control' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_description">
-      <%= f.field_container :meta_description, class: ['form-group'] do %>
+      <%= f.field_container :meta_description do %>
         <%= f.label :meta_description, Spree.t(:meta_description) %>
         <%= f.text_area :meta_description, class: 'form-control' %>
       <% end %>