solidus_backend 2.11.1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa06c5143ed4281567a88b1a3237c63e96c608a32c4f3d11ee54811f6b776108
-  data.tar.gz: 479a858bb8c4e43936ecee55d573ebd15228772438c461e86c95ed5a4d65f91d
+  metadata.gz: 9d883e31d8d9dc7f660154fb30d230147d6a0058295efd2b89f136dcfb90bc53
+  data.tar.gz: 37e837f85e4333dfbf3f6dbfed46f27a8470df725606864c397888277b22e6d8
 SHA512:
-  metadata.gz: f96eb0492d0bc0af33cd16e7a6f25b4d3c43164683fd6d3f5572062af4bb65fff5ba651930ee2b2b1da564a6c5769ab3cf78bc9dfb0da9b0e922087b4d2ab16c
-  data.tar.gz: 1605c6b1a664c1703a776fd1669bd17c946d826e7fec078f15e74f77d7973071e0ea0385e13a7277efb4f8dc9c92d016733da1da6cddc33f4007c58c9e93b547
+  metadata.gz: ad08af46b9ceb6d01a71d924acbf52d56035a1122eaa84628b33dd8132e86cb8d05066b32cb81cebc609d3dc1887a3863f211d7bd078eea2f1587dfb89dc2df6
+  data.tar.gz: 9d395e27b06456a0c706035ecaa52f6af4a278b946c561de41ea7b9f502ac3a2f136644f6492e725119a017f1a950bb119d6fbf962870ac7c20dc8a6a95a6887

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

@@ -51,7 +51,6 @@
 //= require spree/backend/progress
 //= require spree/backend/promotions
 //= require spree/backend/promotions/activation
-//= require spree/backend/routes
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
 //= require spree/backend/stock_management

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

@@ -1,4 +1,3 @@
-//= require spree/backend/routes
 //= require spree/backend/models/shipment
 
 Spree.Collections.Shipments = Backbone.Collection.extend({

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

@@ -1,5 +1,3 @@
-//= require spree/backend/routes
-
 Spree.Models.LineItem = Backbone.Model.extend({
   defaults: {
     quantity: 1

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

@@ -1,4 +1,3 @@
-//= require spree/backend/routes
 //= require spree/backend/collections/line_items
 //= require spree/backend/collections/shipments
 //= require spree/backend/models/address

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

@@ -28,7 +28,7 @@ $.fn.userAutocomplete = function () {
           q: {
             m: 'or',
             email_start: term,
-            firstname_or_lastname_start: term
+            name_start: term
           }
         };
       },

data/app/assets/javascripts/spree/backend/views/order/customer_select.js

@@ -34,7 +34,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
             q: {
               m: 'or',
               email_start: term,
-              firstname_or_lastname_start: term
+              name_start: term
             }
           }
         },

data/app/assets/javascripts/spree/backend/views/tables/return_items.js

@@ -4,6 +4,11 @@ Spree.Views.Tables.ReturnItems = Backbone.View.extend({
       var tfoot = document.createElement('tfoot')
       new Spree.Views.Tables.SelectableTable.SumReturnItemAmount({el: tfoot, model: this.model});
       this.$el.append(tfoot);
+
+      this.$el.find('input, select').not('.add-item').on('change', function(e) {
+        $(this).closest('tr').find('input.add-item').prop('checked', true)
+          .change();
+      });
     }
   },
 })

data/app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js

