spree_backend 4.2.0.beta → 4.2.0.rc5

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -2,6 +2,10 @@ $('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j S
 $('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
-  $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
-  $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% if @order.payment_state.present? %>
+    $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
+  <% end %>
+  <% if @order.shipment_state.present? %>
+    $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% end %>
 <% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -23,7 +23,7 @@
             <%= named_type.name %>
           </td>
           <td class="align-center">
-            <%= Spree.t(named_type.active? ? :active : :inactive) %>
+            <%= active_badge(named_type.active, label: Spree.t(named_type.active? ? :active : :inactive)) %>
           </td>
           <td class="actions actions-1 text-right">
             <% if named_type.mutable? %>

data/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)) %>,

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

@@ -11,7 +11,7 @@
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
       <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2-clear' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>
@@ -110,7 +110,7 @@
 
       <div class="card-body">
         <%= f.field_container :categories, class: ['form-group'] do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2-clear" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>
       </div>

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

@@ -19,10 +19,14 @@
       </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><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td>
+            <% shipping_method.zones.each do |zone| %>
+              <%= link_to zone.name, spree.edit_admin_zone_path(zone) %>
+            <% end %>
+          </td>
           <td><%= shipping_method.calculator.description %></td>
           <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:none) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
@@ -33,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)) %>,

data/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>

data/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 %>
@@ -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

@@ -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">

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

@@ -12,20 +12,20 @@
     <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>
     <tbody>
       <% @stock_locations.each do |stock_location|
-           @edit_url = edit_admin_stock_location_path(stock_location)
-           @delete_url = admin_stock_location_path(stock_location)
-      %>
+           @edit_url = spree.edit_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><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><%= link_to Spree.t(:stock_movements), spree.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 %>

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

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

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

@@ -17,13 +17,13 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_stock_movements_index_headers">
-        <th><%= Spree.t(:stock_item) %>
+        <th><%= Spree.t(:variant) %>
         <th><%= Spree.t(:quantity) %></th>
         <th><%= Spree.t(:action) %></th>
       </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) %>

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

@@ -12,7 +12,7 @@
       <tbody id="bulk_variants_tbody">
         <% stock_movements.each do |movement| %>
           <tr>
-            <td><%= movement.stock_item.variant.name %></td>
+            <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>

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

@@ -6,68 +6,73 @@
   <%= 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.svg' %>
+        <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.strftime('%F %T %Z'), 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>

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>

data/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>

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

@@ -14,11 +14,21 @@
         <%= 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 %>
     <% 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 %>
+      <%= 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 %>
@@ -27,11 +37,19 @@
     <%= 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)  %>
-      <%= f.text_field :url, class: 'form-control', required: true %>
+      <%= 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>
@@ -50,15 +68,23 @@
       <%= 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 %>
+    <%= 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>
 
@@ -73,18 +99,27 @@
       <%= 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 :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>
@@ -106,15 +141,31 @@
       <%= 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.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.languages_help')) %>
+        </small>
+      <% end %>
     <% end %>
     <%= f.field_container :default_country_id, class: ['form-group'] do %>
-      <%= f.label :default_country_id, Spree.t('i18n.country') %>
-      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
+      <%= 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>
@@ -126,19 +177,38 @@
     </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' %>
+      <%= 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.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' %>
+      <%= 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.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' %>
+      <%= 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.error_message_on :instagram %>
     <% end %>
   </div>
@@ -147,27 +217,26 @@
 <div class="card mb-4">
   <div class="card-header">
     <h1 class="card-title mb-0 h5">
-      <%= Spree.t(:footer_info) %>
+      <%= 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, 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_email, class: ['form-group'] do %>
-      <%= f.label :contact_email, Spree.t(:contact_email)  %>
-      <%= f.text_field :contact_email, class: 'form-control' %>
-      <%= f.error_message_on :contact_email %>
-    <% 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 %>