solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -48,9 +48,11 @@
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :state_id, Spree::State.model_name.human %>
     <span id="<%= s_or_b %>state">
+      <%= f.hidden_field :state_name, value: nil %>
       <%= 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' %>
+      <%= 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?} %>
     </span>
   </div>

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

@@ -11,9 +11,10 @@
       <% calculator = f.object.calculator.class == calculator_class ? f.object.calculator : calculator_class.new %>
       <div class="js-calculator-preferences" data-calculator-type="<%= calculator_class %>">
         <%= f.fields_for :calculator, calculator do |calculator_form| %>
-          <% calculator.preferences.keys.each do |key| %>
-            <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(key)}",
-               form: calculator_form, attribute: "preferred_#{key}", label: Spree.t(key) %>
+          <% calculator.admin_form_preference_names.each do |name| %>
+            <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(name)}",
+              form: calculator_form, attribute: "preferred_#{name}",
+              label: t(name, scope: 'spree', default: name.to_s.humanize) %>
           <% end %>
         <% end %>
       </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 Spree.t('actions.update') %>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url %>
+  <%= button t('spree.actions.update') %>
+  <%= button_link_to t('spree.actions.cancel'), collection_url %>
 </div>

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

@@ -1,4 +1,5 @@
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<meta name="turbolinks-cache-control" content="no-cache">
 
 <%= csrf_meta_tags %>
 
@@ -7,7 +8,8 @@
 <!-- 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'>
 
-<%= stylesheet_link_tag 'spree/backend/all', media: 'all' %>
+<%= stylesheet_link_tag 'spree/backend/all', media: 'all', data: {turbolinks_track: 'reload'} %>
+<%= javascript_include_tag 'spree/backend/all', data: {turbolinks_track: 'reload'} %>
 
 <%- if Rails.env.test? %>
   <style>
@@ -25,12 +27,18 @@
   </style>
 <%- elsif Rails.env.development? %>
   <style>
-    .translation_missing { background: red; }
+    .translation_missing {
+      background: white;
+      color: #C60F13;
+    }
   </style>
-<%- end %>
 
-
-<%= javascript_include_tag 'spree/backend/all' %>
+  <%= javascript_tag do %>
+    Spree.ready(function(){
+      $('.translation_missing').tooltip();
+    });
+  <% end %>
+<%- end %>
 
 <%= render "spree/admin/shared/js_locale_data" %>
 

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

@@ -3,45 +3,37 @@
     var Spree = {}
   }
   Spree.translations = <%==
-    I18n.t("spree").merge({
-      date_picker:    Spree.t(:js_format,
-                               scope: 'date_picker',
-                               default: 'yy/mm/dd'),
-      abbr_day_names:         I18n.t(:abbr_day_names, scope: :date),
-      destroy:                Spree.t(:destroy, scope: :actions),
-      edit:                   Spree.t(:edit,    scope: :actions),
-      save:                   Spree.t(:save,    scope: :actions),
-      cancel:                 Spree.t(:cancel,  scope: :actions),
-      first_day:              Spree.t(:first_day,
-                                       scope: 'date_picker',
-                                       default: 0).to_i,
-      item_stock_placeholder: Spree.t(:choose_location),
-      month_names:            I18n.t(:month_names, scope: :date).reject(&:blank?),
-      currency_separator:     I18n.t('number.currency.format.separator'),
-      currency_delimiter:     I18n.t('number.currency.format.delimiter'),
-      activerecord:           I18n.t('activerecord')
-  }).to_json
+    JSON.dump(
+      I18n.t("spree").merge({
+        abbr_day_names:         I18n.t(:abbr_day_names, scope: :date),
+        month_names:            I18n.t(:month_names, scope: :date).reject(&:blank?),
+        currency_separator:     I18n.t('number.currency.format.separator'),
+        currency_delimiter:     I18n.t('number.currency.format.delimiter'),
+        activerecord:           I18n.t('activerecord')
+    }))
 %>;
 
   Spree.currencyInfo = <%==
