solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -7,7 +7,7 @@
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_edit_general_settings">
-  <legend><%= Spree.t(:general_settings) %></legend>
+  <legend><%= Spree.user_class.model_name.human %></legend>
 
   <div data-hook="admin_user_edit_form_header">
     <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
@@ -28,30 +28,29 @@
 
 <% if can?(:update, @user) %>
   <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key">
-    <legend><%= Spree.t('access', scope: 'api') %></legend>
+    <legend><%= t('.api_access') %></legend>
 
     <% if @user.spree_api_key.present? %>
-      <div class="field">
-        <div id="current-api-key"><%= Spree.t('key', scope: 'api') %>: (<%= Spree.t('hidden') %>)</div>
-      </div>
-      <div class="filter-actions actions">
-        <%= form_tag spree.clear_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('clear_key', scope: 'api') %>
+      <div id="current-api-key">
+        <strong><%= t('.key') %>: </strong>
+        <% if @user == try_spree_current_user %>
+          <%= @user.spree_api_key %>
+        <% else %>
+          <i>(<%= t('spree.hidden') %>)</i>
         <% end %>
 
-        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('regenerate_key', scope: 'api') %>
-        <% end %>
+      </div>
+      <div class="filter-actions actions">
+        <%= button_link_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-primary' %>
+        <%= button_link_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-primary' %>
       </div>
 
     <% else %>
 
-      <div class="no-objects-found"><%= Spree.t('no_key', scope: 'api') %></div>
+      <div class="no-objects-found"><%= t('.no_key') %></div>
 
       <div class="filter-actions actions">
