spree_backend 4.3.3 → 4.4.0.rc1

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_state_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) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :abbr, class: ['form-group'] do %>
+    <%= f.field_container :abbr do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
       <%= f.text_field :abbr, class: 'form-control' %>
     <% end %>

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

@@ -2,14 +2,14 @@
   <div class="row">
     <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.field_container :name  do %>
           <%= 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 %>
       </div>
       <div data-hook="stock_location_admin_name">
-        <%= f.field_container :admin_name, class: ['form-group']  do %>
+        <%= f.field_container :admin_name  do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <% end %>

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

@@ -1,11 +1,11 @@
 <div data-hook="admin_stock_movements_form_fields">
-  <%= f.field_container :quantity, class: ['form-group'] do %>
+  <%= f.field_container :quantity do %>
     <%= f.label :quantity, Spree.t(:quantity) %>
     <%= f.text_field :quantity, class: 'form-control' %>
   <% end %>
-  <%= f.field_container :stock_item_id, class: ['form-group'] do %>
+  <%= f.field_container :stock_item_id do %>
     <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-    <%= select_tag 'stock_movement[stock_item_id]', nil , class: 'variant_autocomplete d-block w-100', :'data-stock-location-id' => params[:stock_location_id] %>
+    <%= select_tag 'stock_movement[stock_item_id]', nil , id: 'stock_movement_stock_item_id', class: 'd-block w-100', :'data-stock-location-id' => params[:stock_location_id] %>
   <% end %>
 </div>
 

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_store_credit_category_form_fields">
-  <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'store_credit_category_name' do %>
+  <%= f.field_container :name, 'data-hook' => 'store_credit_category_name' do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>

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

@@ -1,21 +1,21 @@
 <div data-hook='admin_store_credit_form_fields'>
-  <%= f.field_container :amount, class: %w[form-group] do %>
+  <%= f.field_container :amount do %>
     <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
     <%= f.text_field :amount, class: 'form-control' %>
     <%= f.error_message_on :amount %>
   <% end %>
-  <%= f.field_container :currency, class: %w[form-group] do %>
+  <%= f.field_container :currency do %>
     <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag) %>
     <%= f.select :currency, currency_options(f.object.currency) %>
     <%= f.error_message_on :currency %>
   <% end %>
-  <%= f.field_container :category, class: %w[form-group] do %>
+  <%= f.field_container :category do %>
     <%= f.label :category, raw(Spree.t(:category) + required_span_tag) %>
     <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
         { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t(:select_a_store_credit_reason) } %>
     <%= f.error_message_on :category %>
   <% end %>
-  <%= f.field_container :memo, class: %w[form-group] do %>
+  <%= f.field_container :memo do %>
     <%= f.label :memo, Spree.t(:memo) %>
     <%= f.text_area :memo, class: 'form-control' %>
     <%= f.error_message_on :memo %>

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

@@ -1,259 +1,312 @@
 <div data-hook="admin_store_form_fields">
-
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:basic_information) %>
-    </h1>
-  </div>
-  <div class="card-body">
-    <%= f.field_container :logo, class: ['form-group'] do %>
-      <% if @store.logo.attached? && @store.logo.variable? %>
-        <%= image_tag main_app.url_for(@store.logo.variant(resize: '244x104>')) %>
-      <% elsif @store.logo.attached? && @store.logo.image? %>
-        <%= 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.file_field :logo %>
-        <%= f.error_message_on :logo %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:basic_information) %>
+      </h1>
+    </div>
+    <div class="card-body">
+      <%= f.field_container :logo do %>
+        <% if @store.logo.attached? && @store.logo.variable? %>
+          <%= image_tag main_app.url_for(@store.logo.variant(resize: '244x104>')) %>
+        <% elsif @store.logo.attached? && @store.logo.image? %>
+          <%= image_tag main_app.url_for(@store.logo) %>
+        <% end %>
+        <%= f.field_container :logo do %>
+          <%= f.label :logo, Spree.t(:logo) %><br>
+          <%= f.file_field :logo %>
+          <%= f.error_message_on :logo %>
+        <% end %>
       <% end %>
-    <% end %>
-    <%= f.field_container :mailer_logo, class: ['form-group'] do %>
-      <% if @store.mailer_logo.attached? && @store.mailer_logo.variable? %>
-        <%= image_tag main_app.url_for(@store.mailer_logo.variant(resize: '244x104>')) %>
+      <%= f.field_container :mailer_logo do %>
+        <% if @store.mailer_logo.attached? && @store.mailer_logo.variable? %>
+          <%= image_tag main_app.url_for(@store.mailer_logo.variant(resize: '244x104>')) %>
+        <% end %>
+        <%= f.field_container :mailer_logo do %>
+          <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br>
+          <%= f.file_field :mailer_logo, accept: Spree::Store::MAILER_LOGO_CONTENT_TYPES.join(',') %>
+          <%= f.error_message_on :mailer_logo %>
+        <% end %>
       <% end %>
