solidus_backend 2.7.4 → 2.9.2

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -6,7 +6,7 @@
 
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :promotion_rule_type, t('spree.add_rule_of_type') %>
+          <%= label_tag :promotion_rule_type, t('spree.discount_rules') %>
           <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth') %>
         </div>
         <div class="filter-actions actions">

data/app/views/spree/admin/promotions/edit.html.erb

@@ -6,7 +6,9 @@
 <% content_for :page_actions do %>
   <li>
     <% if can?(:display, Spree::PromotionCode) %>
-      <%= link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
+      <%= link_to t('spree.view_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
+
+      <%= link_to t('spree.download_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
     <% end %>
 
     <% if can?(:display, Spree::PromotionCodeBatch) %>

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

@@ -78,11 +78,11 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
-              <%= t(promotion.active?? :active : :inactive, scope: 'spree') %>
+              <%= t(admin_promotion_status(promotion), scope: 'spree.admin.promotion_status') %>
             </span>
           </td>
           <td>
@@ -92,10 +92,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= promotion.starts_at.to_date.to_s(:short_date) if promotion.starts_at %>
+            <%= promotion.starts_at.to_s(:long) if promotion.starts_at %>
           </td>
           <td>
-            <%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %>
+            <%= promotion.expires_at.to_s(:long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -35,7 +35,7 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button_tag Spree::Refund.model_name.human, class: 'btn btn-primary' %>
+      <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -97,10 +97,10 @@
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post' } do %>
         <%= t('spree.reimburse') %>
       <% end %>
-      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>
     <% end %>
   </div>
 </fieldset>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -49,11 +49,18 @@
     <%= f.label :state_id, Spree::State.model_name.human %>
     <span id="<%= s_or_b %>state">
       <%= f.hidden_field :state_name, value: nil %>
+      <% states = f.object.country.try(:states).nil? ? [] : f.object.country.states %>
       <%= f.text_field :state_name,
-            style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
-           disabled: !f.object.country.states.empty?, class: 'fullwidth state_name js-state_name' %>
+            style: "display: #{states.empty? ? 'block' : 'none' };",
+            disabled: !states.empty?, class: 'fullwidth state_name js-state_name' %>
       <%= f.hidden_field :state_id, value: nil %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth js-state_id', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+      <%= f.collection_select :state_id,
+            states.sort,
+            :id, :name,
+            { include_blank: true },
+            { class: 'custom-select fullwidth js-state_id',
+              style: "display: #{states.empty? ? 'none' : 'block' };",
+              disabled: states.empty? } %>
     </span>
   </div>
 

data/app/views/spree/admin/shared/_edit_resource_links.html.erb

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
   <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-  <%= link_to t('spree.actions.cancel'), collection_url, class: 'btn btn-primary' %>
+  <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

data/app/views/spree/admin/shared/_head.html.erb

@@ -5,9 +5,7 @@
 
 <title><%= admin_page_title %></title>
 
-<!-- Get "Open Sans" font from Google -->
-<link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
-
+<%= favicon_link_tag 'favicon.ico' %>
 <%= stylesheet_link_tag 'spree/backend/all', media: 'all', data: {turbolinks_track: 'reload'} %>
 <%= javascript_include_tag 'spree/backend/all', data: {turbolinks_track: 'reload'} %>
 

data/app/views/spree/admin/shared/_image.html.erb

@@ -1,7 +1,7 @@
 <% size ||= :mini %>
 
-<% if image && image.attachment? %>
-  <%= image_tag image.attachment(size) %>
+<% if image_url = image.try(:url, size) %>
+  <%= image_tag image_url %>
 <% else %>
   <span class="image-placeholder <%= size %>"></span>
 <% end %>

data/app/views/spree/admin/shared/_modal.html.erb

@@ -11,7 +11,7 @@
         <%= content %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div>
   </div>

data/app/views/spree/admin/shared/_product_sub_menu.html.erb

@@ -12,6 +12,6 @@
     <%= tab :taxonomies %>
   <% end %>
   <% if can? :admin, Spree::Taxon %>
-    <%= tab :taxons, label: :display_order %>
+    <%= tab :taxons, label: :display_order, match_path: '/taxons' %>
   <% end %>
 </ul>

data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb

@@ -16,6 +16,10 @@
       <% if can?(:display, Spree::AdjustmentReason) %>
         <%= settings_tab_item plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
       <% end %>
+
+      <% if can?(:display, Spree::StoreCreditReason) %>
+        <%= settings_tab_item plural_resource_name(Spree::StoreCreditReason), spree.admin_store_credit_reasons_path %>
+      <% end %>
     </ul>
   </nav>
 <% end %>

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -8,12 +8,12 @@
   <% end %>
 
   <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
-    <%= tab :taxes, url: spree.admin_tax_categories_path %>
+    <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
   <% end %>
 
   <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
-     can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: spree.admin_refund_reasons_path %>
+    can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons) %>
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -1,11 +1,12 @@
-<% Spree::Backend::Config.menu_items.each do |menu_item| %>
+<% Spree::Backend::Config.menu_items.sort_by { |item| item.position || Float::INFINITY }.each do |menu_item| %>
   <% if instance_exec(&menu_item.condition) %>
     <%=
       tab(
         *menu_item.sections,
         icon: menu_item.icon,
         label: menu_item.label,
-        url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url
+        url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url,
+        match_path: menu_item.match_path,
       ) do
     %>
       <%- render partial: menu_item.partial if menu_item.partial %>

data/app/views/spree/admin/shared/_variant_search.html.erb

@@ -4,7 +4,7 @@
       <div class="field-block col-3">
         <div class="field">
           <%= label_tag nil, Spree::StockLocation.model_name.human %>
-          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: true, class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location') } %>
+          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: t('spree.all'), class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location') } %>
         </div>
       </div>
       <div class="<%= if content_for?(:sidebar) then 'col-6' else 'col-9' end %>">

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields" class="row">
   <div data-hook="admin_shipping_method_form_name_field" class="col-5">
     <%= f.field_container :name do %>
-      <%= f.label :name %><br />
+      <%= f.label :name, class: 'required' %>
       <%= f.text_field :name, class: 'fullwidth' %>
       <%= error_message_on :shipping_method, :name %>
     <% end %>
@@ -9,32 +9,32 @@
 
   <div data-hook="admin_shipping_method_form_internal_name_field" class="col-5">
     <%= f.field_container :admin_name do %>
-      <%= f.label :admin_name %><br />
-      <%= f.text_field :admin_name, class: 'fullwidth', label: false  %>
+      <%= f.label :admin_name %>
+      <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :admin_name %>
     <% end %>
   </div>
 
   <div data-hook="admin_shipping_method_form_code" class="col-5">
     <%= f.field_container :code do %>
-      <%= f.label :code %><br />
-      <%= f.text_field :code, class: 'fullwidth', label: false  %>
+      <%= f.label :code %>
+      <%= f.text_field :code, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :code %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :carrier do %>
-      <%= f.label :carrier %><br />
-      <%= f.text_field :carrier, class: 'fullwidth', label: false  %>
+      <%= f.label :carrier %>
+      <%= f.text_field :carrier, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :carrier %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :service_level do %>
-      <%= f.label :service_level %><br />
-      <%= f.text_field :service_level, class: 'fullwidth', label: false  %>
+      <%= f.label :service_level %>
+      <%= f.text_field :service_level, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :service_level %>
     <% end %>
   </div>
@@ -49,7 +49,7 @@
 
   <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-10">
     <%= f.field_container :tracking_url do %>
-      <%= f.label :tracking_url %><br />
+      <%= f.label :tracking_url %>
       <%= f.text_field :tracking_url, class: 'fullwidth', placeholder: t('spree.tracking_url_placeholder') %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>

data/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -1,34 +1,37 @@
+<% admin_layout "full-width" %>
+
 <%= paginate @variants, theme: "solidus_admin" %>
 
 <table class="index stock-table" id="listing_product_stock">
   <colgroup>
-    <col style="width: 50%" />
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-    <col style="width: 5%" />
-    <col style="width: 5%" />
-    <col style="width: 10%" />
+    <col style="width: 30%">
+    <col style="width: 15%">
+    <col style="width: 14%">
+    <col style="width: 11%">
+    <col style="width: 11%">
+    <col style="width: 10%">
+    <col style="width: 9%">
   </colgroup>
   <thead>
     <tr>
       <th><%= t('spree.item') %></th>
-      <th><%= t('spree.options') %></th>
+      <th><%= Spree::Variant.model_name.human %></th>
       <th><%= Spree::StockLocation.model_name.human %></th>
-      <th><%= t('spree.backorderable_header') %></th>
-      <th><%= t('spree.count_on_hand') %></th>
+      <th class="align-center"><%= t('spree.backorderable_header') %></th>
+      <th class="align-center"><%= t('spree.count_on_hand') %></th>
+      <th><%= t('spree.modify_stock_count') %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <% variants.each do |variant| %>
-    <%- locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
-    <%- display_add_row = locations_without_items.any? && can?(:create, Spree::StockItem) %>
-    <%- row_count = @stock_item_stock_locations.count + 2 %>
     <tbody class="variant-stock-items">
       <tr id="<%= spree_dom_id variant %>">
-        <td class="no-padding" rowspan="<%= row_count %>">
+        <td>
           <div class='variant-container'>
             <div class='variant-image'>
-              <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
+              <%= render 'spree/admin/shared/image',
+                image: variant.gallery.images.first,
+                size: :small %>
             </div>
             <div class='variant-details'>
               <table class='stock-variant-field-table'>
@@ -46,7 +49,7 @@
             </div>
           </div>
         </td>
-        <td rowspan="<%= row_count %>">
+        <td class="align-center">
           <table class='stock-variant-field-table'>
             <% variant.option_values.sort_by(&:option_type_name).each do |option_value| %>
               <tr>
@@ -58,30 +61,45 @@
             <% end %>
           </table>
         </td>
+        <td class="stock-location-items-cell" colspan="5">
+          <table class="stock-location-items-table">
+            <colgroup>
+              <col style="width: 25%" />
+              <col style="width: 20%" />
+              <col style="width: 20%" />
+              <col style="width: 20%" />
+              <col style="width: 15%" />
+            </colgroup>
+            <% variant.stock_items.each do |item| %>
+              <% if @stock_item_stock_locations.include?(item.stock_location) %>
+                <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>">
+                  <%# This is rendered in JS %>
+                </tr>
+              <% end %>
+            <% end %>
+            <% locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
+            <% if locations_without_items.any? && can?(:create, Spree::StockItem) %>
+              <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
+                <form>
+                  <td class='location-name-cell'>
+                    <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), class: 'custom-select', prompt: t('spree.add_to_stock_location'), id: "variant-stock-location-#{variant.id}" %>
+                  </td>
+                  <td class="align-center">
+                    <%= check_box_tag :backorderable, 'backorderable', false, id: "variant-backorderable-#{variant.id}" %>
+                  </td>
+                  <td>
+                    <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
+                  </td>
+                  <td></td>
+                  <td class="actions">
+                    <%= link_to_with_icon 'plus', t('spree.actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
+                  </td>
+                </form>
+              </tr>
+            <% end %>
+          </table>
+        </td>
       </tr>
-      <% variant.stock_items.each do |item| %>
-        <% if @stock_item_stock_locations.include?(item.stock_location) %>
-          <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>">
-            <%# This is rendered in JS %>
-          </tr>
-        <% end %>
-      <% end %>
-      <% if display_add_row %>
-        <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
-          <td class='location-name-cell'>
-            <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), { include_blank: true, class: 'custom-select', "data-placeholder" => t('spree.add_to_stock_location'), id: "variant-stock-location-#{variant.id}" } %>
-          </td>
-          <td class="align-center">
-            <%= check_box_tag :backorderable, 'backorderable', false, id: "variant-backorderable-#{variant.id}" %>
-          </td>
-          <td class="align-center">
-            <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
-          </td>
-          <td class="actions">
-            <%= link_to_with_icon 'plus', t('spree.actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
-          </td>
-        </tr>
-      <% end %>
     </tbody>
   <% end %>
 </table>

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

@@ -1,122 +1,134 @@
-<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form">
-  <fieldset class="no-border-bottom">
-    <legend><%= t('.general') %></legend>
-
-     <%= f.field_container :name do %>
-       <%= f.label :name, class: 'required' %><br />
-       <%= f.text_field :name, class: 'fullwidth', required: true %>
-     <% end %>
-
-     <%= f.field_container :code do %>
-       <%= f.label :code %>
-       <%= f.text_field :code, :class => 'fullwidth', :label => false %>
-     <% end %>
-
-     <%= f.field_container :admin_name do %>
-       <%= f.label :admin_name %>
-       <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
-     <% end %>
-  </fieldset>
-
-  <fieldset class="no-border-bottom">
-    <legend><%= t('.settings') %></legend>
-
-    <%= f.field_container :active do %>
-      <label>
-        <%= f.check_box :active %>
-        <%= Spree::StockLocation.human_attribute_name :active %>
-        <%= f.field_hint :active %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :default do %>
-      <label>
-        <%= f.check_box :default %>
-        <%= Spree::StockLocation.human_attribute_name :default %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :backorderable_default do %>
-      <label>
-        <%= f.check_box :backorderable_default %>
-        <%= Spree::StockLocation.human_attribute_name :backorderable_default %>
-        <%= f.field_hint :backorderable_default %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :propagate_all_variants do %>
-      <label>
-        <%= f.check_box :propagate_all_variants %>
-        <%= Spree::StockLocation.human_attribute_name :propagate_all_variants %>
-        <%= f.field_hint :propagate_all_variants %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :restock_inventory do %>
-      <label>
-        <%= f.check_box :restock_inventory %>
-        <%= Spree::StockLocation.human_attribute_name :restock_inventory %>
-        <%= f.field_hint :restock_inventory %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :fulfillable do %>
-      <label>
-        <%= f.check_box :fulfillable %>
-        <%= Spree::StockLocation.human_attribute_name :fulfillable %>
-        <%= f.field_hint :fulfillable %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :check_stock_on_transfer do %>
-      <label>
-        <%= f.check_box :check_stock_on_transfer %>
-        <%= Spree::StockLocation.human_attribute_name :check_stock_on_transfer %>
-        <%= f.field_hint :check_stock_on_transfer %>
-      </label>
-    <% end %>
-  </fieldset>
-
-  <fieldset>
-    <legend><%= t('.address') %></legend>
-
-    <%= f.field_container :check_stock_on_transfer do %>
-      <%= f.label :address1 %>
-      <%= f.text_field :address1, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :address2 do %>
-      <%= f.label :address2 %>
-      <%= f.text_field :address2, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :city do %>
-      <%= f.label :city %>
-      <%= f.text_field :city, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :zipcode do %>
-      <%= f.label :zipcode %>
-      <%= f.text_field :zipcode, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :phone do %>
-      <%= f.label :phone %>
-      <%= f.phone_field :phone, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :country_id do %>
-      <%= f.label :country_id %>
-      <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
-    <% end %>
-
-    <%= f.field_container :state do %>
-      <% country = f.object.country %>
-      <%= f.label :state_id %>
-      <span id="state" class="region">
-        <%= f.text_field :state_name, style: "display: none", class: 'fullwidth state_name js-state_name' %>
-        <%= f.collection_select :state_id, country ? country.states.sort : [], :id, :name, { include_blank: true }, {class: 'custom-select fullwidth js-state_id', style: "display: none" } %>
-      </span>
-    <% end %>
-  </fieldset>
+<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form row">
+  <div class="col-md-6">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.general') %></legend>
+
+      <%= f.field_container :name do %>
+        <%= f.label :name, class: 'required' %><br />
+        <%= f.text_field :name, class: 'fullwidth', required: true %>
+      <% end %>
+
+      <%= f.field_container :code do %>
+        <%= f.label :code %>
+        <%= f.text_field :code, :class => 'fullwidth', :label => false %>
+      <% end %>
+
+      <%= f.field_container :admin_name do %>
+        <%= f.label :admin_name %>
+        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div class="col-md-6">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.address') %></legend>
+
+      <%= f.field_container :check_stock_on_transfer do %>
+        <%= f.label :address1 %>
+        <%= f.text_field :address1, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :address2 do %>
+        <%= f.label :address2 %>
+        <%= f.text_field :address2, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :city do %>
+        <%= f.label :city %>
+        <%= f.text_field :city, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :zipcode do %>
+        <%= f.label :zipcode %>
+        <%= f.text_field :zipcode, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :phone do %>
+        <%= f.label :phone %>
+        <%= f.phone_field :phone, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :country_id do %>
+        <%= f.label :country_id %>
+        <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
+      <% end %>
+
+      <%= f.field_container :state do %>
+        <% country = f.object.country %>
+        <%= f.label :state_id %>
+        <span id="state" class="region">
+          <%= f.text_field :state_name, style: "display: none", class: 'fullwidth state_name js-state_name' %>
+          <%= f.collection_select :state_id, country ? country.states.sort : [], :id, :name, { include_blank: true }, {class: 'custom-select fullwidth js-state_id', style: "display: none" } %>
+        </span>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div class="col-md-12">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.settings') %></legend>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.field_container :active do %>
+            <label>
+              <%= f.check_box :active %>
+              <%= Spree::StockLocation.human_attribute_name :active %>
+              <%= f.field_hint :active %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :default do %>
+            <label>
+              <%= f.check_box :default %>
+              <%= Spree::StockLocation.human_attribute_name :default %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :backorderable_default do %>
+            <label>
+              <%= f.check_box :backorderable_default %>
+              <%= Spree::StockLocation.human_attribute_name :backorderable_default %>
+              <%= f.field_hint :backorderable_default %>
+            </label>
+          <% end %>
+        </div>
+
+        <div class="col-md-6">
+          <%= f.field_container :propagate_all_variants do %>
+            <label>
+              <%= f.check_box :propagate_all_variants %>
+              <%= Spree::StockLocation.human_attribute_name :propagate_all_variants %>
+              <%= f.field_hint :propagate_all_variants %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :restock_inventory do %>
+            <label>
+              <%= f.check_box :restock_inventory %>
+              <%= Spree::StockLocation.human_attribute_name :restock_inventory %>
+              <%= f.field_hint :restock_inventory %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :fulfillable do %>
+            <label>
+              <%= f.check_box :fulfillable %>
+              <%= Spree::StockLocation.human_attribute_name :fulfillable %>
+              <%= f.field_hint :fulfillable %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :check_stock_on_transfer do %>
+            <label>
+              <%= f.check_box :check_stock_on_transfer %>
+              <%= Spree::StockLocation.human_attribute_name :check_stock_on_transfer %>
+              <%= f.field_hint :check_stock_on_transfer %>
+            </label>
+          <% end %>
+        </div>
+      </div>
+    </fieldset>
+  </div>
 </div>