@@ -15,8 +15,11 @@ Spree.Views.Tables.SelectableTable.SumReturnItemAmount = Backbone.View.extend({
   },
 
   totalSelectedReturnItemAmount: function () {
-    var totalAmount = 0.00;
+    var totalAmount = 0;
     var selectedItems = [];
+    var decimals = 0;
+    var separator = Spree.t('currency_separator');
+    var amount, decimalAmount;
 
     if(this.model.get('allSelected')) {
       selectedItems = $('.selectable');
@@ -24,9 +27,13 @@ Spree.Views.Tables.SelectableTable.SumReturnItemAmount = Backbone.View.extend({
       selectedItems = $(this.model.attributes.selectedItems);
     }
     selectedItems.each(function(_, selectedItem){
-      totalAmount += $(selectedItem).data('price');
+      amount = $(selectedItem).data('price');
+      decimalAmount = amount.toString().split(separator)[1] || '';
+      decimals = Math.max(decimals, decimalAmount.length);
+
+      totalAmount += parseFloat(amount);
     })
 
-    return totalAmount;
+    return accounting.formatNumber(totalAmount, decimals, Spree.t('currency_delimiter'), separator);
   },
 });

data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss

@@ -13,7 +13,7 @@ $secondary:        $color-dark-accent !default;
 $blue:   $color-primary !default;
 $red:    $color-red !default;
 $orange: $color-yellow !default;
-$green:  $color-success !default;
+$green:  $color-green !default;
 
 // Body
 //

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

@@ -1,3 +1,65 @@
+$color-action-success-bg: theme-color-level(success, -10) !default;
+$color-action-success-brd: theme-color-level(success, -9) !default;
+$color-action-warning-bg: theme-color-level(warning, -10) !default;
+$color-action-warning-brd: theme-color-level(warning, -9) !default;
+$color-action-danger-bg: theme-color-level(danger, -10) !default;
+$color-action-danger-brd: theme-color-level(danger, -9) !default;
+
+$color-action-edit-bg: $color-action-success-bg !default;
+$color-action-edit-brd: $color-action-success-brd !default;
+$color-action-clone-bg: $color-action-warning-bg !default;
+$color-action-clone-brd: $color-action-warning-brd !default;
+$color-action-remove-bg: $color-action-danger-bg !default;
+$color-action-remove-brd: $color-action-danger-brd !default;
+$color-action-void-bg: $color-action-danger-bg !default;
+$color-action-void-brd: $color-action-danger-brd !default;
+$color-action-cancel-bg: $color-action-warning-bg !default;
+$color-action-cancel-brd: $color-action-warning-brd !default;
+$color-action-capture-bg: $color-action-success-bg !default;
+$color-action-capture-brd: $color-action-success-brd !default;
+$color-action-save-bg: $color-action-success-bg !default;
+$color-action-save-brd: $color-action-success-brd !default;
+$color-action-mail-bg: $color-action-success-bg !default;
+$color-action-mail-brd: $color-action-success-brd !default;
+$color-action-failure-bg: $color-action-danger-bg !default;
+$color-action-failure-brd: $color-action-danger-brd !default;
+
+$actions: (
+  edit,
+  clone,
+  remove,
+  void,
+  capture,
+  save,
+  cancel,
+  mail,
+  failure
+) !default;
+
+$actions-bg-colors: (
+  $color-action-edit-bg,
+  $color-action-clone-bg,
+  $color-action-remove-bg,
+  $color-action-void-bg,
+  $color-action-capture-bg,
+  $color-action-save-bg,
+  $color-action-cancel-bg,
+  $color-action-mail-bg,
+  $color-action-failure-bg
+) !default;
+
+$actions-brd-colors: (
+  $color-action-edit-brd,
+  $color-action-clone-brd,
+  $color-action-remove-brd,
+  $color-action-void-brd,
+  $color-action-capture-brd,
+  $color-action-save-brd,
+  $color-action-cancel-brd,
+  $color-action-mail-brd,
+  $color-action-failure-brd
+) !default;
+
 table tbody tr {
   &.highlight {
 

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

@@ -44,16 +44,16 @@
   color: $body-color;
 
   &.notice {
-    background-color: rgba(lighten($color-notice, 15), .95);
-    border-top-color: $color-notice;
+    background-color: rgba(theme-color-level(warning, -8), .95);
+    border-top-color: theme-color(warning);
   }
   &.success {
-    background-color: rgba(lighten($color-success, 30), .95);
-    border-top-color: $color-success;
+    background-color: rgba(theme-color-level(success, -10), .95);
+    border-top-color: theme-color(success);
   }
   &.error {
-    background-color: rgba(lighten($color-error, 30), .95);
-    border-top-color: $color-error;
+    background-color: rgba(theme-color-level(danger, -8), .95);
+    border-top-color: theme-color(danger);
   }
 }
 

data/app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss

@@ -1,24 +1,7 @@
-// Numbered colors variables are deprecated and will be removed in Solidus v3.0
-@include solidus-deprecated-variable("color-1", "color-white");
-$color-1:    $color-white !default;
-
-@include solidus-deprecated-variable("color-2", "color-primary");
-$color-2:    $color-primary !default;
-
-@include solidus-deprecated-variable("color-3", "color-dark-light");
-$color-3:    $color-dark-light !default;
-
-@include solidus-deprecated-variable("color-4", "color-dark");
-$color-4:    $color-dark !default;
-
-@include solidus-deprecated-variable("color-5", "color-red");
-$color-5:    $color-red !default;
-
-@include solidus-deprecated-variable("color-6", "color-yellow");
-$color-6:    $color-yellow !default;
-
-@include solidus-deprecated-variable("color-7", "color-light");
-$color-7:    $color-light !default;
-
-@include solidus-deprecated-variable("color-8", "color-dark-light");
-$color-8:    $color-dark-light !default;
+// This is a good place where we can deprecate scss variables.
+// The deprecation will be shown when scss is precompiled
+// only if deprecated variables are redefined in a custom
+// variables_override.scss file of the host application.
+// E.g.
+//
+// @include solidus-deprecated-variable("deprecated-variable", "new-variable");

data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss

@@ -11,7 +11,7 @@ $output-solidus-deprecation-warnings: true !default;
   @if $output-solidus-deprecation-warnings == true {
     @if global-variable-exists($variable) {
       @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
-        "removed in 3.0.0. Please use Bootstraps $#{$replacement} instead";
+        "removed in 3.0.0. Please use Bootstraps #{$replacement} instead";
     }
   }
 }

data/app/assets/stylesheets/spree/backend/globals/_functions.scss

@@ -1,20 +1,3 @@
-// Make color very close to white
-@function very-light($color, $adjust: 3){
-  @warn "The `very-light` function is deprecated. Please use the default sass `lighten` function, instead.";
-  
-  @if type-of($adjust) == 'number' and $adjust > 0 {
-    @for $i from 0 through 100 {
-      @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
-        @return lighten($color, $i - $adjust);
-      }
-    }
-  }
-  @else {
-    @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
-  }
-  @return $color;
-};
-
 // Quick fix for dynamic variables missing in SASS
 @function get-value($prop, $val, $search) {
   $n1: index($prop, $search);

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -62,11 +62,8 @@ $color-tab-active-bg:           $color-white !default;
 $color-tab-active-border:       $color-white !default;
 
 // Basic flash colors
-@include bs-deprecated-variable("color-success", "brand-success");
 $color-success:                 $color-green !default;
-@include bs-deprecated-variable("color-notice", "brand-warning");
 $color-notice:                  $color-yellow !default;
-@include bs-deprecated-variable("color-error", "brand-danger");
 $color-error:                   $color-red !default;
 
 // Breadcrumb custom variable
@@ -113,26 +110,6 @@ $color-pill-warning-text: $color-pill-text;
 $color-pill-error: #ff967b;
 $color-pill-error-text: $color-pill-text;
 
-// Actions colors
-$color-action-edit-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-edit-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-clone-bg:          lighten($color-notice,  (5 * 5)  ) !default;
-$color-action-clone-brd:         lighten($color-notice,  (15 * 5) ) !default;
-$color-action-remove-bg:         lighten($color-error,   (5 * 5)  ) !default;
-$color-action-remove-brd:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-bg:           lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-brd:          lighten($color-error,   (20 * 5) ) !default;
-$color-action-cancel-bg:         lighten($color-notice,  (10 * 5) ) !default;
-$color-action-cancel-brd:        lighten($color-notice,  (20 * 5) ) !default;
-$color-action-capture-bg:        lighten($color-success, (5 * 5)  ) !default;
-$color-action-capture-brd:       lighten($color-success, (20 * 5) ) !default;
-$color-action-save-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-save-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-mail-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-mail-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-failure-bg:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-failure-brd:       lighten($color-error,   (20 * 5) ) !default;
-
 // Available states
 $states: (
   active,
@@ -160,11 +137,6 @@ $states: (
   void
 ) !default;
 
-// Available actions
-$actions: edit, clone, remove, void, capture, save, cancel, mail, failure !default;
-$actions-bg-colors: $color-action-edit-bg, $color-action-clone-bg, $color-action-remove-bg, $color-action-void-bg, $color-action-capture-bg, $color-action-save-bg, $color-action-cancel-bg, $color-action-mail-bg, $color-action-failure-bg !default;
-$actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-action-remove-brd, $color-action-void-brd, $color-action-capture-brd, $color-action-save-brd, $color-action-cancel-brd, $color-action-mail-brd, $color-action-failure-brd !default;
-
 // Sidebar
 //--------------------------------------------------------------
 $width-sidebar:                  200px !default;

data/app/assets/stylesheets/spree/backend/sections/_orders.scss

@@ -64,10 +64,6 @@
   margin-bottom: 15px;
 }
 
-label[for="order_bill_address_attributes_firstname"] {
-  margin-top: 53.5px;
-}
-
 label[for="order_bill_address_attributes_name"] {
   margin-top: 53.5px;
 }

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -19,7 +19,6 @@
 @import 'spree/backend/shared/header';
 @import 'spree/backend/shared/utilities';
 
-@import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/breadcrumb';
 @import 'spree/backend/components/buttons';

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

@@ -3,8 +3,6 @@
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
-      helper 'spree/admin/payments'
-
       before_action :initialize_order_events
       before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
       around_action :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]

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