-        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('generate_key', scope: 'api') %>
-        <% end %>
+        <%= button_link_to t('.generate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, class: 'btn btn-primary' %>
       </div>
     <% end %>
   </fieldset>

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

@@ -3,13 +3,13 @@
 <% content_for :page_actions do %>
   <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
-      <%= button_link_to Spree.t(:new_user), new_admin_user_url, id: 'admin_new_user_link' %>
+      <%= button_link_to t('spree.new_user'), new_admin_user_url, id: 'admin_new_user_link' %>
     </li>
   <% end %>
 <% end %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -18,7 +18,7 @@
       <div class="row">
         <div class="col-xs-12 col-md-5">
           <div class="form-group">
-            <%= f.label :email_cont, Spree.t(:email) %>
+            <%= f.label :email_cont, t('spree.email') %>
             <%= f.text_field :email_cont, class: "form-control" %>
           </div>
         </div>
@@ -31,24 +31,26 @@
         </div>
         <div class="col-xs-12 col-md-4">
           <div class="date-range-filter form-group">
-            <%= label_tag :q_created_at_gt, Spree.t(:member_since) %>
+            <%= label_tag :q_created_at_gt, t('spree.member_since') %>
             <div class="date-range-fields input-group">
               <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from',
-                value: params[:q].try!("[]", :created_at_gt), placeholder: Spree.t(:start) %>
+                value: params[:q].try!("[]", :created_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>
 
               <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to',
-                value: params[:q].try!("[]", :created_at_lt), placeholder: Spree.t(:stop) %>
+                value: params[:q].try!("[]", :created_at_lt), placeholder: t('spree.stop') %>
             </div>
           </div>
         </div>
       </div>
 
       <div class="actions filter-actions" data-hook="admin_users_index_search_buttons">
-        <%= button Spree.t(:search) %>
+        <%= button t('spree.search') %>
       </div>
     <% end %>
   </div>
@@ -69,9 +71,9 @@
     <tr data-hook="admin_users_index_headers">
       <th><%= sort_link @search, :email, Spree.user_class.human_attribute_name(:email), {}, {title: 'users_email_title'} %></th>
       <th><%= Spree.user_class.human_attribute_name(:spree_roles) %></th>
-      <th class="align-center"><%= Spree.t(:num_orders) %></th>
+      <th class="align-center"><%= t('spree.num_orders') %></th>
       <th class="align-center"><%= Spree.user_class.human_attribute_name(:lifetime_value) %></th>
-      <th class="align-center"><%= sort_link @search, :created_at, Spree.t(:member_since) %></th>
+      <th class="align-center"><%= sort_link @search, :created_at, t('spree.member_since') %></th>
       <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
   </thead>

data/app/views/spree/admin/users/items.html.erb

@@ -1,14 +1,14 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
-<% admin_breadcrumb(Spree.t('admin.user.items_purchased')) %>
+<% admin_breadcrumb(t('spree.admin.user.items_purchased')) %>
 
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :items %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_items_purchased">
-  <legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
+<fieldset data-hook="admin_user_items_purchased" class="no-border-bottom">
+  <legend><%= t("spree.admin.user.items_purchased") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
 
@@ -32,7 +32,7 @@
         <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
         <th><%= Spree::Order.human_attribute_name(:total) %></th>
         <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {}, {title: 'orders_state_title'} %></th>
-        <th><%= sort_link @search, :number, Spree.t(:order_num, scope: 'admin.user'), {}, {title: 'orders_number_title'} %></th>
+        <th><%= sort_link @search, :number, t('spree.admin.user.order_num'), {}, {title: 'orders_number_title'} %></th>
       </thead>
 
       <tbody>
@@ -46,7 +46,7 @@
               <td class="item-name">
                 <%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
                 <% if item.variant.sku.present? %>
-                  <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
+                  <strong><%= t('spree.sku') %>:</strong> <%= item.variant.sku %>
                 <% end %>
               </td>
               <td class="item-price"><%= item.single_money.to_html %></td>
@@ -54,7 +54,7 @@
               <td class="item-total"><%= item.money.to_html %></td>
               <td class="order-state">
                 <span class="pill pill-<%= order.state %>">
-                  <%= Spree.t(order.state, scope: :order_state) %>
+                  <%= t(order.state, scope: 'spree.order_state') %>
                 </span>
               </td>
               <td class="order-number">
@@ -69,7 +69,7 @@
         <% end %>
     </table>
   <% else %>
-    <div class="col-9 no-objects-found">
+    <div class="no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
                    new_resource_url: spree.new_admin_order_path %>

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

@@ -1,5 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
-<% admin_breadcrumb(Spree.t(:new_user)) %>
+<% admin_breadcrumb(t('spree.new_user')) %>
 
 <div data-hook="admin_user_new_form_header">
   <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>

data/app/views/spree/admin/users/orders.html.erb

@@ -1,14 +1,14 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
-<% admin_breadcrumb(Spree.t('admin.user.order_history')) %>
+<% admin_breadcrumb(t('spree.admin.user.order_history')) %>
 
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :orders %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_order_history">
-  <legend><%= Spree.t(:"admin.user.order_history") %></legend>
+<fieldset data-hook="admin_user_order_history" class="no-border-bottom">
+  <legend><%= t("spree.admin.user.order_history") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
 
@@ -46,13 +46,13 @@
           </td>
           <td>
             <span class="pill pill-<%= order.state %>">
-              <%= Spree.t(order.state, scope: :order_state) %>
+              <%= t(order.state, scope: 'spree.order_state') %>
             </span>
           </td>
           <td>
             <% if order.payment_state  %>
               <span class="pill pill-<%= order.payment_state %>">
-                <%= Spree.t(order.payment_state, scope: :payment_states) %>
+                <%= t(order.payment_state, scope: 'spree.payment_states') %>
               </span>
             <% end %>
           </td>
@@ -60,7 +60,7 @@
             <td>
               <% if order.shipment_state %>
                 <span class="pill pill-<%= order.shipment_state %>">
-                  <%= Spree.t(order.shipment_state, scope: :shipment_states) %>
+                  <%= t(order.shipment_state, scope: 'spree.shipment_states') %>
                 </span>
               <% end %>
             </td>
@@ -71,7 +71,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::Order,
                    new_resource_url: spree.new_admin_order_path %>

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

@@ -9,10 +9,10 @@
       </div>
       <div class="col-3">
         <div class="field checkbox" data-hook="track_inventory">
-          <%= f.label :track_inventory do %>
+          <label>
             <%= f.check_box :track_inventory %>
             <%= Spree::Variant.human_attribute_name(:track_inventory) %>
-          <% end %>
+          </label>
         </div>
       </div>
     </div>

data/app/views/spree/admin/variants/_table.html.erb

@@ -12,7 +12,7 @@
   <thead data-hook="variants_header">
     <tr>
       <th></th>
-      <th><%= Spree.t(:options) %></th>
+      <th><%= t('spree.options') %></th>
       <th><%= Spree::Variant.human_attribute_name(:price) %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
       <th class="actions"></th>
@@ -41,7 +41,7 @@
     </tr>
     <% end %>
     <% if variants.empty? %>
-      <tr><td colspan="4"><%= Spree.t(:none) %></td></tr>
+      <tr><td colspan="4"><%= t('spree.none') %></td></tr>
     <% end %>
   </tbody>
 </table>

data/app/views/spree/admin/variants/_table_filter.html.erb

@@ -1,23 +1,23 @@
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
     <div class="col-10">
       <div data-hook="admin_variants_index_search" class="field">
-        <%= f.label :variant_search_term, Spree.t(:variant_search_placeholder) %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: Spree.t(:variant_search_placeholder) %>
+        <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
+        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
       </div>
     </div>
 
     <% if product.variants.only_deleted.any? %>
       <div class="col-2">
         <div class="field checkbox">
-          <%= label_tag :deleted do %>
+          <label>
             <%= check_box_tag :deleted, "on", params[:deleted] == "on" %>
             <%= t('.show_deleted') %>
-          <% end %>
+          </label>
         </div>
       </div>
     <% end %>

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

@@ -6,7 +6,7 @@
   <% if can?(:create, Spree::Variant) && !@product.empty_option_values? %>
     <li id="new_var_link" data-hook>
       <%= link_to(
-        Spree.t(:new_variant),
+        t('spree.new_variant'),
         new_admin_product_variant_url(@product),
         class: 'button'
       ) %>
@@ -20,7 +20,7 @@
 <% else %>
   <% if !Spree::OptionType.any? %>
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
-      <%= Spree.t(:to_add_variants_you_must_first_define) %>
+      <%= t('spree.to_add_variants_you_must_first_define') %>
       <% if can?(:display, Spree::OptionType) %>
         <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
       <% else %>
@@ -28,15 +28,15 @@
       <% end %>
     </p>
   <% elsif @product.empty_option_values? %>
-    <div class="col-9 no-objects-found">
-      <%= Spree.t :no_option_values_on_product_html,
-                  link: link_to(Spree.t(:product_details), [:edit, :admin, @product]) %>
+    <div class="no-objects-found">
+      <%= t 'spree.no_option_values_on_product_html',
+            link: link_to(t('spree.product_details'), [:edit, :admin, @product]) %>
     </div>
   <% else %>
-    <div class="col-9 no-objects-found">
-      <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::Variant)) %>
+    <div class="no-objects-found">
+      <%= t('spree.no_resource', resource: plural_resource_name(Spree::Variant)) %>
       <% if can? :create, Spree::Variant %>
