solidus_backend 2.4.2 → 2.5.0.beta1

data/app/views/spree/admin/shared/preference_fields/_boolean.html.erb

@@ -2,12 +2,13 @@
 <% html_options = local_assigns[:html_options] || {} %>
 
 <div class="field">
-  <% if local_assigns[:form] %>
-    <%= form.check_box attribute, html_options %>
-    <%= form.label attribute, label %>
-  <% else %>
-    <%= hidden_field_tag name, 0 %>
-    <%= check_box_tag name, 1, value, html_options %>
-    <%= label_tag name, label %>
-  <% end %>
+  <label>
+    <% if local_assigns[:form] %>
+      <%= form.check_box attribute, html_options %>
+    <% else %>
+      <%= hidden_field_tag name, 0 %>
+      <%= check_box_tag name, 1, value, html_options %>
+    <% end %>
+    <%= label || form.object.class.human_attribute_name(attribute) %>
+  </label>
 </div>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
-<% admin_breadcrumb(Spree.t(:editing_shipping_category)) %>
+<% admin_breadcrumb(t('spree.editing_shipping_category')) %>
 
 
 <% content_for :page_actions do %>

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

@@ -1,14 +1,14 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ShippingCategory)) %>
 
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingCategory) %>
     <li>
-      <%= button_link_to Spree.t(:new_shipping_category), new_object_url %>
+      <%= button_link_to t('spree.new_shipping_category'), new_object_url %>
     </li>
   <% end %>
 <% end %>
@@ -30,7 +30,7 @@
     <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
       <td><%= shipping_category.name %></td>
       <td class="actions">
-        <% if can?(:udpate, shipping_category) %>
+        <% if can?(:update, shipping_category) %>
           <%= link_to_edit shipping_category, no_text: true %>
         <% end %>
 
@@ -43,7 +43,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::ShippingCategory,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
-<% admin_breadcrumb(Spree.t(:new_shipping_category)) %>
+<% admin_breadcrumb(t('spree.new_shipping_category')) %>
 
 
 <% content_for :page_actions do %>

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

@@ -42,15 +42,17 @@
   <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.text_field :tracking_url, class: 'fullwidth', placeholder: Spree.t(:tracking_url_placeholder) %>
+      <%= f.text_field :tracking_url, class: 'fullwidth', placeholder: t('spree.tracking_url_placeholder') %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
   </div>
 </div>
 
-<%= f.field_container :available_to_users do %>
-  <%= f.check_box(:available_to_users) %>
-  <%= f.label :available_to_users %>
+<%= f.field_container :available_to_users, class: %w(checkbox) do %>
+  <label>
+    <%= f.check_box(:available_to_users) %>
+    <%= Spree::ShippingMethod.human_attribute_name :available_to_users %>
+  </label>
   <%= error_message_on :shipping_method, :available_to_users %>
 <% end %>
 
@@ -61,10 +63,10 @@
         <legend align="center"><%= plural_resource_name(Spree::ShippingCategory) %></legend>
         <%= f.field_container :categories do %>
           <% Spree::ShippingCategory.all.each do |category| %>
-            <%= label_tag do %>
+            <label>
               <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
               <%= category.name %><br>
-            <% end %>
+            </label>
           <% end %>
           <%= error_message_on :shipping_method, :shipping_category_id %>
         <% end %>
@@ -77,10 +79,10 @@
         <%= f.field_container :zones do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
-            <%= label_tag do %>
+            <label>
               <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
               <%= zone.name %>
-            <% end %>
+            </label>
             <br>
           <% end %>
           <%= error_message_on :shipping_method, :zone_id %>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
 <% admin_breadcrumb(@shipping_method.name) %>
 

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

@@ -1,14 +1,14 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ShippingMethod)) %>
 
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_shipping_method), new_object_url, id: 'admin_new_shipping_method_link' %>
+      <%= button_link_to t('spree.new_shipping_method'), new_object_url, id: 'admin_new_shipping_method_link' %>
     </li>
   <% end %>
 <% end %>
@@ -37,7 +37,7 @@
           <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.calculator.description %></td>
-          <td><%= shipping_method.available_to_users? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td><%= shipping_method.available_to_users? ? t('spree.say_yes') : t('spree.say_no') %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <% if can?(:update, shipping_method) %>
               <%= link_to_edit shipping_method, no_text: true %>
@@ -52,7 +52,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::ShippingMethod,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
-<% admin_breadcrumb(Spree.t(:new_shipping_method)) %>
+<% admin_breadcrumb(t('spree.new_shipping_method')) %>
 
 
 <% content_for :page_actions do %>

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

@@ -11,11 +11,11 @@
   </colgroup>
   <thead>
     <tr>
-      <th><%= Spree.t(:item) %></th>
-      <th><%= Spree.t(:options) %></th>
+      <th><%= t('spree.item') %></th>
+      <th><%= t('spree.options') %></th>
       <th><%= Spree::StockLocation.model_name.human %></th>
-      <th><%= Spree.t(:backorderable_header) %></th>
-      <th><%= Spree.t(:count_on_hand) %></th>
+      <th><%= t('spree.backorderable_header') %></th>
+      <th><%= t('spree.count_on_hand') %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -35,7 +35,7 @@
                 <tbody>
                   <% @variant_display_attributes.each do |display_attribute| %>
                     <tr>
-                      <td><%= Spree.t(display_attribute[:translation_key]) %></td>
+                      <td><%= t(display_attribute[:translation_key], scope: 'spree') %></td>
                       <td class="fullwidth">
                         <%= variant.send(display_attribute[:attr_name]) %>
                       </td>
