spree_backend 4.1.13 → 4.2.0.rc4

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add', id: 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add.svg', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">

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

@@ -80,7 +80,7 @@
       <%= f.label :state_id, Spree.t(:state) %>
       <span id="state" class="region">
         <%= f.text_field :state_name, style: "#{f.object.country.states.empty? ? '' : 'display: none;'}", disabled: !f.object.country.states.empty?, class: 'state_name form-control' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2', style: "#{f.object.country.states.empty? ? 'display: none;' : '' };", disabled: f.object.country.states.empty?} %>
+        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2-clear', style: "#{f.object.country.states.empty? ? 'display: none;' : '' };", disabled: f.object.country.states.empty?} %>
       </span>
     <% end %>
   </div>

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

@@ -31,9 +31,9 @@
     </div>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'plus' %>
+      <%= button Spree.t(:transfer_stock), 'add' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,16 +3,17 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_stock_location' } %>
 <% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_stock_locations' data-hook>
     <thead>
       <tr data-hook="stock_locations_header">
         <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:stock_movements) %></th>
+        <th><%= Spree.t(:status) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -23,8 +24,8 @@
       %>
         <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
           <td><%= display_name(stock_location) %></td>
-          <td><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
           <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
+          <td><%= active_badge(stock_location.active, label: Spree.t(state(stock_location))) %></td>
           <td class="actions actions-2 text-center">
             <%= link_to_edit(stock_location, no_text: true) if can? :create, stock_location %>
             <%= link_to_delete(stock_location, no_text: true) if can? :create, stock_location %>
@@ -33,6 +34,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockLocation)) %>,

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

@@ -4,35 +4,37 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
 <% end %>
 
 <% if @stock_movements.any? %>
-<table class="table" id='listing_stock_movements'>
-  <colgroup>
-    <col style="width: 35%">
-    <col style="width: 20%">
-    <col style="width: 45%">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_stock_movements_index_headers">
-      <th><%= Spree.t(:stock_item) %>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @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) %>
-        </td>
-        <td><%= stock_movement.quantity %></td>
-        <td><%= pretty_originator(stock_movement) %></td>
+<div class="table-responsive">
+  <table class="table" id='listing_stock_movements'>
+    <colgroup>
+      <col style="width: 35%">
+      <col style="width: 20%">
+      <col style="width: 45%">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_stock_movements_index_headers">
+        <th><%= Spree.t(:stock_item) %>
+        <th><%= Spree.t(:quantity) %></th>
+        <th><%= Spree.t(:action) %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @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) %>
+          </td>
+          <td><%= stock_movement.quantity %></td>
+          <td><%= pretty_originator(stock_movement) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockMovement)) %>,
@@ -40,4 +42,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_movements, theme: 'twitter-bootstrap-4' %>
+<%= paginate @stock_movements, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb

@@ -1,22 +1,24 @@
 <div id="source-movements-table" class="twelve columns alpha">
-  <table class="table sortable">
-    <thead data-hook="bulk_variants_header">
-      <tr>
-        <th><%= Spree.t('variant') %></th>
-        <th><%= Spree.t('sku') %></th>
-        <th><%= Spree.t('quantity') %></th>
-        <th><%= Spree.t('count_on_hand') %></th>
-      </tr>
-    </thead>
-    <tbody id="bulk_variants_tbody">
-      <% stock_movements.each do |movement| %>
+  <div class="table-responsive">
+    <table class="table sortable">
+      <thead data-hook="bulk_variants_header">
         <tr>
-          <td><%= movement.stock_item.variant.name %></td>
-          <td><%= movement.stock_item.variant.sku %></td>
-          <td><%= movement.quantity %></td>
-          <td><%= movement.stock_item.count_on_hand %></td>
+          <th><%= Spree.t('variant') %></th>
+          <th><%= Spree.t('sku') %></th>
+          <th><%= Spree.t('quantity') %></th>
+          <th><%= Spree.t('count_on_hand') %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody id="bulk_variants_tbody">
+        <% stock_movements.each do |movement| %>
+          <tr>
+            <td><%= link_to movement.stock_item.variant.name, spree.edit_admin_product_path(movement.stock_item.variant.product) %></td>
+            <td><%= movement.stock_item.variant.sku %></td>
+            <td><%= movement.quantity %></td>
+            <td><%= movement.stock_item.count_on_hand %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>

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

@@ -3,70 +3,76 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-success' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
-<div data-hook="admin_orders_index_search" class="card bg-light mb-3">
-  <div class="card-body">
-    <fieldset>
-      <legend class="border-bottom"><%= Spree.t(:search) %></legend>
-      <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+    <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
 
