solidus_backend 3.1.7 → 3.2.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8903b91d3f4fae6507dfe625e8f9b24874d0dca1112326f34a59d2248ebdc710
-  data.tar.gz: 41efa75c338489bf545c78dbe068a790a2ff65921e3eeaea269f6a35c4c32a78
+  metadata.gz: 7f40b6a70c46a2ad49195d9bfd9642172fea9ec7375b9253adab0f9eaf2bb3c0
+  data.tar.gz: 90b8118323724ba9953ca65dbf44139349a6dafdb59c4e9d7823a8fdff47ef92
 SHA512:
-  metadata.gz: 6392976b28c3318b3e6cac80eed33e2cbcc9ac6e9b502aab43d0214bb6926fe9e2b683b56234aee11f47045f8dbcf192283c5e2eeed4d2eed28790605af43577
-  data.tar.gz: d91c2ec5947013f55f8fa6b5abed42fc7ae9f11bb86cce6f424f63ee4c775da71253bd2d9b2b96269de3ff47448aa82864407e349b8a27bae02659fc3a41f2e0
+  metadata.gz: 2145cf1b419208c84b5a671b67eecde34b56c3cc9efdcd40d43271489855368dcf35268c64fe2d1c08e7977aa81b4eb6472c37eb184d86197b760a3b08a9be6a
+  data.tar.gz: c5e1b38dc22dc6a654dd8e05f3445e8c725ea7d6df2b27544f16dc95a25307e646f8d282e7139c925b83f07d72fc1b2d65c0f8050789e80230f3e91fe4db4ef6

data/README.md

@@ -8,12 +8,7 @@ Backend contains the controllers, views, and assets making up the admin interfac
 
 Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/)
 
-Our scripts are written in a mix of CoffeeScript and JavaScript (ES5). We can't
-easily use a transpiler for ECMAScript >= 6 without adding additional steps for
-applications using solidus\_admin.
-
-Though we have existing CoffeeScript files, any new files should be in
-JavaScript (ES5).
+Any new files should be in JavaScript (ES5).
 
 ### Stylesheets
 

data/app/assets/javascripts/spree/backend/namespaces.js