-    Money::Currency.all.map { |c|
-      format =
-        if c.symbol == "" || c.symbol_first
-          "%s%v"
-        else
-          "%v %s"
-        end
-      [c.id.to_s.upcase, [
-        c.symbol || "¤",
-        c.exponent,
-        format
-      ]]
-    }.to_h.to_json
+    JSON.dump(
+      Spree::Config.available_currencies.map { |c|
+        format =
+          if c.symbol == "" || c.symbol_first
+            "%s%v"
+          else
+            "%v %s"
+          end
+        [c.id.to_s.upcase, [
+          c.symbol || "¤",
+          c.exponent,
+          format
+        ]]
+    }.to_h)
 %>;
 </script>
 <script data-hook='admin-custom-translations'>
 </script>
 
 <% if I18n.locale != :en %>
-  <%= javascript_include_tag "solidus_admin/select2_locales/select2_locale_#{I18n.locale}" %>
+  <%= javascript_include_tag "solidus_admin/select2_locales/select2_locale_#{I18n.locale}",
+    data: {turbolinks_track: 'reload'} %>
 <% end %>

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

@@ -1,3 +1,33 @@
-<!-- solidus_auth_devise inserts a login_nav here.
-<ul id="login-nav" class="admin-login-nav"></ul>
+<!-- solidus_auth_devise replaces this partial with it's own login_nav.
+     But we provide a default implementation below that should work with
+     any typical `rails generate spree:custom_user` auth, if you need something
+     else you can override it like solidus_auth_devise does.
 -->
+<% if try_spree_current_user %>
+  <ul id="login-nav" class="admin-login-nav">
+    <li data-hook="user-account-link">
+      <%= link_to spree.polymorphic_path([:edit, :admin, try_spree_current_user]) do %>
+        <i class='fa fa-user'></i>
+        <%= try_spree_current_user.email %>
+      <% end %>
+    </li>
+
+    <% if respond_to? :spree_logout_path %>
+      <li data-hook="user-logout-link">
+        <%= link_to spree_logout_path do %>
+          <i class='fa fa-sign-out'></i>
+          <%= t('spree.logout') %>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if spree.respond_to? :root_path %>
+      <li data-hook="store-frontend-link">
+        <%= link_to spree.root_path, target: '_blank' do %>
+          <i class='fa fa-external-link'></i>
+          <%= t('spree.back_to_store') %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

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

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

@@ -1,4 +1,4 @@
-<%= Spree.t(:no_resource, resource: plural_resource_name(resource)) %>
+<%= t('spree.no_resource', resource: plural_resource_name(resource)) %>
 <% if can? :create, resource %>
-  <%= link_to Spree.t(:create_one), new_resource_url %>
+  <%= link_to t('spree.create_one'), new_resource_url %>
 <% end %>

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

@@ -4,13 +4,17 @@
 <% required ||= nil %>
 
 <div class="input-group number-with-currency <%= "number-with-currency-with-select" unless currency %> js-number-with-currency">
-  <div class="input-group-addon number-with-currency-symbol"></div>
-  <%= f.text_field amount_attr, value: number_to_currency(f.object.public_send(amount_attr), unit: ''), class: 'form-control number-with-currency-amount', required: required %>
+  <div class="input-group-prepend">
+    <span class="input-group-text number-with-currency-symbol"></span>
+  </div>
+  <%= f.text_field amount_attr, value: number_to_currency(f.object.public_send(amount_attr), unit: '', delimiter: ''), class: 'form-control number-with-currency-amount', required: required %>
   <% if currency %>
-    <div class="input-group-addon number-with-currency-addon" data-currency="<%= currency %>">
-      <%= ::Money::Currency.find(currency).iso_code %>
+    <div class="input-group-append">
+      <span class="input-group-text number-with-currency-addon" data-currency="<%= currency %>">
+        <%= ::Money::Currency.find(currency).iso_code %>
+      </span>
     </div>
   <% else %>
-    <%= f.select currency_attr, ::Money::Currency.all.map(&:iso_code), {include_blank: true}, {required: required, class: 'number-with-currency-select'} %>
+    <%= f.select currency_attr, Spree::Config.available_currencies.map(&:iso_code), {selected: Spree::Config.currency}, {required: required, class: 'number-with-currency-select'} %>
   <% end %>
 </div>

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

@@ -2,16 +2,16 @@
   <ul class="tabs" data-hook="admin_order_tabs">
     <% if (@order.shipments.count == 0 || @order.shipped_shipments.count == 0) %>
       <li class="<%= "active" if current == "Cart" %>" data-hook='admin_order_tabs_order_details'>
