solidus_backend 2.10.3 → 2.11.4

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/taxons/attachment_forms/_paperclip.html.erb

@@ -2,7 +2,7 @@
   <%= f.field_container attachment do %>
     <%= f.label attachment %><br>
     <%= f.file_field attachment %>
-    <% if f.object.send(attachment).exists? %>
+    <% if f.object.send(attachment).present? %>
       <%= image_tag f.object.send(attachment, definition[:default_style]) %>
       <%= link_to t('spree.actions.remove'),
                   admin_taxonomy_taxon_attachment_path(@taxonomy,

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?(:admin, Spree::AdjustmentReason) ||
+            can?(:admin, Spree::PaymentMethod) ||
+            can?(:admin, Spree::RefundReason) ||
+            can?(:admin, Spree::ReimbursementType) ||
+            can?(:admin, Spree::ShippingCategory) ||
+            can?(:admin, Spree::ShippingMethod) ||
+            can?(:admin, Spree::StockLocation) ||
+            can?(:admin, Spree::TaxCategory) ||
+            can?(:admin, Spree::TaxRate) ||
+            can?(:admin, Spree::ReturnReason) ||
+            can?(:admin, 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.11.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,9 @@ files:
 - app/assets/javascripts/spree/backend/components/admin_nav.js
 - app/assets/javascripts/spree/backend/components/editable_table.js
 - app/assets/javascripts/spree/backend/components/number_with_currency.js
+- app/assets/javascripts/spree/backend/components/selectable_table.js
+- app/assets/javascripts/spree/backend/components/selectable_table/return_items.js
+- app/assets/javascripts/spree/backend/components/selectable_table/summary.js
 - app/assets/javascripts/spree/backend/components/sortable_table.js
 - app/assets/javascripts/spree/backend/components/tabs.js
 - app/assets/javascripts/spree/backend/components/tooltips.js
@@ -223,9 +226,9 @@ files:
 - app/assets/javascripts/spree/backend/progress.js
 - app/assets/javascripts/spree/backend/promotions.js
 - app/assets/javascripts/spree/backend/promotions/activation.js
-- app/assets/javascripts/spree/backend/returns/return_item_selection.js
 - app/assets/javascripts/spree/backend/routes.js
 - app/assets/javascripts/spree/backend/shipments.js
+- app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js
 - app/assets/javascripts/spree/backend/spree-select2.js
 - app/assets/javascripts/spree/backend/stock_management.js
 - app/assets/javascripts/spree/backend/store_credits.js
@@ -246,6 +249,8 @@ files:
 - app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
 - app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
 - app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs
+- app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs
+- app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
@@ -281,6 +286,10 @@ files:
 - app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js
 - app/assets/javascripts/spree/backend/views/tables/editable_table.js
 - app/assets/javascripts/spree/backend/views/tables/editable_table_row.js
+- app/assets/javascripts/spree/backend/views/tables/return_items.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js
 - app/assets/javascripts/spree/backend/views/zones/form.js
 - app/assets/javascripts/spree/backend/zone.js
 - app/assets/stylesheets/spree/backend.css
@@ -389,6 +398,7 @@ files:
 - app/controllers/spree/admin/taxonomies_controller.rb
 - app/controllers/spree/admin/taxons/attachment_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
+- app/controllers/spree/admin/users/api_key_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variant_property_rule_values_controller.rb
 - app/controllers/spree/admin/variants_controller.rb
@@ -616,6 +626,7 @@ files:
 - app/views/spree/admin/shared/named_types/_new.html.erb
 - app/views/spree/admin/shared/preference_fields/_boolean.html.erb
 - app/views/spree/admin/shared/preference_fields/_decimal.html.erb
+- app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb
 - app/views/spree/admin/shared/preference_fields/_integer.html.erb
 - app/views/spree/admin/shared/preference_fields/_password.html.erb
 - app/views/spree/admin/shared/preference_fields/_string.html.erb
@@ -731,116 +742,7 @@ files:
 - lib/spree/backend/engine.rb
 - lib/spree/backend_configuration.rb
 - lib/spree_backend.rb
-- script/rails
 - solidus_backend.gemspec
-- spec/controllers/spree/admin/base_controller_spec.rb
-- spec/controllers/spree/admin/cancellations_controller_spec.rb
-- spec/controllers/spree/admin/customer_returns_controller_spec.rb
-- spec/controllers/spree/admin/locale_controller_spec.rb
-- spec/controllers/spree/admin/missing_products_controller_spec.rb
-- spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
-- spec/controllers/spree/admin/orders_controller_spec.rb
-- spec/controllers/spree/admin/payment_methods_controller_spec.rb
-- spec/controllers/spree/admin/payments_controller_spec.rb
-- spec/controllers/spree/admin/prices_controller_spec.rb
-- spec/controllers/spree/admin/product_properties_controller_spec.rb
-- spec/controllers/spree/admin/products_controller_spec.rb
-- spec/controllers/spree/admin/promotion_actions_controller_spec.rb
-- spec/controllers/spree/admin/promotion_codes_controller_spec.rb
-- spec/controllers/spree/admin/promotion_rules_controller_spec.rb
-- spec/controllers/spree/admin/promotions_controller_spec.rb
-- spec/controllers/spree/admin/refunds_controller_spec.rb
-- spec/controllers/spree/admin/reimbursements_controller_spec.rb
-- spec/controllers/spree/admin/resource_controller_spec.rb
-- spec/controllers/spree/admin/return_authorizations_controller_spec.rb
-- spec/controllers/spree/admin/return_items_controller_spec.rb
-- spec/controllers/spree/admin/root_controller_spec.rb
-- spec/controllers/spree/admin/search_controller_spec.rb
-- spec/controllers/spree/admin/shipping_methods_controller_spec.rb
-- spec/controllers/spree/admin/stock_items_controller_spec.rb
-- spec/controllers/spree/admin/stock_locations_controller_spec.rb
-- spec/controllers/spree/admin/store_credits_controller_spec.rb
-- spec/controllers/spree/admin/users_controller_spec.rb
-- spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/features/admin/configuration/payment_methods_spec.rb
-- spec/features/admin/configuration/shipping_methods_spec.rb
-- spec/features/admin/configuration/stock_locations_spec.rb
-- spec/features/admin/configuration/store_spec.rb
-- spec/features/admin/configuration/tax_categories_spec.rb
-- spec/features/admin/configuration/tax_rates_spec.rb
-- spec/features/admin/configuration/taxonomies_spec.rb
-- spec/features/admin/configuration/zones_spec.rb
-- spec/features/admin/homepage_spec.rb
-- spec/features/admin/javascript_format_money_spec.rb
-- spec/features/admin/locale_spec.rb
-- spec/features/admin/orders/adjustments_promotions_spec.rb
-- spec/features/admin/orders/adjustments_spec.rb
-- spec/features/admin/orders/cancelling_and_resuming_spec.rb
-- spec/features/admin/orders/cancelling_inventory_spec.rb
-- spec/features/admin/orders/customer_details_spec.rb
-- spec/features/admin/orders/customer_returns_spec.rb
-- spec/features/admin/orders/line_items_spec.rb
-- spec/features/admin/orders/listing_spec.rb
-- spec/features/admin/orders/log_entries_spec.rb
-- spec/features/admin/orders/new_order_spec.rb
-- spec/features/admin/orders/new_refund_spec.rb
-- spec/features/admin/orders/order_details_spec.rb
-- spec/features/admin/orders/payments_spec.rb
-- spec/features/admin/orders/return_authorizations_spec.rb
-- spec/features/admin/orders/return_payment_state_spec.rb
-- spec/features/admin/orders/risk_analysis_spec.rb
-- spec/features/admin/orders/shipments_spec.rb
-- spec/features/admin/payments/store_credits_spec.rb
-- spec/features/admin/products/edit/images_spec.rb
-- spec/features/admin/products/edit/products_spec.rb
-- spec/features/admin/products/edit/taxons_spec.rb
-- spec/features/admin/products/edit/variants_spec.rb
-- spec/features/admin/products/option_types_spec.rb
-- spec/features/admin/products/pricing_spec.rb
-- spec/features/admin/products/products_spec.rb
-- spec/features/admin/products/properties_spec.rb
-- spec/features/admin/products/stock_management_spec.rb
-- spec/features/admin/products/variant_spec.rb
-- spec/features/admin/promotion_adjustments_spec.rb
-- spec/features/admin/promotions/option_value_rule_spec.rb
-- spec/features/admin/promotions/product_rule_spec.rb
-- spec/features/admin/promotions/promotion_categories_spec.rb
-- spec/features/admin/promotions/promotion_code_batches_spec.rb
-- spec/features/admin/promotions/promotion_code_spec.rb
-- spec/features/admin/promotions/promotion_spec.rb
-- spec/features/admin/promotions/tiered_calculator_spec.rb
-- spec/features/admin/promotions/user_rule_spec.rb
-- spec/features/admin/reimbursements_spec.rb
-- spec/features/admin/store_credits_spec.rb
-- spec/features/admin/stores_spec.rb
-- spec/features/admin/style_guide_spec.rb
-- spec/features/admin/taxons_spec.rb
-- spec/features/admin/users_spec.rb
-- spec/fixtures/files/ror_ringer.jpeg
-- spec/helpers/admin/base_helper_spec.rb
-- spec/helpers/admin/navigation_helper_spec.rb
-- spec/helpers/admin/stock_movements_helper_spec.rb
-- spec/helpers/admin/store_credit_events_helper_spec.rb
-- spec/helpers/promotion_rules_helper_spec.rb
-- spec/javascripts/fixtures/_boot.html.erb
-- spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb
-- spec/javascripts/fixtures/number_with_currency/without_select.html.erb
-- spec/javascripts/format_money_spec.js
-- spec/javascripts/spec_helper.js
-- spec/javascripts/support/show_errors.js
-- spec/javascripts/support/with_translations.js
-- spec/javascripts/translation_spec.js
-- spec/javascripts/views/number_with_currency_spec.js
-- spec/lib/spree/backend_configuration/menu_item_spec.rb
-- spec/lib/spree/backend_configuration_spec.rb
-- spec/spec_helper.rb
-- spec/support/appear_before_matcher.rb
-- spec/support/feature/base_feature_helper.rb
-- spec/support/feature/order_feature_helper.rb
-- spec/teaspoon_env.rb
-- spec/test_views/spree/admin/widgets/edit.html.erb
-- spec/test_views/spree/admin/widgets/new.html.erb
-- spec/views/spree/admin/shared/navigation_footer_spec.rb
 - vendor/assets/fonts/inter/Inter-Regular.woff
 - vendor/assets/fonts/inter/Inter-Regular.woff2
 - vendor/assets/fonts/inter/Inter-SemiBold.woff
@@ -1006,14 +908,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
-requirements:
-- none
+requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4

data/app/assets/javascripts/spree/backend/returns/return_item_selection.js

@@ -1,35 +0,0 @@
-Spree.ready(function() {
-  function checkAddItemBox() {
-    $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
-    updateSuggestedAmount();
-  }
-
-  function updateSuggestedAmount() {
-    var totalPretaxRefund = 0;
-    var checkedItems = formFields.find('input.add-item:checked');
-    $.each(checkedItems, function(i, checkbox) {
-      totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
-    });
-
-    var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
-    formFields.find('span#total_pre_tax_refund').html(displayTotal);
-  }
-
-  var formFields = $("[data-hook='admin_customer_return_form_fields'], \
-                     [data-hook='admin_return_authorization_form_fields']");
-
-  if(formFields.length > 0) {
-    updateSuggestedAmount();
-
-    formFields.find('input#select-all').on('change', function(ev) {
-      var checkBoxes = $(ev.currentTarget).parents('table:first').find('input.add-item');
-      checkBoxes.prop('checked', this.checked);
-      updateSuggestedAmount();
-    });
-
-    formFields.find('input.add-item').on('change', updateSuggestedAmount);
-    formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
-
-    formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
-  }
-});