-        <%= link_to Spree.t(:create_one), new_object_url %>
+        <%= link_to t('spree.create_one'), new_object_url %>
       <% end %>
     </div>
   <% end %>

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

@@ -2,7 +2,7 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
-<% admin_breadcrumb(Spree.t(:new_variant)) %>
+<% admin_breadcrumb(t('spree.new_variant')) %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset class="no-border-top" data-hook="admin_variant_new_form">

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

@@ -3,7 +3,7 @@
 
     <div data-hook="admin_zone_form_fields">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:general_settings)%></legend>
+        <legend align="center"><%= t('spree.general_settings')%></legend>
 
         <%= zone_form.field_container :name do %>
           <%= zone_form.label :name %><br />
@@ -16,15 +16,19 @@
         <% end %>
 
         <div data-hook="type" class="field">
-          <%= label_tag Spree.t(:type) %>
+          <%= label_tag t('spree.type') %>
           <ul>
             <li>
-              <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
-              <%= label_tag :country_based, Spree.t(:country_based) %>
+              <label>
+                <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
+                <%= t('spree.country_based') %>
+              </label>
             </li>
             <li>
-              <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
-              <%= label_tag :state_based, Spree.t(:state_based) %>
+              <label>
+                <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
+                <%= t('spree.state_based') %>
+              </label>
             </li>
           </ul>
         </div>

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