@@ -50,20 +50,8 @@ module Spree
         super.ordered_by_position
       end
 
-      def load_providers
-        Spree::Deprecation.warn('load_providers is deprecated. Please use load_payment_method_types instead.', caller)
-        load_payment_method_types
-      end
-
       def load_payment_method_types
         @payment_method_types = Rails.application.config.spree.payment_methods.sort_by(&:name)
-        # TODO: Remove `@providers` instance var once `load_providers` gets removed.
-        @providers = @payment_method_types
-      end
-
-      def validate_payment_provider
-        Spree::Deprecation.warn('validate_payment_provider is deprecated. Please use validate_payment_method_type instead.', caller)
-        validate_payment_method_type
       end
 
       def validate_payment_method_type

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

@@ -10,6 +10,7 @@ module Spree
       helper_method :clone_object_url
       before_action :split_params, only: [:create, :update]
       before_action :normalize_variant_property_rules, only: [:update]
+      before_action :set_default_tax_category, only: [:new, :edit]
 
       def show
         redirect_to action: :edit
@@ -46,6 +47,10 @@ module Spree
 
       private
 
+      def set_default_tax_category
+        @product.tax_category_id ||= @default_tax_category&.id
+      end
+
       def split_params
         if params[:product][:taxon_ids].present?
           params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')

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

