solidus_backend 2.10.0 → 2.11.1

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

@@ -3,24 +3,24 @@
     <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
   <% end %>
 
-  <% if can?(:display, Spree::PaymentMethod) %>
+  <% if can?(:show, Spree::PaymentMethod) %>
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
+  <% if can?(:show, Spree::TaxCategory) || can?(:show, Spree::TaxRate) %>
     <%= 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) %>
+  <% if can?(:show, Spree::RefundReason) || can?(:show, Spree::ReimbursementType) ||
+    can?(:show, Spree::ReturnReason) || can?(:show, Spree::AdjustmentReason) %>
     <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
   <% end %>
 
-  <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
+  <% if can?(:show, Spree::ShippingMethod) || can?(:show, Spree::ShippingCategory) || can?(:show, Spree::StockLocation) %>
     <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 
-  <% if can?(:display, Spree::Zone) %>
+  <% if can?(:show, Spree::Zone) %>
     <%= tab :zones, url: spree.admin_zones_path %>
   <% end %>
 </ul>

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

@@ -1,16 +1,16 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_shipping_tabs">
-      <% if can?(:display, Spree::ShippingMethod) %>
+      <% if can?(:show, Spree::ShippingMethod) %>
         <%= settings_tab_item plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path %>
       <% end %>
 
-      <% if can?(:display, Spree::ShippingCategory) %>
+      <% if can?(:show, Spree::ShippingCategory) %>
         <%= settings_tab_item plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path %>
 
       <% end %>
 
-      <% if can?(:display, Spree::StockLocation) %>
+      <% if can?(:show, Spree::StockLocation) %>
         <%= settings_tab_item plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path %>
       <% end %>
     </ul>

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

@@ -1,11 +1,11 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_taxes_tabs">
-      <% if can? :display, Spree::TaxCategory %>
+      <% if can? :show, Spree::TaxCategory %>
         <%= settings_tab_item plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path %>
       <% end %>
 
-      <% if can? :display, Spree::TaxRate %>
+      <% if can? :show, Spree::TaxRate %>
         <%= settings_tab_item plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path %>
       <% end %>
     </ul>

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

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_string fullwidth'}.merge(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

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

@@ -54,6 +54,24 @@
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
   </div>
+
+  <div class="col-5 label-block">
+    <%= f.field_container :stock_locations do %>
+      <label>
+        <%= f.check_box(:available_to_all) %>
+        <%= Spree::ShippingMethod.human_attribute_name :available_to_all %>
+        <%= f.field_hint :available_to_all %>
+        <%= error_message_on :shipping_method, :available_to_all %>
+      </label>
+      <%= f.collection_select :stock_location_ids,
+        Spree::StockLocation.order_default, :id, :name,
+        {},
+        class: 'fullwidth select2',
+        multiple: true,
+        placeholder: t('spree.admin.shipping_methods.form.stock_locations_placeholder') %>
+      <%= error_message_on :shipping_method, :stock_locations %>
+    <% end %>
+  </div>
 </div>
 
 <%= f.field_container :available_to_users, class: %w(checkbox) do %>

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

@@ -72,7 +72,7 @@
             </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) %>">
+                <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) %>" data-variant-sku="<%= variant.sku %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

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

@@ -8,7 +8,7 @@
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
-    <% if can?(:display, Spree::StockMovement) %>
+    <% if can?(:show, Spree::StockMovement) %>
       <li>
         <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary'  %>
       </li>

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

@@ -16,6 +16,7 @@
 <% end %>
 
 <% if @stock_locations.any? %>
+  <%= paginate @stock_locations, theme: "solidus_admin" %>
   <table class="index sortable" id='listing_stock_locations' data-hook data-sortable-link="<%= update_positions_admin_stock_locations_url %>">
     <colgroup>
       <col style="width: 10%">
@@ -51,7 +52,7 @@
             </span>
           </td>
           <td>
-            <% if can?(:display, Spree::StockMovement) %>
+            <% if can?(:show, Spree::StockMovement) %>
               <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(stock_location.id) %>
             <% else %>
               Stock Movements
@@ -69,6 +70,7 @@
       <% end %>
     </tbody>
   </table>
+  <%= paginate @stock_locations, theme: "solidus_admin" %>
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',

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

@@ -1,6 +1,6 @@
 <% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
-<% if can?(:display, Spree::StockLocation) %>
+<% if can?(:show, Spree::StockLocation) %>
   <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
 <% else %>
   <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
@@ -12,6 +12,35 @@
 <% end %>
 <% admin_breadcrumb(plural_resource_name(Spree::StockMovement)) %>
 