@@ -1,4 +1,4 @@
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
 <% admin_breadcrumb(@zone.name) %>
 

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

@@ -1,10 +1,10 @@
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Zone)) %>
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Zone) %>
     <li>
-      <%= button_link_to Spree.t(:new_zone), new_object_url, id: 'admin_new_zone_link' %>
+      <%= button_link_to t('spree.new_zone'), new_object_url, id: 'admin_new_zone_link' %>
     </li>
   <% end %>
 <% end %>
@@ -46,7 +46,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::Zone,
                  new_resource_url: new_object_url %>

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

@@ -1,6 +1,6 @@
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
-<% admin_breadcrumb(Spree.t(:new_zone)) %>
+<% admin_breadcrumb(t('spree.new_zone')) %>
 
 
 <% content_for :page_actions do %>

data/app/views/spree/layouts/admin.html.erb

@@ -10,7 +10,7 @@
     <%= render "spree/admin/shared/flash" %>
     <%= render "spree/admin/shared/spinner" %>
 
-    <div class="content-wrapper <%= @admin_layout.presence %> <%= "has-sidebar" if content_for?(:sidebar) %> <%= "has-tabs" if content_for?(:tabs) %>" id="wrapper" data-hook>
+    <div class="content-wrapper <%= @admin_layout.presence %> <%= 'has-sidebar' if content_for?(:sidebar) %> <%= 'has-tabs' if content_for?(:tabs) %>" id="wrapper" data-hook>
       <div class="content row">
         <div class="content-main col-<%= content_for?(:sidebar) ? '9' : '12' %>">
           <%= yield :tabs %>

data/app/views/spree/layouts/admin_style_guide.html.erb

@@ -4,8 +4,8 @@
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
     <title>Solidus Style Guide</title>
 
-    <%= stylesheet_link_tag "spree/backend/all" %>
-    <%= javascript_include_tag "spree/backend/all" %>
+    <%= stylesheet_link_tag "spree/backend/all", data: {turbolinks_track: 'reload'} %>
+    <%= javascript_include_tag "spree/backend/all", data: {turbolinks_track: 'reload'} %>
     <%= render "spree/admin/shared/js_locale_data" %>
   </head>
 

data/config/routes.rb

@@ -43,7 +43,7 @@ Spree::Core::Engine.routes.draw do
       member do
         post :clone
       end
-      resources :variants do
+      resources :variants, only: [:index, :edit, :update, :new, :create, :destroy] do
         collection do
           post :update_positions
         end
@@ -152,16 +152,6 @@ Spree::Core::Engine.routes.draw do
     resources :shipping_methods
     resources :shipping_categories
 
-    resources :stock_transfers, except: [:destroy] do
-      member do
-        get :receive
-        put :finalize
-        put :close
-        get :tracking_info
-        put :ship
-      end
-    end
-
     resources :stock_locations do
       resources :stock_movements, only: [:index]
       collection do