@@ -11,8 +11,9 @@ module Spree
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def create
-        @refund.attributes = refund_params.merge(perform_after_create: false)
-        if @refund.save && @refund.perform!
+        @refund.attributes = refund_params
+
+        if @refund.valid? && @refund.perform!
           flash[:success] = flash_message_for(@refund, :successfully_created)
           respond_with(@refund) do |format|
             format.html { redirect_to location_after_save }

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

@@ -94,8 +94,6 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     destroy_result =
       if @object.respond_to?(:discard)
         @object.discard
-      elsif @object.respond_to?(:paranoia_destroy)
-        @object.paranoia_destroy
       else
         @object.destroy
       end
@@ -148,11 +146,6 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     self.class.parent_data[:model_name].gsub('spree/', '')
   end
 
-  def model_name
-    Spree::Deprecation.warn('model_name is deprecated. Please use parent_model_name instead.', caller)
-    parent_model_name
-  end
-
   def object_name
     controller_name.singularize
   end
@@ -185,21 +178,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
   end
 
-  def parent_data
-    Spree::Deprecation.warn('parent_data is deprecated without replacement.', caller)
-    self.class.parent_data
-  end
-
   def parent
-    if parent?
-      @parent ||= self.class.parent_data[:model_class]
-                    .includes(self.class.parent_data[:includes])
-                    .find_by!(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
-      instance_variable_set("@#{parent_model_name}", @parent)
-    else
-      Spree::Deprecation.warn "Calling #parent is deprecated on a ResourceController which has not defined a belongs_to"
-      nil
-    end
+    @parent ||= self.class.parent_data[:model_class]
+                  .includes(self.class.parent_data[:includes])
+                  .find_by!(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
+    instance_variable_set("@#{parent_model_name}", @parent)
   rescue ActiveRecord::RecordNotFound => e
     resource_not_found(flash_class: e.model.constantize, redirect_url: spree.polymorphic_url([:admin, parent_model_name.pluralize]))
   end

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

@@ -16,7 +16,7 @@ module Spree
           @users = Spree.user_class.ransack({
             m: 'or',
             email_start: params[:q],
-            firstname_or_lastname_start: params[:q]
+            name_start: params[:q]
           }).result.limit(10)
         end
       end

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

@@ -81,40 +81,6 @@ module Spree
         @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
-      def generate_api_key
-        Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-          The route or controller action you are using is deprecated.
-
-          Instead of:
-          generate_api_key_admin_user PUT    /admin/users/:id/generate_api_key
-
-          Please use:
-          admin_user_api_key          POST   /admin/users/:user_id/api_key
-        WARN
-
-        if @user.generate_spree_api_key!
-          flash[:success] = t('spree.admin.api.key_generated')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
-      def clear_api_key
-        Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-          The route or controller action you are using is deprecated.
-
-          Instead of:
-          clear_api_key_admin_user PUT    /admin/users/:id/clear_api_key
-
-          Please use:
-          admin_user_api_key       DELETE /admin/users/:user_id/api_key
-        WARN
-
-        if @user.clear_spree_api_key!
-          flash[:success] = t('spree.admin.api.key_cleared')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
       def model_class
         Spree.user_class
       end

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

@@ -42,99 +42,6 @@ module Spree
         l(date, format: format)
       end
 
-      # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead
-      def preference_field_tag(name, value, options)
-        type = options.delete(:type) || :text
-        render "spree/admin/shared/preference_fields/#{type}",
-          name: name, value: value, html_options: options
-      end
-      deprecate preference_field_tag:
-        "Render `spree/admin/shared/preference_fields/\#{preference_type}' instead",
-        deprecator: Spree::Deprecation
-
-      # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead
-      def preference_field_for(form, field, options)
-        type = options.delete(:type) || :text
-        render "spree/admin/shared/preference_fields/#{type}",
-          form: form, attribute: field, html_options: options
-      end
-      deprecate preference_field_for:
-        "Render `spree/admin/shared/preference_fields/\#{preference_type}' instead",
-        deprecator: Spree::Deprecation
-
-      # @deprecated Pass an `html_options' hash into preference field partial instead
-      def preference_field_options(options)
-        field_options = case options[:type]
-                        when :integer
-          { size: 10,
-            class: 'input_integer' }
-                        when :boolean
-          {}
-                        when :string
-          { size: 10,
-            class: 'input_string fullwidth' }
-                        when :password
-          { size: 10,
-            class: 'password_string fullwidth' }
-                        when :text
-          { rows: 15,
-            cols: 85,
-            class: 'fullwidth' }
-        else
-          { size: 10,
-            class: 'input_string fullwidth' }
-        end
-
-        field_options.merge!({
-          readonly: options[:readonly],
-          disabled: options[:disabled],
-          size: options[:size]
-        })
-      end
-      deprecate preference_field_options: "Pass an `html_options' hash into " \
-        "`render('spree/admin/shared/preference_fields/\#{preference_type}')` instead)",
-        deprecator: Spree::Deprecation
-
-      # @deprecated Please render each preference keys partial instead. Example:
-      # <% @object.preferences.keys.each do |key| %>
-      #   <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(key)}",
-      #     form: f, attribute: "preferred_#{key}", label: t(key, scope: 'spree') %>
-      # <% end %>
-      def preference_fields(object, form)
-        return unless object.respond_to?(:preferences)
-        capture do
-          object.preferences.keys.each do |key|
-            concat render("spree/admin/shared/preference_fields/#{object.preference_type(key)}",
-              form: form, attribute: "preferred_#{key}", label: t(key, scope: 'spree'))
-          end
-        end
-      end
-      deprecate preference_fields: "Please render each preference key's partial instead. Example: \n" \
-        "<% @object.preferences.keys.each do |key| %>\n" \
-          "<%= render \"spree/admin/shared/preference_fields/\#{@object.preference_type(key)}\", \n" \
-             "form: f, attribute: \"preferred_\#{key}\", label: t(key, scope: 'spree') %>\n" \
-        "<% end %>", deprecator: Spree::Deprecation
-
-      def link_to_add_fields(name, target, options = {})
-        name = '' if options[:no_text]
-        css_classes = options[:class] ? options[:class] + " spree_add_fields" : "spree_add_fields"
-        link_to_with_icon('plus', name, 'javascript:', data: { target: target }, class: css_classes)
-      end
-      deprecate link_to_add_fields: "Please use button_tag instead, Example: \n" \
-        "button_tag \"Name\", type: \"button\", data: { target: \"tbody#div\" }", deprecator: Spree::Deprecation
-
-      # renders hidden field and link to remove record using nested_attributes
-      def link_to_remove_fields(name, form, options = {})
-        name = '' if options[:no_text]
-        options[:class] = '' unless options[:class]
-        options[:class] += 'no-text with-tip' if options[:no_text]
-        url = form.object.persisted? ? [:admin, form.object] : '#'
-        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: t('spree.actions.remove')) +
-          form.hidden_field(:_destroy)
-      end
-      deprecate link_to_remove_fields: "Please use link_to_delete instead, Example: \n" \
-        "link_to_delete \"form.object\"", deprecator: Spree::Deprecation
-
       def spree_dom_id(record)
         dom_id(record, 'spree')
       end

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

@@ -124,39 +124,6 @@ module Spree
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
-      alias_method :icon, :solidus_icon
-      deprecate icon: :solidus_icon, deprecator: Spree::Deprecation
-
-      def button(text, icon_name = nil, button_type = 'submit', options = {})
-        Spree::Deprecation.warn "button helper is deprecated. Instead use button_tag"
-        class_names = "button"
-        if icon_name
-          Spree::Deprecation.warn "Using icon_name arg is deprecated. Icons could not be visible in future versions.", caller
-          class_names = "fa fa-#{icon_name} #{class_names}"
-        end
-        button_tag(text, options.merge(type: button_type, class: class_names))
-      end
-
-      def button_link_to(text, url, html_options = {})
-        Spree::Deprecation.warn "Passing button_link_to is deprecated. Use either link_to or button_to instead.", caller
-        html_options = { class: '' }.merge(html_options)
-        if html_options[:method] &&
-           !html_options[:method].to_s.casecmp('get').zero? &&
-           !html_options[:remote]
-          form_tag(url, method: html_options.delete(:method)) do
-            html_options.delete(:icon)
-            button_tag(text, html_options)
-          end
-        else
-          html_options[:class] += ' button'
-
-          if html_options[:icon]
-            html_options[:class] += " fa fa-#{html_options[:icon]}"
-          end
-          link_to(text, url, html_options)
-        end
-      end
-
       def configurations_menu_item(link_text, url, description = '')
         %(<tr>
           <td>#{link_to(link_text, url)}</td>

data/app/views/spree/admin/orders/customer_details/show.html.erb

@@ -12,7 +12,7 @@
   <section>
     <%= content_tag :h4, t('spree.account') %>
     <%= t('spree.email') %>: <%= @order.email %><br>
-    <%= t('spree.guest_checkout') %>: <%= @order.user ? t('spree.yes') : t('spree.no') %>
+    <%= t('spree.guest_checkout') %>: <%= @order.user.nil? ? t('spree.yes') : t('spree.no') %>
   </section>
 
   <section>

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

@@ -65,21 +65,10 @@
             </div>
 
             <div class="col-12 col-xl-6">
-              <% if Spree::Config.use_combined_first_and_last_name_in_address %>
-                <div class="field">
-                  <%= label_tag :q_bill_address_firstname_or_lastname_start, t('spree.name_contains') %>
-                  <%= f.text_field :bill_address_firstname_or_lastname_start, size: 25 %>
-                </div>
-              <% else %>
-                <div class="field">
-                  <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
-                  <%= f.text_field :bill_address_firstname_start, size: 25 %>
-                </div>
-                <div class="field">
-                  <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
-                  <%= f.text_field :bill_address_lastname_start, size: 25 %>
-                </div>
-              <% end %>
+              <div class="field">
+                <%= label_tag :q_bill_address_name_start, t('spree.name_contains') %>
+                <%= f.text_field :bill_address_name_start, size: 25 %>
+              </div>
             </div>
 
             <div class="col-12 col-xl-6">

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

@@ -158,7 +158,7 @@
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
           <%= f.field_hint :tax_category, default_tax_category: @default_tax_category&.name %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t('spree.match_choices.none'), selected: @default_tax_category&.id }, { class: 'custom-select' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>

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

@@ -84,7 +84,7 @@
                
               <%= link_to_clone product, no_text: true, class: 'clone' if can?(:clone, product) %>
               &nbsp;
-              <%= link_to_delete product, no_text: true if can?(:delete, product) && !product.deleted? %>
+              <%= link_to_delete product, no_text: true if can?(:destroy, product) && !product.deleted? %>
             </td>
           </tr>
       <% end %>

data/app/views/spree/admin/search/users.json.jbuilder

@@ -16,9 +16,6 @@ json.array!(@users) do |user|
     :country_id,
     :company
   ]
-  unless Spree::Config.use_combined_first_and_last_name_in_address
-    address_fields.push(:firstname, :lastname)
-  end
   json.ship_address do
     if user.ship_address
       json.(user.ship_address, *address_fields)

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

@@ -1,22 +1,10 @@
 <% s_or_b = type.chars.first %>
 
 <div id="<%= type %>" data-hook="address_fields">
-  <% if Spree::Config.use_combined_first_and_last_name_in_address %>
-    <div class="field <%= "#{type}-row" %>">
-      <%= f.label :name %>
-      <%= f.text_field :name, class: 'fullwidth' %>
-    </div>
-  <% else %>
-    <div class="field <%= "#{type}-row" %>">
-      <%= f.label :firstname %>
-      <%= f.text_field :firstname, class: 'fullwidth' %>
-    </div>
-
-    <div class="field <%= "#{type}-row" %>">
-      <%= f.label :lastname %>
-      <%= f.text_field :lastname, class: 'fullwidth' %>
-    </div>
-  <% end %>
+  <div class="field <%= "#{type}-row" %>">
+    <%= f.label :name %>
+    <%= f.text_field :name, class: 'fullwidth' %>
+  </div>
 
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{type}-row" %>">

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?(:show, Spree::PaymentMethod) %>
+  <% if can?(:admin, Spree::PaymentMethod) %>
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:show, Spree::TaxCategory) || can?(:show, Spree::TaxRate) %>
+  <% if can?(:admin, Spree::TaxCategory) || can?(:admin, Spree::TaxRate) %>
     <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
   <% end %>
 