+<% content_for :table_filter_title do %>
+  <%= t('spree.filter') %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%=
+    search_form_for(
+      [:admin, @search],
+      url: admin_stock_location_stock_movements_path(
+        params[:stock_location_id]
+    )) do |f|
+  %>
+    <div class ="row">
+      <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
+        <div class="field">
+          <%= label_tag :q_variant_sku_eq, "#{t('spree.variant')} #{t('spree.sku')}" %>
+          <%= f.text_field :variant_sku_eq, value: params[:q][:variant_sku_eq] %>
+        </div>
+      </div>
+    </div>
+
+    <div class="clearfix"></div>
+
+    <div class="actions filter-actions">
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
+    </div>
+  <% end %>
+<% end %>
+
 <% if @stock_movements.any? %>
 <table class="index" id='listing_stock_movements'>
   <colgroup>

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

@@ -44,6 +44,12 @@
       <%= f.error_message_on :mail_from_address %>
     <% end %>
 
+    <%= f.field_container :bcc_email do %>
+      <%= f.label :bcc_email %>
+      <%= f.text_field :bcc_email, class: 'fullwidth' %>
+      <%= f.error_message_on :bcc_email %>
+    <% end %>
+
     <%= f.field_container :default_currency do %>
       <%= f.label :default_currency %>
       <%= f.select :default_currency,

data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb

@@ -1,7 +1,8 @@
 <%- snippet = capture do %>
-  <table>
+  <table class='selectable-table'>
     <thead>
       <tr>
+        <th></th>
         <th colspan="2">Item Description</th>
         <th>Long Item Text</th>
         <th>Price</th>
@@ -12,6 +13,7 @@
 
     <tbody>
       <tr>
+        <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
         <td class="item-image">
           <img src="http://placehold.it/50x50">
         </td>
@@ -33,13 +35,35 @@
         <td>$22.99</td>
       </tr>
       <tr>
-        <td colspan="5">UPS Ground (USD)</td>
+        <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
+        <td class="item-image">
+          <img src="http://placehold.it/50x50">
+        </td>
+        <td class="no-wrap">
+          Ruby on Rails Bag<br>
+          SKU: ROR-00012
+        </td>
+        <td>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nihil illinc huc pervenit.
+          Sed quae tandem ista ratio est? Ergo ita: non posse honeste vivi, nisi honeste vivatur?
+          Scisse enim te quis coarguere possit? Duo Reges: constructio interrete.
+          Sic, et quidem diligentius saepiusque ista loquemur inter nos agemusque communiter.
+          Sed in rebus apertissimis nimium longi sumus.
+          Quod si ita se habeat, non possit beatam praestare vitam sapientia.
+          Etenim nec iustitia nec amicitia esse omnino poterunt, nisi ipsae per se expetuntur.
+        </td>
+        <td>$22.99</td>
+        <td class="no-wrap">1 x on hand</td>
+        <td>$22.99</td>
+      </tr>
+      <tr>
+        <td colspan="6">UPS Ground (USD)</td>
         <td>
           <span>$5.00</span>
         </td>
       </tr>
       <tr>
-        <td colspan="6">No tracking details provided.</td>
+        <td colspan="7">No tracking details provided.</td>
       </tr>
     </tbody>
   </table>

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

@@ -18,6 +18,7 @@
       <label>
         <%= f.check_box :is_default %>
         <%= Spree::TaxCategory.human_attribute_name(:is_default) %>
+        <%= f.field_hint :is_default %>
       </label>
     <% end %>
   </div>

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

@@ -11,7 +11,7 @@
       <%= error_message_on :user, :email %>
     <% end %>
 
-    <% if can? :display, Spree::Role %>
+    <% if can? :show, Spree::Role %>
       <div data-hook="admin_user_form_roles" class="field">
         <%= label_tag nil, plural_resource_name(Spree::Role) %>
         <ul>
@@ -35,7 +35,7 @@
       </div>
     <% end %>
 
-    <% if Spree::Config[:can_restrict_stock_management] && can?(:display, Spree::StockLocation) %>
+    <% if Spree::Config[:can_restrict_stock_management] && can?(:show, Spree::StockLocation) %>
       <div data-hook="admin_user_form_stock_locations" class="field">
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>

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

@@ -19,7 +19,7 @@
           <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
-      <% if can?(:display, @user.store_credits.new) %>
+      <% if can?(:show, @user.store_credits.new) %>
         <li<%== ' class="active"' if current == :store_credits %>>
           <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>

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

@@ -25,7 +25,7 @@
   </div>
 </fieldset>
 