-        <%= link_to Spree.t(:cart), spree.cart_admin_order_url(@order) %>
+        <%= link_to t('spree.cart'), spree.cart_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if checkout_steps.include?("address") %>
       <li class="<%= "active" if (current == "Customer Details") %>" data-hook='admin_order_tabs_customer_details'>
         <% if can?(:update, @order) %>
-          <%= link_to Spree.t(:customer), spree.edit_admin_order_customer_url(@order) %>
+          <%= link_to t('spree.customer'), spree.edit_admin_order_customer_url(@order) %>
         <% else %>
-          <%= link_to Spree.t(:customer), spree.admin_order_customer_url(@order) %>
+          <%= link_to t('spree.customer'), spree.admin_order_customer_url(@order) %>
         <% end %>
       </li>
     <% end %>
@@ -34,14 +34,14 @@
 
     <% if !@order.completed? && can?(:update, @order) %>
       <li class="<%= "active" if current == "Confirm" %>" data-hook='admin_order_tabs_confirm'>
-        <%= link_to Spree.t(:confirm), spree.confirm_admin_order_url(@order) %>
+        <%= link_to t('spree.confirm'), spree.confirm_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :display, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to Spree.t('admin.tab.rma'), spree.admin_order_return_authorizations_url(@order) %>
+          <%= link_to t('spree.admin.tab.rma'), spree.admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>
@@ -56,7 +56,7 @@
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
       <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", data: {hook: 'admin_order_tabs_cancel_inventory'}) do %>
-        <%= link_to Spree.t(:cancel_inventory), spree.admin_order_cancellations_path(@order) %>
+        <%= link_to t('spree.cancel_inventory'), spree.admin_order_cancellations_path(@order) %>
       <% end %>
     <% end %>
   </ul>

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

@@ -1,14 +1,14 @@
 <header id="order_tab_summary" data-hook>
   <dl class="additional-info">
-    <dt class="order-state" id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
+    <dt class="order-state" id="order_status" data-hook><%= t('spree.status') %>:</dt>
     <dd class="order-state">
       <span class="pill pill-<%= @order.state %>">
-        <%= Spree.t(@order.state, scope: :order_state) %>
+        <%= t(@order.state, scope: 'spree.order_state') %>
       </span>
     </dd>
 
     <% if @order.user.present? %>
-      <dt data-hook='admin_order_user_link'><%= Spree.t(:user) %>:</dt>
+      <dt data-hook='admin_order_user_link'><%= t('spree.user') %>:</dt>
       <dd id='order_user_link'><%= link_to @order.user.email, spree.edit_admin_user_path(@order.user) %></dd>
     <% end %>
 
@@ -33,7 +33,7 @@
       <dt class="order-shipment_state"><%= Spree::Shipment.model_name.human %>: </dt>
       <dd class="order-shipment_state" id='shipment_status'>
         <span class="pill pill-<%= @order.shipment_state %>">
-          <%= Spree.t(@order.shipment_state, scope: :shipment_states) %>
+          <%= t(@order.shipment_state, scope: 'spree.shipment_states') %>
         </span>
       </dd>
     <% end %>
@@ -42,7 +42,7 @@
       <dt class="order-payment_state"><%= Spree::Payment.model_name.human %>: </dt>
       <dd class="order-payment_state" id='payment_status'>
         <span class="pill pill-<%= @order.payment_state %>">
-          <%= Spree.t(@order.payment_state, scope: :payment_states) %>
+          <%= t(@order.payment_state, scope: 'spree.payment_states') %>
         </span>
       </dd>
     <% end %>

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

@@ -3,7 +3,7 @@
 
 
 <% content_for :sidebar_title do %>
-  <%= Spree.t(:order_information) %>
+  <%= t('spree.order_information') %>
 <% end %>
 
 <% content_for :sidebar do %>

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

@@ -5,10 +5,10 @@
   <nav>
     <ul class="tabs" data-hook="admin_product_tabs">
       <%= content_tag :li, class: ('active' if current == 'Product Details') do %>
-        <%= link_to Spree.t(:product_details), spree.edit_admin_product_url(@product) %>
+        <%= link_to t('spree.product_details'), spree.edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, class: ('active' if current == 'Images') do %>
-        <%= link_to Spree.t(:images), spree.admin_product_images_url(@product) %>
+        <%= link_to t('spree.images'), spree.admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
       <%= content_tag :li, class: ('active' if current == 'Variants') do %>
         <%= link_to plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %>