-        <div class="row mb-0">
-          <div class="col-12 col-lg-4">
-            <div class="form-group">
-              <%= f.label :reference_cont, Spree.t(:reference_contains) %>
-              <%= f.text_field :reference_cont, class: 'form-control' %>
-            </div>
-          </div>
-
-          <div class="col-12 col-lg-4">
-            <div class="form-group">
-              <%= f.label :source_location, Spree.t(:source) %>
-              <%= f.select :source_location_id_eq,
-                  options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
-                  { include_blank: true }, class: 'select2' %>
-            </div>
+      <div class="row mb-0">
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= f.label :reference_cont, Spree.t(:reference_contains) %>
+            <%= f.text_field :reference_cont, class: 'form-control' %>
           </div>
+        </div>
 
-          <div class="col-12 col-lg-4">
-            <div class="form-group">
-              <%= f.label :destination_location, Spree.t(:destination) %>
-              <%= f.select :destination_location_id_eq,
-                  options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
-                  { include_blank: true }, class: 'select2' %>
-            </div>
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= f.label :source_location, Spree.t(:source) %>
+            <%= f.select :source_location_id_eq,
+                options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
+                { include_blank: true }, class: 'select2-clear js-filterable' %>
           </div>
         </div>
 
-        <div class="form-actions">
-          <div data-hook="admin_stock_transfers_index_search_buttons">
-            <%= button Spree.t(:filter_results), 'search' %>
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= f.label :destination_location, Spree.t(:destination) %>
+            <%= f.select :destination_location_id_eq,
+                options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
+                { include_blank: true }, class: 'select2-clear js-filterable' %>
           </div>
         </div>
-      <% end %>
-    </fieldset>
+      </div>
+
+      <div class="form-actions" data-hook="admin_stock_transfers_index_search_buttons">
+        <%= button Spree.t(:filter_results), 'search.svg' %>
+      </div>
+    <% end %>
   </div>
-</div>
+<% end %>
 
 <% if @stock_transfers.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_stock_transfers' data-hook>
     <thead>
       <tr data-hook='stock_transfers_header'>
-        <th><%= Spree.t(:created_at) %></th>
+        <th><%= Spree.t(:number) %></th>
         <th><%= Spree.t(:reference) %></th>
         <th><%= Spree.t(:source) %></th>
         <th><%= Spree.t(:destination) %></th>
+        <th><%= Spree.t(:created_at) %></th>
         <th class='actions'></th>
       </tr>
     </thead>
     <tbody>
       <% @stock_transfers.each do |stock_transfer| %>
         <tr id="<%= spree_dom_id stock_transfer %>" data-hook="stock_transfer_row">
-          <td><%= link_to stock_transfer.created_at, admin_stock_transfer_path(stock_transfer) %></td>
+          <td><%= link_to stock_transfer.number, admin_stock_transfer_path(stock_transfer) %></td>
           <td><%= stock_transfer.reference %></td>
-          <td><%= stock_transfer.source_location.try(:name) %></td>
-          <td><%= stock_transfer.destination_location.try(:name) %></td>
+          <td>
+            <% if stock_transfer.source_location.present? %>
+              <%= stock_transfer.source_location.name %>
+            <% end %>
+          </td>
+          <td>
+            <% if stock_transfer.destination_location.present? %>
+              <%= stock_transfer.destination_location.name %>
+            <% end %>
+          </td>
+          <td><%= stock_transfer.created_at.strftime('%F %T %Z') %></td>
           <td class="actions actions-1">
             <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-outline-secondary btn-sm', no_text: true, data: {action: 'view'} %>
           </td>
@@ -74,6 +80,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockTransfer)) %>,
@@ -81,4 +88,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_transfers, theme: 'twitter-bootstrap-4' %>
+<%= paginate @stock_transfers, theme: 'admin-twitter-bootstrap-4' %>

data/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">
-              <%= hidden_field_tag 'transfer_variant', {}, { class: 'w-100'} %>
+              <%= select_tag 'transfer_variant', nil, class: 'd-block w-100', id: 'transfer_variant'  %>
             </div>
           </div>
         </div>
@@ -77,7 +77,7 @@
             <div class="input-group">
               <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 1 %>
               <span class="input-group-btn">
-                <%= button Spree.t(:add), 'plus', 'submit', class: "transfer_add_variant" %>
+                <%= button Spree.t(:add), 'add.svg', 'submit', class: "transfer_add_variant" %>
               </span>
             </div>
           </div>
@@ -90,7 +90,7 @@
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>.
   </div>
 
-  <div id="transfer-variants-table" style="display:none">
+  <div id="transfer-variants-table" style="display:none" class="table-responsive">
     <table class="table table-bordered sortable">
       <thead data-hook="transfer_variants_header">
         <th><%= Spree.t(:name) %></th>
@@ -104,6 +104,6 @@
   </div>
 
   <div class="form-actions" data-hook="buttons">