-  <% if can?(:show, Spree::RefundReason) || can?(:show, Spree::ReimbursementType) ||
+  <% if can?(:admin, Spree::RefundReason) || can?(:admin, 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?(:show, Spree::ShippingMethod) || can?(:show, Spree::ShippingCategory) || can?(:show, Spree::StockLocation) %>
+  <% if can?(:admin, Spree::ShippingMethod) || can?(:admin, Spree::ShippingCategory) || can?(:admin, Spree::StockLocation) %>
     <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 
-  <% if can?(:show, Spree::Zone) %>
+  <% if can?(:admin, Spree::Zone) %>
     <%= tab :zones, url: spree.admin_zones_path %>
   <% end %>
 </ul>

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

@@ -56,7 +56,7 @@
                 <span><%= t store_credit.invalidated? ? 'spree.say_yes' : 'spree.say_no' %></span>
               </td>
               <td class="actions" data-hook="admin_store_credits_index_row_actions">
-                <% if can?(:show, store_credit) %>
+                <% if can?(:edit, store_credit) %>
                   <%= link_to_edit_url admin_user_store_credit_path(@user, store_credit), { no_text: true, class: 'edit' } %>
                 <% end %>
               </td>

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -39,17 +39,17 @@ colors = [
     used_for: 'Buttons primary actions, links, active states.'
   },
   {
-    name: '$color-success',
+    name: 'theme-color(success)',
     value: '#52B73B',
     used_for: 'Success actions.'
   },
   {
-    name: '$color-error',
+    name: 'theme-color(danger)',
     value: '#CE452A',
     used_for: 'Errors, destructive action warnings.'
   },
   {
-    name: '$color-notice',
+    name: 'theme-color(warning)',
     value: '#FFDD59',
     used_for: 'Warnings actions.'
   }

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

@@ -20,7 +20,20 @@
       </div>
     <% end %>
 
-    <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
+    <%= f.field_container :icon do %>
+      <%= f.label :icon %><br>
+      <%= f.file_field :icon %>
+      <% if f.object.icon_present? %>
+        <%= image_tag f.object.icon(:mini) %>
+        <%= link_to t('spree.actions.remove'),
+                    admin_taxonomy_taxon_attachment_path(@taxonomy,
+                                                          @taxon.id,
+                                                          attachment_definition: :icon,
+                                                          authenticity_token: form_authenticity_token),
+                    method: :delete,
+                    class: 'btn btn-sm btn-danger' %>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="col-5">

data/config/routes.rb

@@ -102,7 +102,6 @@ Spree::Core::Engine.routes.draw do
           put :fire
         end
 
-        resources :log_entries
         resources :refunds, only: [:new, :create, :edit, :update]
       end
 

data/lib/spree/backend.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require 'rails/all'
+require 'spree_core'
+require 'spree_api'
+
 require 'jquery-rails'
 require 'coffee-rails'
 require 'sassc-rails'
@@ -11,9 +13,6 @@ require 'jbuilder'
 require 'kaminari'
 require 'responders'
 
-require 'spree_core'
-require 'spree_api'
-
 require 'spree/backend/action_callbacks'
 require 'spree/backend/callbacks'
 require 'spree/backend/engine'

data/lib/spree/backend_configuration.rb

@@ -133,17 +133,17 @@ module Spree
           'wrench',
           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)