-      <%= f.field_container :mailer_logo, class: ['form-group'] do %>
-        <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br>
-        <%= f.file_field :mailer_logo, accept: Spree::Store::MAILER_LOGO_CONTENT_TYPES.join(',') %>
-        <%= f.error_message_on :mailer_logo %>
+      <%= f.field_container :favicon_image do %>
+        <% if @store.favicon_image.attached? && @store.favicon_image.variable? %>
+          <%= image_tag main_app.url_for(@store.favicon_image.variant(resize: '104x104')) %>
+        <% end %>
+        <%= f.field_container :favicon_image do %>
+          <%= f.label :favicon_image, "#{Spree.t(:favicon)} (#{Spree.t(:favicon_upload_info)})" %><br>
+          <%= f.file_field :favicon_image, accept: Spree::Store::FAVICON_CONTENT_TYPES.join(',') %>
+          <%= f.error_message_on :favicon_image %>
+        <% end %>
       <% end %>
-    <% end %>
-    <%= f.field_container :favicon_image, class: ['form-group'] do %>
-      <% if @store.favicon_image.attached? && @store.favicon_image.variable? %>
-        <%= image_tag main_app.url_for(@store.favicon_image.variant(resize: '104x104')) %>
+      <%= f.field_container :name do %>
+        <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+        <%= f.text_field :name, class: 'form-control', required: true %>
+        <%= f.error_message_on :name %>
       <% end %>
-      <%= f.field_container :favicon_image, class: ['form-group'] do %>
-        <%= f.label :favicon_image, "#{Spree.t(:favicon)} (#{Spree.t(:favicon_upload_info)})" %><br>
-        <%= f.file_field :favicon_image, accept: Spree::Store::FAVICON_CONTENT_TYPES.join(',') %>
-        <%= f.error_message_on :favicon_image %>
+      <%= f.field_container :code do %>
+        <%= f.label :code, raw(Spree.t(:code) + required_span_tag) %>
+        <%= f.text_field :code, class: 'form-control', required: true %>
+        <small class="form-text text-muted">
+          <%= Spree.t('store_form.code_help') %>
+        </small>
+        <%= f.error_message_on :code %>
       <% end %>
-    <% end %>
-    <%= f.field_container :name, class: ['form-group'] do %>
-      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-      <%= f.text_field :name, class: 'form-control', required: true %>
-      <%= f.error_message_on :name %>
-    <% end %>
-    <%= f.field_container :code, class: ['form-group'] do %>
-      <%= f.label :code, raw(Spree.t(:code) + required_span_tag) %>
-      <%= f.text_field :code, class: 'form-control', required: true %>
-      <small class="form-text text-muted">
-        <%= Spree.t('store_form.code_help') %>
-      </small>
-      <%= f.error_message_on :code %>
-    <% end %>
-    <%= f.field_container :url, class: ['form-group'] do %>
-      <%= 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>
+      <%= f.field_container :url do %>
+        <%= 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>
+          </div>
+          <%= f.text_field :url, class: 'form-control', required: true %>
         </div>
-        <%= f.text_field :url, class: 'form-control', required: true %>
-      </div>
-      <%= f.error_message_on :url %>
-    <% end %>
+        <%= f.error_message_on :url %>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:seo) %>
-    </h1>
-  </div>
-  <div class="card-body">
-    <%= f.field_container :seo_title, class: ['form-group'] do %>
-      <%= f.label :seo_title, Spree.t(:seo_title) %>
-      <%= f.text_field :seo_title, class: 'form-control' %>
-      <%= 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.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.text_field :meta_keywords, class: 'form-control' %>
-      <%= f.error_message_on :meta_keywords %>
-    <% end %>
-    <%= f.field_container :seo_robots, class:['form-group']  do %>
-      <%= f.label :seo_robots, Spree.t(:seo_robots) %>
-      <%= f.text_field :seo_robots, class: 'form-control' %>
-      <%= f.error_message_on :seo_robots %>
-      <small class="form-text text-muted">
-        <%= raw(Spree.t('store_form.seo_robots')) %>
-      </small>
-    <% end %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:seo) %>
+      </h1>
+    </div>
+    <div class="card-body">
+      <%= f.field_container :seo_title do %>
+        <%= f.label :seo_title, Spree.t(:seo_title) %>
+        <%= f.text_field :seo_title, class: 'form-control' %>
+        <%= f.error_message_on :seo_title %>
+      <% end %>
+      <%= f.field_container :meta_description do %>
+        <%= 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 do %>
+        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+        <%= f.text_field :meta_keywords, class: 'form-control' %>
+        <%= f.error_message_on :meta_keywords %>
+      <% end %>
+      <%= f.field_container :seo_robots do %>
+        <%= f.label :seo_robots, Spree.t(:seo_robots) %>
+        <%= f.text_field :seo_robots, class: 'form-control' %>
+        <%= f.error_message_on :seo_robots %>
+        <small class="form-text text-muted">
+          <%= raw(Spree.t('store_form.seo_robots')) %>
+        </small>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:email).pluralize %>
-    </h1>
-  </div>
-  <div class="card-body">
-    <%= f.field_container :mail_from_address, class: ['form-group'] do %>
-      <%= f.label :mail_from_address, raw(Spree.t(:mail_from_address)  + required_span_tag) %>
-      <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
-      <%= f.error_message_on :mail_from_address %>
-      <small class="form-text text-muted">
-        <%= Spree.t('store_form.mail_from_address_help') %>
-      </small>
-    <% end %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:email).pluralize %>
+      </h1>
+    </div>
+    <div class="card-body">
+      <%= f.field_container :mail_from_address do %>
+        <%= f.label :mail_from_address, raw(Spree.t(:mail_from_address)  + required_span_tag) %>
+        <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
+        <%= f.error_message_on :mail_from_address %>
+        <small class="form-text text-muted">
+          <%= Spree.t('store_form.mail_from_address_help') %>
+        </small>
+      <% end %>
 
-    <%= f.field_container :customer_support_email, class: ['form-group'] do %>
-      <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
-      <%= f.text_field :customer_support_email, class: 'form-control' %>
-      <%= f.error_message_on :customer_support_email %>
-      <small class="form-text text-muted">
-        <%= Spree.t('store_form.customer_support_email_help') %>
-      </small>
-    <% end %>
+      <%= f.field_container :customer_support_email do %>
+        <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
+        <%= f.text_field :customer_support_email, class: 'form-control' %>
+        <%= f.error_message_on :customer_support_email %>
+        <small class="form-text text-muted">
+          <%= Spree.t('store_form.customer_support_email_help') %>
+        </small>
+      <% end %>
 
-    <%= f.field_container :new_order_notifications_email, class: ['form-group'] do %>
-      <%= f.label :new_order_notifications_email, Spree.t(:new_order_notifications_email) %>
-      <%= f.text_field :new_order_notifications_email, class: 'form-control' %>
-      <%= f.error_message_on :new_order_notifications_email %>
-      <small class="form-text text-muted">
-        <%= Spree.t('store_form.new_order_notifications_email_help') %>
-      </small>
-    <% end %>
+      <%= f.field_container :new_order_notifications_email do %>
+        <%= f.label :new_order_notifications_email, Spree.t(:new_order_notifications_email) %>
+        <%= f.text_field :new_order_notifications_email, class: 'form-control' %>
+        <%= f.error_message_on :new_order_notifications_email %>
+        <small class="form-text text-muted">
+          <%= Spree.t('store_form.new_order_notifications_email_help') %>
+        </small>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:internationalization) %>
-    </h1>
-  </div>
-  <div class="card-body">
-    <%= f.field_container :default_currency, class: ['form-group'] do %>
-      <%= f.label :default_currency %>
-      <%= f.select :default_currency, currency_options(@store.default_currency), {}, { class: 'select2' } %>
-      <%= f.error_message_on :default_currency %>
-    <% end %>
-    <%= f.field_container :supported_currencies, class: ['form-group'] do %>
-      <%= f.label :supported_currencies, Spree.t(:supported_currencies) %>
-      <%= f.select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false }, { multiple: true, class: 'select2' } %>
-      <%= f.error_message_on :supported_currencies %>
-    <% end %>
-    <%= f.field_container :checkout_zone_id, class: ['form-group'] do %>
-      <%= f.label :checkout_zone_id, Spree.t(:zone) %>
-      <%= f.select :checkout_zone_id, options_for_select(@zones, selected_checkout_zone(@store)&.id), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
-      <small class="form-text text-muted">
-        <%= raw(Spree.t('store_form.checkout_zone_help')) %>
-      </small>
-      <%= f.error_message_on :checkout_zone_id %>
-    <% end %>
-    <%= f.field_container :default_locale, class: ['form-group'] do %>
-      <%= f.label :default_locale %>
-      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { class: 'select2' } %>
-      <%= f.error_message_on :default_locale %>
-      <% unless defined?(SpreeI18n) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:internationalization) %>
+      </h1>
+    </div>
+    <div class="card-body">
+      <%= f.field_container :default_currency do %>
+        <%= f.label :default_currency %>
+        <%= f.select :default_currency, currency_options(@store.default_currency), {}, { class: 'select2' } %>
+        <%= f.error_message_on :default_currency %>
+      <% end %>
+      <%= f.field_container :supported_currencies do %>
+        <%= f.label :supported_currencies, Spree.t(:supported_currencies) %>
+        <%= f.select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false }, { multiple: true, class: 'select2' } %>
+        <%= f.error_message_on :supported_currencies %>
+      <% end %>
+      <%= f.field_container :checkout_zone_id do %>
+        <%= f.label :checkout_zone_id, Spree.t(:zone) %>
+        <%= f.select :checkout_zone_id, options_for_select(@zones, selected_checkout_zone(@store)&.id), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
         <small class="form-text text-muted">