@@ -20,7 +20,7 @@
         <%= link_to plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
       <%= content_tag :li, class: ('active' if current == 'Stock Management') do %>
-        <%= link_to Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
+        <%= link_to t('spree.stock_management'), spree.admin_product_stock_url(@product) %>
       <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
     </ul>
   </nav>

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

@@ -1,8 +1,8 @@
 <div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="<%= local_assigns[:wrapper_class] %> checkbox">
-  <%= form.label :rebuild_vat_prices do %>
+  <label>
     <%= form.check_box :rebuild_vat_prices, checked: form.object.prices.size <= 1 %>
     <%= Spree::Variant.human_attribute_name(:rebuild_vat_prices) %>
-  <% end %>
+  </label>
 </div>
 
 <script type="text/javascript">

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

@@ -6,7 +6,7 @@
       <th><%= Spree::Refund.human_attribute_name(:amount) %></th>
       <th><%= Spree::PaymentMethod.model_name.human %></th>
       <th><%= Spree::Refund.human_attribute_name(:transaction_id) %></th>
-      <th><%= Spree.t(:reason) %></th>
+      <th><%= t('spree.reason') %></th>
       <% if show_actions %>
         <th class="actions"></th>
       <% end %>
@@ -23,7 +23,7 @@
         <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>
           <td class="actions">
-            <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
+            <%= link_to_with_icon 'edit', t('spree.actions.edit'), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
           </td>
         <% end %>
       </tr>

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

@@ -1,17 +1,19 @@
 <%= search_form_for @search, url: spree.url_for(controller: 'admin/reports', action: action)  do |s| %>
   <div class="date-range-filter field">
     <div class="date-range-fields input-group">
-      <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: Spree.t(:start) %>
+      <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: t('spree.start') %>
 
-      <span class="range-divider input-group-addon">
-        <i class="fa fa-arrow-right"></i>
-      </span>
+      <div class="input-group-prepend input-group-append">
+        <span class="input-group-text range-divider">
+          <i class="fa fa-arrow-right"></i>
+        </span>
+      </div>
 
-      <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]), placeholder: Spree.t(:end) %>
+      <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]), placeholder: t('spree.end') %>
     </div>
   </div>
 
   <div class="actions filter-actions">
-    <%= button Spree.t(:search)  %>
+    <%= button t('spree.search')  %>
   </div>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div id="progress">
   <div class="wrapper">
     <div id="spinner" class="spinner"></div>
-    <div class="progress-message"><%= Spree.t(:loading) %>...</div>
+    <div class="progress-message"><%= t('spree.loading') %>...</div>
   </div>
 </div>

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

@@ -4,13 +4,13 @@
       <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" => Spree.t(:select_a_stock_location) } %>
+          <%= 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') } %>
         </div>
       </div>
       <div class="<%= if content_for?(:sidebar) then 'col-6' else 'col-9' end %>">
         <div data-hook="add_product_name" class="field">
           <%= label_tag :add_variant_id, Spree::Variant.model_name.human %>
-          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: Spree.t(:variant_search_placeholder) %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
         </div>
       </div>
     </div>
@@ -19,7 +19,7 @@
 
     <div class="actions filter-actions">
       <div data-hook="admin_orders_index_search_buttons">
-        <%= button Spree.t(:filter_results) %>
+        <%= button t('spree.filter_results') %>
       </div>
     </div>
   <% end %>

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

@@ -5,8 +5,10 @@
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
     <div class="checkbox">
-      <%= f.check_box :active %>
-      <%= f.label :active %>
+      <label>
+        <%= f.check_box :active %>
+        <%= f.object.class.human_attribute_name :active %>
+      </label>
     </div>
   </div>
 </div>

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

@@ -24,8 +24,8 @@
     </colgroup>
     <thead>
       <tr data-hook="named_types_header">
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= t('spree.name') %></th>
+        <th><%= t('spree.state') %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -37,7 +37,7 @@
           </td>
           <td>
             <span class="pill pill-<%= named_type.active? ? 'active' : 'inactive' %>">
-              <%= Spree.t(named_type.active? ? :active : :inactive) %>
+              <%= t(named_type.active? ? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td class="actions">
@@ -50,7 +50,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: resource,
                  new_resource_url: new_object_url %>