+            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',

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

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

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

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

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-03-10 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.11.1
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,6 @@ 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/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
@@ -307,7 +306,6 @@ files:
 - app/assets/stylesheets/spree/backend/components/_pills.scss
 - app/assets/stylesheets/spree/backend/components/_progress.scss
 - app/assets/stylesheets/spree/backend/components/_sidebar.scss
-- app/assets/stylesheets/spree/backend/components/_states.scss
 - app/assets/stylesheets/spree/backend/components/_stock_table.scss
 - app/assets/stylesheets/spree/backend/components/_table-filter.scss
 - app/assets/stylesheets/spree/backend/components/_tabs.scss
@@ -357,7 +355,6 @@ files:
 - app/controllers/spree/admin/general_settings_controller.rb
 - app/controllers/spree/admin/images_controller.rb
 - app/controllers/spree/admin/locale_controller.rb
-- app/controllers/spree/admin/log_entries_controller.rb
 - app/controllers/spree/admin/option_types_controller.rb
 - app/controllers/spree/admin/option_values_controller.rb
 - app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -409,7 +406,6 @@ files:
 - app/helpers/spree/admin/customer_returns_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/orders_helper.rb
-- app/helpers/spree/admin/payments_helper.rb
 - app/helpers/spree/admin/products_helper.rb
 - app/helpers/spree/admin/promotions_helper.rb
 - app/helpers/spree/admin/reimbursement_type_helper.rb