-          <%= raw(Spree.t('store_form.locales_help')) %>
+          <%= raw(Spree.t('store_form.checkout_zone_help')) %>
         </small>
+        <%= f.error_message_on :checkout_zone_id %>
+      <% end %>
+      <%= f.field_container :default_locale do %>
+        <%= f.label :default_locale %>
+        <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { class: 'select2' } %>
+        <%= f.error_message_on :default_locale %>
+        <% unless defined?(SpreeI18n) %>
+          <small class="form-text text-muted">
+            <%= raw(Spree.t('store_form.locales_help')) %>
+          </small>
+        <% end %>
+      <% end %>
+      <%= f.field_container :supported_locales do %>
+        <%= f.label :supported_locales, Spree.t(:supported_locales) %>
+        <%= f.select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), {}, { multiple: true, class: 'select2' } %>
+        <%= f.error_message_on :supported_locales %>
       <% end %>
-    <% end %>
-    <%= f.field_container :supported_locales, class: ['form-group'] do %>
-      <%= f.label :supported_locales, Spree.t(:supported_locales) %>
-      <%= f.select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), {}, { multiple: true, class: 'select2' } %>
-      <%= f.error_message_on :supported_locales %>
-    <% end %>
-    <%= f.field_container :default_country_id, class: ['form-group'] do %>
-      <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
-      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
-      <%= f.error_message_on :default_country_id %>
-      <small class="form-text text-muted">
-        <%= Spree.t('store_form.default_country_help') %>
-      </small>
-    <% end %>
+      <%= f.field_container :default_country_id do %>
+        <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
+        <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
+        <%= f.error_message_on :default_country_id %>
+        <small class="form-text text-muted">
+          <%= Spree.t('store_form.default_country_help') %>
+        </small>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:social) %>
-    </h1>
-  </div>
-  <div class="card-body">
-    <div class="alert alert-warning col-12">
-      <%= Spree.t('store_form.social_help') %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:social) %>
+      </h1>
     </div>
+    <div class="card-body">
+      <div class="alert alert-warning col-12">
+        <%= Spree.t('store_form.social_help') %>
+      </div>
 
-    <%= f.field_container :facebook, class: ['form-group'] do %>
-      <%= 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>
+      <%= f.field_container :facebook do %>
+        <%= 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>
+          </div>
+          <%= f.text_field :facebook, class: 'form-control' %>
         </div>
-        <%= f.text_field :facebook, class: 'form-control' %>
-      </div>
-      <%= f.error_message_on :facebook %>
-    <% end %>
-    <%= f.field_container :twitter, class: ['form-group'] do %>
-      <%= 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>
+        <%= f.error_message_on :facebook %>
+      <% end %>
+      <%= f.field_container :twitter do %>
+        <%= 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>
+          </div>
+          <%= f.text_field :twitter, class: 'form-control' %>
         </div>
-        <%= f.text_field :twitter, class: 'form-control' %>
-      </div>
-      <%= f.error_message_on :twitter %>
-    <% end %>
-    <%= f.field_container :instagram, class: ['form-group'] do %>
-      <%= 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>
+        <%= f.error_message_on :twitter %>
+      <% end %>
+      <%= f.field_container :instagram do %>
+        <%= 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>
+          </div>
+          <%= f.text_field :instagram, class: 'form-control' %>
         </div>