@@ -69,7 +69,7 @@
       <% 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" => Spree.t(:add_to_stock_location), id: "variant-stock-location-#{variant.id}" } %>
+            <%= 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}" %>
@@ -78,7 +78,7 @@
             <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
           </td>
           <td class="actions">
-            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
+            <%= link_to_with_icon 'plus', t('spree.actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
           </td>
         </tr>
       <% end %>

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

@@ -1,16 +1,16 @@
 <% if @product %>
   <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Stock Management' } %>
   <%= render partial: 'spree/shared/error_messages', locals: { target: @product } %>
-  <% admin_breadcrumb(Spree.t(:manage_stock)) %>
+  <% admin_breadcrumb(t('spree.manage_stock')) %>
 
 <% else %>
 
-  <% admin_breadcrumb(Spree.t(:stock)) %>
+  <% admin_breadcrumb(t('spree.stock')) %>
 
 <% end %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -22,6 +22,6 @@
   <%= render partial: 'stock_management', locals: { variants: @variants } %>
 <% else %>
   <div class="fullwidth no-objects-found">
-    <%= Spree.t(:no_variants_found_try_again) %>
+    <%= t('spree.no_variants_found_try_again') %>
   </div>
 <% end %>

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

@@ -1,120 +1,122 @@
-<div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="col-7" data-hook="stock_location_names">
-    <div data-hook="stock_location_name">
-      <%= f.field_container :name do %>
-        <%= f.label :name, class: 'required' %><br />
-        <%= f.text_field :name, class: 'fullwidth', required: true %>
-      <% end %>
-    </div>
-    <div data-hook="stock_location_code">
-      <%= f.field_container :code do %>
-        <%= f.label :code %>
-        <%= f.text_field :code, class: 'fullwidth', label: false %>
-      <% end %>
-    </div>
-    <div data-hook="stock_location_admin_name">
-      <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name %>
-        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="col-3" data-hook="stock_location_status">
+<div data-hook="admin_stock_locations_form_fields" class="js-stock-locations-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 for="active"><%= Spree.t(:status) %></label>
-      <ul>
-        <li class="fullwidth" data-hook="stock_location_active">
-          <%= f.check_box :active %>
-          <%= f.label :active %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_default">
-          <%= f.check_box :default %>
-          <%= f.label :default %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_backorderable_default">
-          <%= f.check_box :backorderable_default %>
-          <%= f.label :backorderable_default %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_propagate_all_variants">
-          <%= f.check_box :propagate_all_variants %>
-          <%= f.label :propagate_all_variants %>
-        </li>
-        <li class="fullwidth">
-          <%= f.check_box :restock_inventory %>
-          <%= f.label :restock_inventory %>
-        </li>
-        <li>
-          <%= f.check_box :fulfillable %>
-          <%= f.label :fulfillable %>
-        </li>
-        <li class="fullwidth">
-          <%= f.check_box :check_stock_on_transfer %>
-          <%= f.label :check_stock_on_transfer %>
-        </li>
-      </ul>
+      <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 %>
-  </div>
+  </fieldset>
 
-  <div class="col-5" data-hook="stock_location_address1">
-    <div class="field">
+  <fieldset>
+    <legend><%= t('.address') %></legend>
+
+    <%= f.field_container :check_stock_on_transfer do %>
       <%= f.label :address1 %>
       <%= f.text_field :address1, class: 'fullwidth' %>
-    </div>
-  </div>
-
-  <div class="col-5" data-hook="stock_location_city">
-    <div class="field">
-      <%= f.label :city %>
-      <%= f.text_field :city, class: 'fullwidth' %>
-    </div>
-  </div>
+    <% end %>
 
-  <div class="col-5" data-hook="stock_location_address2">
-    <div class="field">
+    <%= f.field_container :address2 do %>
       <%= f.label :address2 %>
       <%= f.text_field :address2, class: 'fullwidth' %>
-    </div>
-  </div>
+    <% end %>
+
+    <%= f.field_container :city do %>
+      <%= f.label :city %>
+      <%= f.text_field :city, class: 'fullwidth' %>
+    <% end %>
 
-  <div class="col-2" data-hook="stock_location_zipcode">
-    <div class="field">
+    <%= f.field_container :zipcode do %>
       <%= f.label :zipcode %>
       <%= f.text_field :zipcode, class: 'fullwidth' %>
-    </div>
-  </div>
+    <% end %>
 
-  <div class="col-3" data-hook="stock_location_phone">
-    <div class="field">
+    <%= f.field_container :phone do %>
       <%= f.label :phone %>
       <%= f.phone_field :phone, class: 'fullwidth' %>
-    </div>
-  </div>
+    <% end %>
 
-  <div class="col-5" data-hook="stock_location_country">
-    <div class="field">
+    <%= f.field_container :country_id do %>
       <%= f.label :country_id %>
-      <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
-    </div>
-  </div>
-
-  <div class="col-5" data-hook="stock_location_state">
-    <div class="field">
-      <% if f.object.country %>
-        <%= f.label :state_id %>
-        <span id="state" class="region">
-          <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
-          <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
-        </span>
-      <% end %>
-    </div>
-  </div>
-</div>
+      <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
+    <% end %>
 
-<% content_for :head do %>
-  <%= javascript_tag do -%>
-    $(document).ready(function(){
-      $('span#country select.select2').on('change', function() { update_state(''); });
-    });
-  <% end -%>
-<% 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>