@@ -449,7 +445,6 @@ files:
 - app/views/spree/admin/images/edit.html.erb
 - app/views/spree/admin/images/index.html.erb
 - app/views/spree/admin/images/new.html.erb
-- app/views/spree/admin/log_entries/index.html.erb
 - app/views/spree/admin/option_types/_form.html.erb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
 - app/views/spree/admin/option_types/edit.html.erb
@@ -701,7 +696,6 @@ files:
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxons/_form.html.erb
-- app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
 - app/views/spree/admin/taxons/index.html.erb
 - app/views/spree/admin/taxons/search.json.jbuilder
@@ -770,6 +764,10 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_da.js
 - 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-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
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es.js

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

@@ -1,46 +0,0 @@
-/**
- * @deprecated Spree.routes will be removed in a future release. Please use Spree.pathFor instead.
- * See: https://github.com/solidusio/solidus/issues/3405
- */
-
-var admin_routes = {
-  classifications_api: Spree.pathFor('api/classifications'),
-  option_value_search: Spree.pathFor('api/option_values'),
-  option_type_search: Spree.pathFor('api/option_types'),
-  orders_api: Spree.pathFor('api/orders'),
-  product_search: Spree.pathFor('api/products'),
-  admin_product_search: Spree.pathFor('admin/search/products'),
-  shipments_api: Spree.pathFor('api/shipments'),
-  checkouts_api: Spree.pathFor('api/checkouts'),
-  stock_locations_api: Spree.pathFor('api/stock_locations'),
-  taxon_products_api: Spree.pathFor('api/taxons/products'),
-  taxons_search: Spree.pathFor('api/taxons'),
-  user_search: Spree.pathFor('admin/search/users'),
-  variants_api: Spree.pathFor('api/variants'),
-  users_api: Spree.pathFor('api/users'),
-
-  line_items_api: function(order_id) {
-    return Spree.pathFor('api/orders/' + order_id + '/line_items')
-  },
-
-  payments_api: function(order_id) {
-    return Spree.pathFor('api/orders/' + order_id + '/payments')
-  },
-
-  stock_items_api: function(stock_location_id) {
-    return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
-  }
-}
-
-var frontend_routes = {
-  states_search: Spree.pathFor('api/states'),
-  apply_coupon_code: function(order_id) {
-    return Spree.pathFor("api/orders/" + order_id + "/coupon_codes");
-  }
-}
-
-if(typeof Proxy == "function") {
-  Spree.routes = new Proxy(Object.assign(admin_routes, frontend_routes), Spree.routesDeprecationProxy);
-} else {
-  Object.assign(Spree.routes, admin_routes)
-}

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