-<% if can?(:update, @user) %>
+<% if can?(:update, @user) && can?(:manage, :api_key) %>
   <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key">
     <legend><%= t('.api_access') %></legend>
 
@@ -40,8 +40,8 @@
 
       </div>
       <div class="filter-actions actions">
-        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
-        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
+        <%= button_to t('.clear_key'), spree.admin_user_api_key_path(@user), method: :delete, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
+        <%= button_to t('.regenerate_key'), spree.admin_user_api_key_path(@user), method: :post, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
       </div>
 
     <% else %>
@@ -49,7 +49,7 @@
       <div class="no-objects-found"><%= t('.no_key') %></div>
 
       <div class="filter-actions actions">
-        <%= button_to t('.generate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, class: 'btn btn-primary' %>
+        <%= button_to t('.generate_key'), spree.admin_user_api_key_path(@user), method: :post, class: 'btn btn-primary' %>
       </div>
     <% end %>
   </fieldset>

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

@@ -72,9 +72,11 @@
     </table>
   <% else %>
     <div class="no-objects-found">
-      <%= render 'spree/admin/shared/no_objects_found',
-                   resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path %>
+      <% if can? :manage, Spree::Order %>
+        <%= render 'spree/admin/shared/no_objects_found',
+                     resource: Spree::Order,
+                     new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
+      <% end %>
     </div>
   <% end %>
   <%= paginate @orders, theme: "solidus_admin" %>

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

@@ -72,9 +72,11 @@
     </table>
   <% else %>
     <div class="no-objects-found">
-      <%= render 'spree/admin/shared/no_objects_found',
-                   resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
+      <% if can? :manage, Spree::Order %>
+        <%= render 'spree/admin/shared/no_objects_found',
+                     resource: Spree::Order,
+                     new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
+      <% end %>
     </div>
   <% end %>
 

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

@@ -11,7 +11,7 @@
       </div>
     </div>
 
-    <% if product.variants.only_deleted.any? %>
+    <% if product.variants.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>

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

@@ -14,14 +14,14 @@
   <% end %>
 <% end %>
 
-<% if @variants.any? || @product.variants.only_deleted.any?%>
+<% if @variants.any? || @product.variants.discarded.any? %>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
 <% else %>
   <% if !Spree::OptionType.any? %>
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= t('spree.to_add_variants_you_must_first_define') %>
-      <% if can?(:display, Spree::OptionType) %>
+      <% if can?(:show, Spree::OptionType) %>
         <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
       <% else %>
         <%= plural_resource_name(Spree::OptionType) %>

data/config/initializers/form_builder.rb

@@ -13,8 +13,8 @@ class ActionView::Helpers::FormBuilder
   end
 
   def field_hint(method, options = {})
-    title = options[:title] || @object.class.human_attribute_name(method)
-    text = options[:text] || I18n.t(method, scope: [:spree, :hints, @object.class.model_name.i18n_key])
+    title = options.delete(:title) || @object.class.human_attribute_name(method)
+    text = options.delete(:text) || I18n.t(method, scope: [:spree, :hints, @object.class.model_name.i18n_key], **options)
     @template.admin_hint(title, text)
   end
 end

data/lib/spree/backend/engine.rb

@@ -5,8 +5,6 @@ require 'spree/backend/config'
 module Spree
   module Backend
     class Engine < ::Rails::Engine
-      config.middleware.use "Spree::Backend::Middleware::SeoAssist"
-
       # Leave initializer empty for backwards-compatability. Other apps
       # might still rely on this event.
       initializer "spree.backend.environment", before: :load_config_initializers do; end

data/lib/spree/backend_configuration.rb

@@ -131,7 +131,20 @@ module Spree
         MenuItem.new(
           CONFIGURATION_TABS,
           'wrench',
-          condition: -> { can?(:admin, Spree::Store) },
+          condition: -> {
+            can?(:admin, Spree::Store) ||
+            can?(:show, Spree::AdjustmentReason) ||
+            can?(:show, Spree::PaymentMethod) ||
+            can?(:show, Spree::RefundReason) ||
+            can?(:show, Spree::ReimbursementType) ||
+            can?(:show, Spree::ShippingCategory) ||
+            can?(:show, Spree::ShippingMethod) ||
+            can?(:show, Spree::StockLocation) ||
+            can?(:show, Spree::TaxCategory) ||
+            can?(:show, Spree::TaxRate) ||
+            can?(:show, Spree::ReturnReason) ||
+            can?(:show, Spree::Zone)
+          },
           label: :settings,
           partial: 'spree/admin/shared/settings_sub_menu',
           url: :admin_stores_path,

data/solidus_backend.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(spec|script)/})
+  end
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version