-        <%= f.text_field :instagram, class: 'form-control' %>
-      </div>
-      <%= f.error_message_on :instagram %>
-    <% end %>
+        <%= f.error_message_on :instagram %>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:footer) %>
-    </h1>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t(:footer) %>
+      </h1>
+    </div>
+    <div class="card-body">
+      <div class="alert alert-warning col-12">
+        <%= Spree.t('store_form.footer_help') %>
+      </div>
+
+      <%= f.field_container :description do %>
+        <%= f.label :description, Spree.t(:description) %>
+        <%= f.text_area :description, class: 'form-control' %>
+        <%= f.error_message_on :description %>
+      <% end %>
+      <%= f.field_container :address do %>
+        <%= f.label :address, Spree.t(:address) %>
+        <%= f.text_area :address, class: 'form-control' %>
+        <%= f.error_message_on :address %>
+      <% end %>
+      <%= f.field_container :contact_phone do %>
+        <%= f.label :contact_phone, Spree.t(:contact_phone) %>
+        <%= f.text_field :contact_phone, class: 'form-control' %>
+        <%= f.error_message_on :contact_phone %>
+      <% end %>
+    </div>
   </div>
-  <div class="card-body">
-    <div class="alert alert-warning col-12">
-      <%= Spree.t('store_form.footer_help') %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
+        <%= Spree.t('admin.store.digital_settings.digital_asset_settings') %>
+      </h1>
     </div>
+    <div class="card-body">
+      <div class="row pb-0">
+        <div class="col-12 col-md-4">
+          <%= f.field_container :digital_asset_authorized_clicks do %>
+            <%= f.label :digital_asset_authorized_clicks, (raw Spree.t('admin.store.digital_settings.digital_asset_authorized_clicks.authorized_clicks') + required_span_tag) %>
+            <%= f.text_field :digital_asset_authorized_clicks, class: 'form-control', required: true %>
+            <%= f.error_message_on :digital_asset_authorized_clicks %>
+          <% end %>
+          <small class="form-text text-muted">
+            <%= Spree.t('admin.store.digital_settings.digital_asset_authorized_clicks.info') %>
+          </small>
+          <%= f.field_container :limit_digital_download_count, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+            <%= f.check_box :limit_digital_download_count, class: 'custom-control-input' %>
+            <%= f.label :limit_digital_download_count, Spree.t('admin.store.digital_settings.limit_digital_download_count'), class: 'custom-control-label' %>
+            <%= f.error_message_on :limit_digital_download_count %>
+          <% end %>
+        </div>
+
+        <div class="col-12 col-md-4">
+          <%= f.field_container :digital_asset_authorized_days do %>
+            <%= f.label :digital_asset_authorized_days, (raw Spree.t('admin.store.digital_settings.digital_asset_authorized_days.authorized_days') + required_span_tag) %>
+            <%= f.text_field :digital_asset_authorized_days, class: 'form-control', required: true %>
+            <%= f.error_message_on :digital_asset_authorized_days %>
+          <% end %>
+          <small class="form-text text-muted">
+            <%= Spree.t('admin.store.digital_settings.digital_asset_authorized_days.info') %>
+          </small>
+          <%= f.field_container :limit_digital_download_days, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+            <%= f.check_box :limit_digital_download_days, class: 'custom-control-input' %>
+            <%= f.label :limit_digital_download_days, Spree.t('admin.store.digital_settings.limit_digital_download_days'), class: 'custom-control-label' %>
+            <%= f.error_message_on :limit_digital_download_days %>
+          <% end %>
+        </div>
 
-    <%= f.field_container :description, class: ['form-group'] do %>
-      <%= 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.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.text_field :contact_phone, class: 'form-control' %>
-      <%= f.error_message_on :contact_phone %>
-    <% end %>
+        <div class="col-12 col-md-4">
+          <%= f.field_container :digital_asset_link_expire_time do %>
+            <%= f.label :digital_asset_link_expire_time, (raw Spree.t('admin.store.digital_settings.digital_asset_link_expire_time.download_link_expire_time') + required_span_tag) %>
+            <%= f.text_field :digital_asset_link_expire_time, class: 'form-control', required: true %>
+            <%= f.error_message_on :digital_asset_link_expire_time %>
+          <% end %>
+          <small class="form-text text-muted">
+            <%= Spree.t('admin.store.digital_settings.digital_asset_link_expire_time.link_expire_time') %>
+          </small>
+        </div>
+      </div>
+    </div>
   </div>
 </div>