@@ -1,11 +0,0 @@
-// The state component has been deprecated in favour of Pills. This will be
-// removed in a future version of Solidus.
-.state {
-  @extend .pill;
-
-  @each $state in $states {
-    &.#{$state} {
-      @extend .pill-#{$state};
-    }
-  }
-}

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class LogEntriesController < Spree::Admin::BaseController
-      before_action :find_order_and_payment
-
-      def index
-        Spree::Deprecation.warn 'Using a dedicated route for payment log entries ' \
-          'has been deprecated in favor of displaying the log entries on ' \
-          'the payment screen itself.', caller_locations(0)
-        @log_entries = @payment.log_entries
-      end
-
-      private
-
-      def find_order_and_payment
-        @order = Spree::Order.where(number: params[:order_id]).first!
-        @payment = @order.payments.find(params[:payment_id])
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    module PaymentsHelper
-      def payment_method_name(payment)
-        Spree::Deprecation.warn "payment_method_name(payment) is deprecated. Instead use payment.payment_method.name"
-        payment.payment_method.name
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
-
-<% admin_breadcrumb(Spree::Payment.model_name.human) %>
-<% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
-
-<% content_for :page_actions do %>
-  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
-  <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
-<% end %>
-
-<%= render 'spree/admin/payments/log_entries', log_entries: @log_entries %>

data/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb

@@ -1,16 +0,0 @@
-<% f.object.class.attachment_definitions.each do |attachment, definition| %>
-  <%= f.field_container attachment do %>
-    <%= f.label attachment %><br>
-    <%= f.file_field attachment %>
-    <% if f.object.send(attachment).exists? %>
-      <%= image_tag f.object.send(attachment, definition[:default_style]) %>
-      <%= link_to t('spree.actions.remove'),
-                  admin_taxonomy_taxon_attachment_path(@taxonomy,
-                                                       @taxon.id,
-                                                       attachment_definition: attachment,
-                                                       authenticity_token: form_authenticity_token),
-                  method: :delete,
-                  class: 'btn btn-sm btn-danger' %>
-    <% end %>
-  <% end %>
-<% end %>