-    <%= button Spree.t(:transfer_stock), 'plus transfer_transfer' %>
+    <%= button Spree.t(:transfer_stock), 'add.svg', class: 'transfer_transfer' %>
   </div>
 <% end %>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -9,11 +9,11 @@
 
 <fieldset>
   <legend><%= Spree.t(:stock_transfer_name) %></legend>
-
+<div class="table-responsive">
   <table class="table table-bordered">
     <tr>
       <td width="30%"><strong><%= Spree.t(:created_at) %></strong></td>
-      <td><%= @stock_transfer.created_at %></td>
+      <td><%= pretty_time(@stock_transfer.created_at) %></td>
     </tr>
     <% if @stock_transfer.reference.present? %>
       <tr>
@@ -22,7 +22,7 @@
       </tr>
     <% end %>
   </table>
-
+</div>
   <% if @stock_transfer.source_movements.present? %>
     <fieldset>
       <legend id="stock-location-source">

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_store_credit_category_link' %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
 <% if @store_credit_categories.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="admin_store_credit_categories_index_headers">
@@ -26,6 +27,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-warning">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCreditCategory)) %>,

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

@@ -10,10 +10,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::StoreCredit) %>
+  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::StoreCredit) %>
 <% end %>
 
 <% if @store_credits.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <th><%= Spree.t(:credited) %></th>
@@ -41,6 +42,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>

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

@@ -1,115 +1,244 @@
 <div data-hook="admin_store_form_fields">
 
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        Basic Information
-      </h1>
-    </div>
-    <div class="card-body">
-      <%= 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 :url, class: ['form-group'] do %>
-        <%= f.label :url, Spree.t(:url)  %>
-        <%= f.text_field :url, class: 'form-control', required: true %>
-        <%= f.error_message_on :url %>
-      <% end %>
-    </div>
+<div class="card mb-4">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
+      <%= Spree.t(:basic_information) %>
+    </h1>
   </div>
-
-  <br />
-
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        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 %>
+  <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 :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 %>
+      <%= f.field_container :logo, class: ['form-group'] do %>
+        <%= f.label :logo, Spree.t(:logo) %><br />
+        <%= f.file_field :logo %>
+        <%= f.error_message_on :logo %>
       <% 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 :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>')) %>
       <% end %>
-    </div>
+      <%= f.field_container :mailer_logo, class: ['form-group'] do %>
+        <%= 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 %>
+    <% 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>
+        </div>
+        <%= f.text_field :url, class: 'form-control', required: true %>
+      </div>
+      <%= f.error_message_on :url %>
+    <% end %>
   </div>
+</div>
 
-  <br />
+<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>
+</div>
 
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        Emails
-      </h1>
-    </div>
-    <div class="card-body">
-      <%= f.field_container :mail_from_address, class: ['form-group'] do %>
-        <%= f.label :mail_from_address, Spree.t(:mail_from_address)  %>
-        <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
-        <%= f.error_message_on :mail_from_address %>
-      <% end %>
-    </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 %>
 
-  <br />
+    <%= 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 :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 %>
+  </div>
+</div>
 
-<div class="card">
+<div class="card mb-4">
   <div class="card-header">
     <h1 class="card-title mb-0 h5">
-      Internationalization
+      <%= Spree.t(:internationalization) %>
     </h1>
   </div>
   <div class="card-body">
     <%= f.field_container :default_currency, class: ['form-group'] do %>
       <%= f.label :default_currency, Spree.t(:currency) %>
-      <%= f.select :default_currency, currency_options(@store.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, Spree.t('i18n.language') %>
+      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_locale %>
+      <% unless defined?(SpreeI18n) %>
+        <small class="form-text text-muted">
+          <%= raw(Spree.t('store_form.languages_help')) %>
+        </small>
+      <% end %>
+    <% 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 || Spree::Config[: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>
 
-  <br />
-
-<div class="card">
+<div class="card mb-4">
   <div class="card-header">
     <h1 class="card-title mb-0 h5">
-      Social
+      <%= 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)  %>
-      <%= f.text_field :facebook, class: 'form-control' %>
+      <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.error_message_on :facebook %>
     <% end %>
     <%= f.field_container :twitter, class: ['form-group'] do %>
       <%= f.label :twitter, Spree.t(:twitter)  %>
-      <%= f.text_field :twitter, class: 'form-control' %>
+      <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.error_message_on :twitter %>
     <% end %>
     <%= f.field_container :instagram, class: ['form-group'] do %>
       <%= f.label :instagram, Spree.t(:instagram)  %>
-      <%= f.text_field :instagram, class: 'form-control' %>
+      <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.error_message_on :instagram %>
     <% end %>
   </div>
 </div>
 
-<br />
+<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>
 
-<script>
-  $('#store_default_currency').select2();
-</script>
+    <%= 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>
+</div>