@@ -8,6 +8,7 @@ _.extend(window.Spree, {
     Cart: {},
     Zones: {},
     Payment: {},
+    Product: {},
     Promotions: {},
     Stock: {},
     Tables: {}

data/app/assets/javascripts/spree/backend/products/index.js

@@ -0,0 +1,7 @@
+Spree.ready(function() {
+  if ($('[data-hook="admin_products_index_search"]').length) {
+    new Spree.Views.Product.Search({
+      el: $('[data-hook="admin_products_index_search"]')
+    })
+  }
+});

data/app/assets/javascripts/spree/backend/shipments.js

@@ -180,7 +180,7 @@ var ShipmentItemView = Backbone.View.extend({
     Spree.ajax({
       type: "GET",
       url: Spree.pathFor('api/variants/' + this.variant_id),
-    }).success(function(variant){
+    }).done(function(variant){
       var split = new ShipmentSplitItemView({
         shipmentItemView: _this,
         shipment_number: _this.shipment_number,

data/app/assets/javascripts/spree/backend/variant_autocomplete.js

@@ -31,9 +31,7 @@
         },
         data: function(term, page) {
           var searchData = {
-            q: {
-              product_name_or_sku_cont: term
-            },
+            variant_search_term: term,
             token: Spree.api_key
           };
           return _.extend(searchData, searchOptions);

data/app/assets/javascripts/spree/backend/views/index.js

@@ -21,6 +21,7 @@
 //= require 'spree/backend/views/payment/new'
 //= require 'spree/backend/views/payment/payment_row'
 //= require 'spree/backend/views/payment/edit_credit_card'
+//= require 'spree/backend/views/product/search'
 //= require 'spree/backend/views/promotions/option_values_rule'
 //= require 'spree/backend/views/tables/editable_table'
 //= require 'spree/backend/views/tables/editable_table_row'

data/app/assets/javascripts/spree/backend/views/product/search.js

@@ -0,0 +1,44 @@
+Spree.Views.Product.Search = Backbone.View.extend({
+  initialize: function() {
+    this.render();
+  },
+
+  events: {
+    "change .js-with-discarded-input": "onChange"
+  },
+
+  onChange: function(e) {
+    const withDiscarded = $(e.target).is(":checked");
+
+    var keptInput = this.$el.find(".js-kept-variant-sku-input input");
+    var allInput = this.$el.find(".js-all-variant-sku-input input");
+
+    if (withDiscarded) {
+      allInput.val(keptInput.val());
+      keptInput.val("");
+    } else {
+      keptInput.val(allInput.val());
+      allInput.val("");
+    }
+
+    allInput.prop("disabled", !withDiscarded)
+    keptInput.prop("disabled", withDiscarded)
+
+    this.render();
+  },
+
+  render: function() {
+    var withDiscarded = this.$el.find(".js-with-discarded-input").is(":checked");
+
+    var keptContainer = this.$el.find(".js-kept-variant-sku-input");
+    var allContainer = this.$el.find(".js-all-variant-sku-input");
+
+    if (withDiscarded) {
+      keptContainer.hide();
+      allContainer.show();
+    } else {
+      keptContainer.show();
+      allContainer.hide();
+    }
+  },
+});

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

@@ -47,6 +47,7 @@
 //= require spree/backend/orders
 //= require spree/backend/payments/edit
 //= require spree/backend/payments/new
+//= require spree/backend/products/index
 //= require spree/backend/product_picker
 //= require spree/backend/progress
 //= require spree/backend/promotions

data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss

@@ -1,5 +1,6 @@
 .number-with-currency {
   $currency-width: 5.5rem;
+  flex-wrap: nowrap;
 
   &-symbol {
     min-width: 2.5em;

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -147,16 +147,17 @@ span.info {
     }
   }
 
-  &.withError {
-    .field_with_errors {
-      label {
-        color: theme-color("danger");
-      }
+  .field_with_errors {
+    label {
+      color: theme-color("danger");
+    }
 
-      input {
-        border-color: theme-color("danger");
-      }
+    input {
+      border-color: theme-color("danger");
     }
+  }
+
+  &.withError {
     .formError {
       color: lighten(theme-color("danger"), 15);
       font-style: italic;

data/app/concerns/spree/admin/sets_user_language_locale_key.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module SetsUserLanguageLocaleKey
+      def set_user_language_locale_key
+        :admin_locale
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/base_controller.rb

@@ -12,9 +12,7 @@ module Spree
 
       # Overrides ControllerHelpers::Common
       # We want the admin's locale selection to be different than that on the frontend
-      def set_user_language_locale_key
-        :admin_locale
-      end
+      include SetsUserLanguageLocaleKey
 
       def action
         params[:action].to_sym
@@ -33,7 +31,7 @@ module Spree
       # Need to generate an API key for a user due to some backend actions
       # requiring authentication to the Spree API
       def generate_admin_api_key
-        if (user = try_spree_current_user) && user.spree_api_key.blank?
+        if (user = spree_current_user) && user.spree_api_key.blank?
           user.generate_spree_api_key!
         end
       end

data/app/controllers/spree/admin/cancellations_controller.rb

@@ -30,7 +30,7 @@ module Spree
       private
 
       def created_by
-        try_spree_current_user.try(:email)
+        spree_current_user.try(:email)
       end
 
       def load_order

data/app/controllers/spree/admin/locale_controller.rb

@@ -3,6 +3,8 @@
 module Spree
   module Admin
     class LocaleController < Spree::Admin::BaseController
+      skip_before_action :authorize_admin, only: [:set]
+
       def set
         requested_locale = params[:switch_to_locale].to_s.presence
 

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -31,7 +31,7 @@ module Spree
             end
 
             unless @order.completed?
-              @order.next
+              @order.contents.advance
               @order.refresh_shipment_rates
             end
 

data/app/controllers/spree/admin/orders_controller.rb

@@ -112,7 +112,7 @@ module Spree
       end
 
       def cancel
-        @order.canceled_by(try_spree_current_user)
+        @order.canceled_by(spree_current_user)
         flash[:success] = t('spree.order_canceled')
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -124,7 +124,7 @@ module Spree
       end
 
       def approve
-        @order.contents.approve(user: try_spree_current_user)
+        @order.contents.approve(user: spree_current_user)
         flash[:success] = t('spree.order_approved')
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -156,7 +156,7 @@ module Spree
 
       def order_params
         {
-          created_by_id: try_spree_current_user.try(:id),
+          created_by_id: spree_current_user.try(:id),
           frontend_viewable: false,
           store_id: current_store.try(:id)
         }.with_indifferent_access

data/app/controllers/spree/admin/prices_controller.rb

@@ -18,7 +18,7 @@ module Spree
           .currently_valid
           .for_variant
           .order(:variant_id, :country_iso, :currency)
-          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+          .page(params[:variants_page]).per(Spree::Config.admin_variants_per_page)
       end
 
       def edit

data/app/controllers/spree/admin/reimbursements_controller.rb

@@ -14,7 +14,7 @@ module Spree
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def perform
-        @reimbursement.perform!(created_by: try_spree_current_user)
+        @reimbursement.perform!(created_by: spree_current_user)
         redirect_to location_after_save
       end
 
@@ -62,7 +62,7 @@ module Spree
       end
 
       def load_simulated_refunds
-        @reimbursement_objects = @reimbursement.simulate(created_by: try_spree_current_user)
+        @reimbursement_objects = @reimbursement.simulate(created_by: spree_current_user)
       end
 
       def spree_core_gateway_error(error)

data/app/controllers/spree/admin/stock_items_controller.rb

@@ -18,7 +18,7 @@ module Spree
         variant = Spree::Variant.accessible_by(current_ability, :show).find(params[:variant_id])
         stock_location = Spree::StockLocation.accessible_by(current_ability, :show).find(params[:stock_location_id])
         stock_location.stock_movements.build(stock_movement_params).tap do |stock_movement|
-          stock_movement.originator = try_spree_current_user
+          stock_movement.originator = spree_current_user
           stock_movement.stock_item = stock_location.set_up_stock_item(variant)
         end
       end

data/app/controllers/spree/admin/store_credits_controller.rb

@@ -17,8 +17,8 @@ module Spree
       def create
         @store_credit = @user.store_credits.build(
           permitted_resource_params.merge({
-            created_by: try_spree_current_user,
-            action_originator: try_spree_current_user
+            created_by: spree_current_user,
+            action_originator: spree_current_user
           })
         )
 
@@ -34,7 +34,7 @@ module Spree
 
       def update
         @store_credit.assign_attributes(permitted_resource_params)
-        @store_credit.created_by = try_spree_current_user
+        @store_credit.created_by = spree_current_user
 
         if @store_credit.save
           respond_to do |format|
@@ -50,7 +50,7 @@ module Spree
       def update_amount
         @store_credit = @user.store_credits.find(params[:id])
         amount = params.require(:store_credit).require(:amount)
-        if @store_credit.update_amount(amount, @store_credit_reason, try_spree_current_user)
+        if @store_credit.update_amount(amount, @store_credit_reason, spree_current_user)
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
@@ -60,7 +60,7 @@ module Spree
 
       def invalidate
         @store_credit = @user.store_credits.find(params[:id])
-        if @store_credit.invalidate(@store_credit_reason, try_spree_current_user)
+        if @store_credit.invalidate(@store_credit_reason, spree_current_user)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
           render_edit_page
@@ -71,7 +71,7 @@ module Spree
 
       def permitted_resource_params
         params.require(:store_credit).permit([:amount, :currency, :category_id, :memo]).
-          merge(created_by: try_spree_current_user)
+          merge(created_by: spree_current_user)
       end
 
       def collection

data/app/controllers/spree/admin/tax_rates_controller.rb

@@ -12,6 +12,17 @@ module Spree
         @available_categories = Spree::TaxCategory.order(:name)
         @calculators = Rails.application.config.spree.calculators.tax_rates
       end
+
+      def collection
+        @search = Spree::TaxRate.ransack(params[:q])
+        @collection = @search.result
+        @collection = @collection
+          .includes(:tax_categories)
+          .order(:zone_id)
+        @collection = @collection
+          .page(params[:page])
+          .per(Spree::Config[:admin_products_per_page])
+      end
     end
   end
 end

data/app/controllers/spree/admin/users_controller.rb

@@ -125,7 +125,7 @@ module Spree
       end
 
       def sign_in_if_change_own_password
-        if try_spree_current_user == @user && @user.password.present?
+        if spree_current_user == @user && @user.password.present?
           sign_in(@user, event: :authentication, bypass: true)
         end
       end

data/app/helpers/spree/admin/products_helper.rb

@@ -3,6 +3,10 @@
 module Spree
   module Admin
     module ProductsHelper
+      def frontend_product_path(product)
+        Spree::Backend::Config[:frontend_product_path].call(self, product)
+      end
+
       def show_rebuild_vat_checkbox?
         Spree::TaxRate.included_in_price.exists?
       end

data/app/helpers/spree/admin/stock_locations_helper.rb

@@ -4,9 +4,7 @@ module Spree
   module Admin
     module StockLocationsHelper
       def admin_stock_location_display_name(stock_location)
-        name_parts = [stock_location.admin_name, stock_location.name]
-        name_parts.delete_if(&:blank?)
-        name_parts.join(' / ')
+        [stock_location.admin_name, stock_location.name].reject(&:blank?).join(' / ')
       end
     end
   end

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

@@ -6,9 +6,11 @@
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
-    <li>
-      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
-    </li>
+    <% if can?(:create, Spree::AdjustmentReason) %>
+      <li>
+        <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      </li>
+    <% end %>
   </ul>
 <% end %>
 
@@ -38,7 +40,9 @@
             </span>
           </td>
           <td class="actions">
-            <%= link_to_edit adjustment_reason, no_text: true %>
+            <% if can? :edit, adjustment_reason %>
+              <%= link_to_edit adjustment_reason, no_text: true %>
+            <% end %>
           </td>
         </tr>
       <% end %>

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

@@ -12,7 +12,7 @@
 
 <%= render partial: 'adjustments_table' %>
 
-<% if @order.can_add_coupon? %>
+<% if @order.can_add_coupon? && can?(:update, @order) %>
   <div data-hook="adjustments_new_coupon_code">
     <%= text_field_tag "coupon_code", "", placeholder: t('spree.coupon_code') %>
     <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>

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

@@ -7,7 +7,7 @@
   <li>
     <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
   </li>
-<% end if can? :manage, Spree::Order %>
+<% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter_title do %>
   <%= t('spree.filter') %>
@@ -70,8 +70,8 @@
 
             <div class="col-12 col-xl-6">
               <div class="field">
-                <%= label_tag :q_bill_address_name_start, t('spree.name_contains') %>
-                <%= f.text_field :bill_address_name_start, size: 25 %>
+                <%= label_tag :q_bill_address_name_cont, t('spree.name_contains') %>
+                <%= f.text_field :bill_address_name_cont, size: 25 %>
               </div>
             </div>
 
@@ -191,11 +191,9 @@
   </table>
 <% else %>
   <div class="no-objects-found">
-    <% if can? :manage, Spree::Order %>
-      <%= render 'spree/admin/shared/no_objects_found',
-                   resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path %>
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+               resource: Spree::Order,
+               new_resource_url: spree.new_admin_order_path %>
   </div>
 <% end %>
 

data/app/views/spree/admin/prices/_master_variant_table.html.erb

@@ -1,9 +1,9 @@
-<%= paginate master_prices, theme: "solidus_admin" %>
-
 <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
   <% if variants %>
-    <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
+    <legend align="center"><%= t(".master_variant") %> <%= admin_hint t(".master_variant"), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
   <% end %>
+
+  <%= paginate master_prices, theme: "solidus_admin" %>
   <table class="index master_prices">
     <colgroup>
       <col style="width: 30%">
@@ -25,7 +25,7 @@
         <td><%= price.currency %></td>
         <td><%= price.money.to_html %></td>
         <td class="actions">
-          <% if can?(:update, price) %>
+          <% if can?(:edit, price) %>
             <%= link_to_edit(price, no_text: true) unless price.discarded? %>
           <% end %>
           <% if can?(:destroy, price) %>
@@ -36,6 +36,5 @@
       </tr>
     <% end %>
   </table>
+  <%= paginate master_prices, theme: "solidus_admin" %>
 </fieldset>
-
-<%= paginate master_prices, theme: "solidus_admin" %>

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

@@ -1,7 +1,7 @@
-<%= paginate variant_prices, theme: "solidus_admin" %>
+<fieldset class="no-border-bottom" data-hook="variant_prices_table">
+  <legend align="center"><%= t(".variant_pricing") %></legend>
 
-<fieldset class="no-border-bottom">
-  <legend align="center"><%= I18n.t(:variant_pricing, scope: :spree) %></legend>
+  <%= paginate variant_prices, theme: "solidus_admin", param_name: :variants_page %>
   <table class="index prices">
     <thead data-hook="prices_header">
       <tr>
@@ -20,7 +20,7 @@
           <td><%= price.currency %></td>
           <td><%= price.money.to_html %></td>
           <td class="actions">
-            <% if can?(:update, price) %>
+            <% if can?(:edit, price) %>
               <%= link_to_edit(price, no_text: true) unless price.discarded? %>
             <% end %>
             <% if can?(:destroy, price) %>
@@ -32,6 +32,5 @@
       <% end %>
     </tbody>
   </table>
+  <%= paginate variant_prices, theme: "solidus_admin", param_name: :variants_page %>
 </fieldset>
-
-<%= paginate variant_prices, theme: "solidus_admin" %>

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

@@ -4,9 +4,9 @@
       <%= link_to t('spree.new_product'), new_object_url, id: 'admin_new_product', class: 'btn btn-primary' %>
     </li>
   <% end %>
-  <% if defined?(Spree::Frontend::Engine) %>
+  <% if frontend_product_path(@product) %>
     <li id="view_product_link">
-      <%= link_to t('spree.view_product'), spree.product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
+      <%= link_to t('spree.view_product'), frontend_product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
     </li>
   <% end %>
 <% end %>

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

@@ -26,15 +26,21 @@
 
           <div class="col-4">
             <div class="field">
-              <%= f.label :with_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
-              <%= f.text_field :with_variant_sku_cont, size: 15 %>
+              <div class="js-kept-variant-sku-input">
+                <%= f.label :with_kept_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+                <%= f.text_field :with_kept_variant_sku_cont, size: 15 %>
+              </div>
+              <div class="js-all-variant-sku-input">
+                <%= f.label :with_all_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+                <%= f.text_field :with_all_variant_sku_cont, size: 15 %>
+              </div>
             </div>
           </div>
 
           <div class="col-2">
             <div class="field checkbox">
               <label>
-                <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true' }, 'true', 'false' %>
+                <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true', class: 'js-with-discarded-input' }, 'true', 'false' %>
                 <%= t('spree.show_deleted') %>
               </label>
             </div>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -19,13 +19,15 @@
 
     <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
-        <div id="promotion-policy-select" class="align-center row">
-          <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-            <div class="col-6">
-              <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
-            </div>
-          <% end %>
-        </div>
+        <% if Spree::Config.allow_promotions_any_match_policy %>
+          <div id="promotion-policy-select" class="align-center row">
+            <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
+              <div class="col-6">
+                <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
 
         <div id="rules" class="filter_list">
           <% if @promotion.rules.any? %>

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

@@ -99,10 +99,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= promotion.starts_at.to_s(:long) if promotion.starts_at %>
+            <%= Spree::RailsCompatibility.to_fs(promotion.starts_at, :long) if promotion.starts_at %>
           </td>
           <td>
-            <%= promotion.expires_at.to_s(:long) if promotion.expires_at %>
+            <%= Spree::RailsCompatibility.to_fs(promotion.expires_at, :long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -10,7 +10,7 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :amount %><br/>
-          <%= @refund.amount %>
+          <%= @refund.display_amount %>
         </div>
       </div>
       <div class="col-3">

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

@@ -41,7 +41,7 @@
 <%= render "spree/admin/shared/js_locale_data" %>
 
 <%= javascript_tag do -%>
-  Spree.api_key = "<%= try_spree_current_user.try(:spree_api_key) %>";
+  Spree.api_key = "<%= spree_current_user.try(:spree_api_key) %>";
   Spree.env = "<%= Rails.env %>";
 <% end %>
 

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

@@ -7,7 +7,11 @@
         <span class="text"><%= t('spree.minimize_menu') %></span>
       <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
-      <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% if lookup_context.exists?('spree/admin/shared/_navigation_footer') %>
+        <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% else %>
+        <%= render partial: 'spree/admin/shared/navigation_footer_fallback' %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/shared/{_navigation_footer.html.erb → _navigation_footer_fallback.html.erb}

@@ -3,18 +3,18 @@
      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 %>
+<% if spree_current_user %>
   <ul id="login-nav" class="admin-login-nav">
     <li data-hook="user-account-link">
-      <% if can?(:admin, try_spree_current_user) %>
-        <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
+      <% if can?(:admin, spree_current_user) %>
+        <%= link_to spree.edit_admin_user_path(spree_current_user) do %>
           <i class='fa fa-user'></i>
-          <%= try_spree_current_user.email %>
+          <%= spree_current_user.email %>
         <% end %>
       <% else %>
         <a>
           <i class='fa fa-user'></i>
-          <%= try_spree_current_user.email %>
+          <%= spree_current_user.email %>
         </a>
       <% end %>
     </li>

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) %>" data-variant-sku="<%= variant.sku %>">
+                <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?(:edit, Spree::StockItem) %>" data-variant-sku="<%= variant.sku %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

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

@@ -6,9 +6,11 @@
 
 <% content_for :page_actions do %>
   <ul class='actions inline-menu'>
-    <li>
-      <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
-    </li>
+    <% if can?(:create, Spree::StoreCreditReason) %>
+      <li>
+        <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      </li>
+    <% end %>
   </ul>
 <% end %>
 

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

@@ -70,6 +70,6 @@
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StoreCredit,
-                 new_resource_url: new_object_url %>
+                 new_resource_url: spree.new_admin_user_store_credit_url %>
   </div>
 <% end %>

data/app/views/spree/admin/store_credits/show.html.erb

@@ -72,9 +72,10 @@
       <col style="width: 20%;" />
       <col style="width: 10%;" />
       <col style="width: 10%;" />
-      <col style="width: 25%;" />
+      <col style="width: 20%;" />
+      <col style="width: 10%;" />
       <col style="width: 10%;" />
-      <col style="width: 25%;" />
+      <col style="width: 20%;" />
     </colgroup>
     <thead>
       <tr>
@@ -84,7 +85,7 @@
         <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:amount_remaining) %></th>
-        <th><%= Spree::StoreCreditReason.human_attribute_name(:name) %></th>
+        <th><%= t('spree.admin.store_credits.reason_for_updating') %></th>
       </tr>
     </thead>
     <tbody>

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

@@ -13,7 +13,35 @@
   <% end %>
 <% end %>
 
+<% content_for :table_filter_title do %>
+  <%= t("spree.filter") %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= search_form_for [:admin, @search], url: spree.admin_tax_rates_path do |f| %>
+    <div class= "row">
+      <div class="col-md-6">
+        <div class="field">
+          <%= f.label :zone_id_eq, Spree::Zone.model_name.human %>
+          <%= f.collection_select :zone_id_eq, @available_zones, :id, :name, { include_blank: t("spree.all") }, class: 'select2 fullwidth' %>
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="field">
+          <%= f.label :tax_categories_id_eq, Spree::TaxCategory.model_name.human %>
+          <%= f.collection_select :tax_categories_id_eq, @available_categories, :id, :name, { include_blank: t("spree.all") }, class: 'select2 fullwidth' %>
+        </div>
+      </div>
+    </div>
+    <div class="filter-actions">
+      <%= button_tag t("spree.filter_results"), class: "btn btn-primary" %>
+    </div>
+  <% end %>
+<% end %>
+
 <% if @tax_rates.any? %>
+  <%= paginate @tax_rates, scope: spree, theme: "solidus_admin" %>
+
   <table class="index">
     <colgroup>
       <col style="width: 15%">
@@ -55,7 +83,7 @@
         <td><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
-        <td><%=tax_rate.calculator.to_s %></td>
+        <td><%=tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
             <%= link_to_edit tax_rate, no_text: true %>
@@ -68,6 +96,8 @@
       <% end %>
     </tbody>
   </table>
+
+  <%= paginate @tax_rates, scope: spree, theme: "solidus_admin" %>
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',

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

@@ -32,7 +32,7 @@
     <% if @user.spree_api_key.present? %>
       <div id="current-api-key">
         <strong><%= t('.key') %>: </strong>
-        <% if @user == try_spree_current_user %>
+        <% if @user == spree_current_user %>
           <%= @user.spree_api_key %>
         <% else %>
           <i>(<%= t('spree.hidden') %>)</i>

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

@@ -87,10 +87,10 @@
         <td class="align-center"><%= l user.created_at.to_date %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
-            <%= link_to_edit user, no_text: true %>
+            <%= link_to_edit user, no_text: true, url: spree.admin_user_path(user) %>
           <% end %>
-          <% if can?(:destroy, user) && user.orders.none? %>
-            <%= link_to_delete user, no_text: true %>
+          <% if can?(:destroy, user) && user.can_be_deleted? %>
+            <%= link_to_delete user, no_text: true, url: spree.admin_user_path(user) %>
           <% end %>
         </td>
       </tr>

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

@@ -17,7 +17,8 @@
       </div>
     </div>
   </fieldset>
-  <fieldset class="no-border-top no-border-bottom">
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".options") %></legend>
     <div class="row">
       <% @product.option_types.each_with_index do |option_type, index| %>
           <div class="col-3">
@@ -41,7 +42,8 @@
 </div>
 
 <div data-hook="admin_variant_form_additional_fields">
-  <fieldset class="no-border-top no-border-bottom">
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".properties") %></legend>
     <div class="row">
       <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
         <div class="col-3">
@@ -58,8 +60,9 @@
 </div>
 
 <div data-hook="admin_variant_form_fields">
-  <fieldset class="no-border-top no-border-bottom">
-    <p> <%== t('.pricing_hint') %> </p>
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".pricing") %></legend>
+    <div class="alert alert-info"><%= t('.pricing_hint') %></div>
 
     <div class="row">
       <div class="col-3">

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

@@ -3,10 +3,9 @@
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
     <col style="width: 5%" />
-    <col style="width: 25%" />
-    <col style="width: 20%" />
+    <col style="width: 35%" />
     <col style="width: 20%" />
-    <col style="width: 15%" />
+    <col style="width: 25%" />
     <col style="width: 15%" />
   </colgroup>
   <thead data-hook="variants_header">
@@ -27,7 +26,7 @@
         <% end %>
       </td>
       <td><%= variant.options_text %></td>
-      <td><%= variant.display_price.to_html %></td>
+      <td><%= variant.display_price&.to_html %></td>
       <td><%= variant.sku %></td>
       <td class="actions">
         <% if can?(:update, variant) %>
@@ -40,9 +39,11 @@
       </td>
     </tr>
     <% end %>
-    <% if variants.empty? %>
-      <tr><td colspan="4"><%= t('spree.none') %></td></tr>
-    <% end %>
   </tbody>
 </table>
+<% if variants.empty? %>
+  <div class="alert alert-warning">
+    <%= t('.no_variants_found', term: params[:variant_search_term]) %>
+  </div>
+<% end %>
 <%= paginate variants, theme: "solidus_admin" %>

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

@@ -4,14 +4,13 @@
 
 <% 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, t('spree.variant_search_placeholder') %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+    <div class="row">
+      <div class="col-10">
+        <div data-hook="admin_variants_index_search" class="field">
+          <%= 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>
-    </div>
-
-    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,10 +19,10 @@
           </label>
         </div>
       </div>
-    <% end %>
+    </div>
 
     <div class="actions filter-actions">
-      <%= f.button :search %>
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
     </div>
   <% end %>
 <% end %>

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

@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<% if @product.variants.with_discarded.any? %>
+<% if @product.variants.with_discarded.any? || params[:variant_search_term].present? %>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
 <% else %>

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

@@ -6,6 +6,7 @@
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset class="no-border-top" data-hook="admin_variant_new_form">
+    <legend><%= t('.new_variant') %></legend>
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/lib/spree/backend.rb

@@ -4,7 +4,6 @@ require 'spree_core'
 require 'spree_api'
 
 require 'jquery-rails'
-require 'coffee-rails'
 require 'sassc-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'

data/lib/spree/backend_configuration.rb

@@ -6,6 +6,16 @@ module Spree
   class BackendConfiguration < Preferences::Configuration
     preference :locale, :string, default: I18n.default_locale
 
+    preference :frontend_product_path,
+      :proc,
+      default: proc {
+        ->(template_context, product) {
+          return unless template_context.spree.respond_to?(:product_path)
+
+          template_context.spree.product_path(product)
+        }
+      }
+
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,
                             :customer_returns, :adjustments, :customer_details]

data/solidus_backend.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata['rubygems_mfa_required'] = 'true'
+
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|script)/})
   end
@@ -24,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'coffee-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'

data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-CA.js

@@ -0,0 +1,10 @@
+/**
+ * Select2 English Canada translations
+ */
+(function ($) {
+    "use strict";
+
+    $.fn.select2.locales['en-CA'] = {};
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['en-CA']);
+})(jQuery);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.2.0.alpha
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.2.0.alpha
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.7
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0.alpha
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +215,7 @@ files:
 - app/assets/javascripts/spree/backend/payments/edit.js
 - app/assets/javascripts/spree/backend/payments/new.js
 - app/assets/javascripts/spree/backend/product_picker.js
+- app/assets/javascripts/spree/backend/products/index.js
 - app/assets/javascripts/spree/backend/progress.js
 - app/assets/javascripts/spree/backend/promotions.js
 - app/assets/javascripts/spree/backend/promotions/activation.js
@@ -285,6 +272,7 @@ files:
 - app/assets/javascripts/spree/backend/views/payment/edit_credit_card.js
 - app/assets/javascripts/spree/backend/views/payment/new.js
 - app/assets/javascripts/spree/backend/views/payment/payment_row.js
+- app/assets/javascripts/spree/backend/views/product/search.js
 - app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js
 - app/assets/javascripts/spree/backend/views/state_select.js
 - app/assets/javascripts/spree/backend/views/stock/add_stock_item.js
@@ -352,6 +340,7 @@ files:
 - app/assets/stylesheets/spree/backend/shared/_utilities.scss
 - app/assets/stylesheets/spree/backend/spree_admin.scss
 - app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss
+- app/concerns/spree/admin/sets_user_language_locale_key.rb
 - app/controllers/spree/admin/adjustment_reasons_controller.rb
 - app/controllers/spree/admin/adjustments_controller.rb
 - app/controllers/spree/admin/base_controller.rb
@@ -599,7 +588,7 @@ files:
 - app/views/spree/admin/shared/_menu.html.erb
 - app/views/spree/admin/shared/_modal.html.erb
 - app/views/spree/admin/shared/_navigation.html.erb
-- app/views/spree/admin/shared/_navigation_footer.html.erb
+- app/views/spree/admin/shared/_navigation_footer_fallback.html.erb
 - app/views/spree/admin/shared/_navigation_header.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
 - app/views/spree/admin/shared/_no_objects_found.html.erb
@@ -772,6 +761,7 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_de.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_el.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-AU.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-CA.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-GB.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-IN.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-NZ.js
@@ -904,7 +894,8 @@ files:
 homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: