solidus_backend 2.11.17 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac00b927565875614437f63f0e5ab707b7722c96988d83ddd01c306aee9b448
-  data.tar.gz: 0a18d3f2fa77aa217f71602cebe0529b0eedeb21ad56d7cf447c09f1d88c2d67
+  metadata.gz: 9d883e31d8d9dc7f660154fb30d230147d6a0058295efd2b89f136dcfb90bc53
+  data.tar.gz: 37e837f85e4333dfbf3f6dbfed46f27a8470df725606864c397888277b22e6d8
 SHA512:
-  metadata.gz: 3c1e390834e5d121f1c93c79581bbcd646eb3bf299ecfa91097772a56bd4607223416640d238c84de12d184846c5c54642c086b067c4a9c4dbde3e6bf33eabee
-  data.tar.gz: d29956ffb3501f2b0adaa70b94ca5fd0408d217f1ae0eed79592fb1f555d30bbdf078c1a053041a4268f47fcb02e18865d68c9d711b940e5ab72b4c3b17660af
+  metadata.gz: ad08af46b9ceb6d01a71d924acbf52d56035a1122eaa84628b33dd8132e86cb8d05066b32cb81cebc609d3dc1887a3863f211d7bd078eea2f1587dfb89dc2df6
+  data.tar.gz: 9d395e27b06456a0c706035ecaa52f6af4a278b946c561de41ea7b9f502ac3a2f136644f6492e725119a017f1a950bb119d6fbf962870ac7c20dc8a6a95a6887

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/components/sortable_table.js

@@ -1,14 +1,6 @@
 //= require solidus_admin/Sortable
 /* eslint no-unused-vars: "off" */
 
-/* Check if string is valid UUID */
-function isAValidUUID(str) {
-  // https://stackoverflow.com/a/13653180/8170555
-  const regexExp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-
-  return regexExp.test(str);
-}
-
 Spree.SortableTable = {
   refresh: function() {
     var sortable_tables = document.querySelectorAll('table.sortable');
@@ -24,7 +16,7 @@ Spree.SortableTable = {
             var idAttr = el.id;
             if (idAttr) {
               var objId = idAttr.split('_').slice(-1);
-              if (!isNaN(objId) || isAValidUUID(objId)) {
+              if (!isNaN(objId)) {
                 positions['positions['+objId+']'] = index + 1;
               }
             }

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/address.js

@@ -1,5 +1,5 @@
 Spree.Views.Order.Address = Backbone.View.extend({
-  initialize: function() {
+  initialize: function(options) {
     // read initial values from page
     this.onChange();
 
@@ -23,9 +23,8 @@ Spree.Views.Order.Address = Backbone.View.extend({
 
   eachField: function(callback){
     var view = this;
-    var fields = ["name", "firstname", "lastname", "company", "address1",
-                  "address2", "city", "zipcode", "phone", "country_id",
-                  "state_name"];
+    var fields = ["name", "company", "address1", "address2",
+      "city", "zipcode", "phone", "country_id", "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
       if (el.length) callback(field, el);

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.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/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/_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", "theme-color(success)");
 $color-success:                 $color-green !default;
-@include bs-deprecated-variable("color-notice", "theme-color(warning)");
 $color-notice:                  $color-yellow !default;
-@include bs-deprecated-variable("color-error", "theme-color(danger)");
 $color-error:                   $color-red !default;
 
 // Breadcrumb custom variable

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/shared/_typography.scss

@@ -57,6 +57,38 @@ ul.text_list {
   padding-left: 0;
 }
 
+dl {
+  width: 100%;
+  overflow: hidden;
+  margin: 5px 0;
+  color: lighten($body-color, 15);
+
+  dt, dd {
+    float: left;
+    line-height: 16px;
+    padding: 5px;
+  }
+
+  dt {
+    width: 40%;
+    font-weight: $font-weight-bold;
+    padding-left: 0;
+    clear: left;
+  }
+
+  dd {
+    width: 60%;
+    padding-right: 0;
+    margin-left: 0;
+  }
+}
+
+.dl-collapse {
+  dt, dd {
+    width: auto;
+  }
+}
+
 // Helpers
 .align-center  { text-align: center  }
 .align-right   { text-align: right   }

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/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,23 +178,13 @@ 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.to_sym]))
+    resource_not_found(flash_class: e.model.constantize, redirect_url: spree.polymorphic_url([:admin, parent_model_name.pluralize]))
   end
 
   def parent?

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
@@ -126,7 +92,7 @@ module Spree
 
         @search = super.ransack(params[:q])
         @collection = @search.result.includes(:spree_roles)
-        @collection = @collection.includes(:orders)
+        @collection = @collection.includes(:spree_orders)
         @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
@@ -155,7 +121,7 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
+        render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
       end
 
       def sign_in_if_change_own_password

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/helpers/spree/admin/orders_helper.rb

@@ -11,7 +11,7 @@ module Spree
           translated_event = t(event, scope: [:spree, :admin, :order, :events])
           links << button_to(
             translated_event,
-            [event.to_sym, :admin, @order],
+            [event, :admin, @order],
             method: :put,
             data: { confirm: t(:order_sure_want_to, event: translated_event, scope: :spree) }
           )

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

@@ -13,12 +13,12 @@
     <tr data-hook="adjustment_buttons">
       <td class="align-right" colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :put %>
+          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :get %>
         <% end %>
       </td>
       <td colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :put %>
+          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :get %>
         <% end %>
       </td>
       <td class='actions'>&nbsp;</td>

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/payments/_list.html.erb

@@ -58,7 +58,7 @@
             <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
             <% allowed_actions.each do |action| %>
               <% if action == 'credit' %>
-                <%= link_to_with_icon 'mail-reply', t('spree.actions.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
+                <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
               <% elsif action == 'capture' && !@order.completed? %>
                 <%# no capture prior to completion. payments get captured when the order completes. %>
               <% else %>

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

@@ -10,14 +10,14 @@
     <div data-hook="admin_refund_form_fields" class="row">
       <div class="col-3">
         <div class="field">
-          <label><%= t('spree.payment_amount') %></label><br>
-          <%= Spree::Money.new(@refund.payment.amount) %>
+          <%= t('spree.payment_amount') %><br/>
+          <%= @refund.payment.amount %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <label><%= t('spree.credit_allowed') %></label><br/>
-          <%= Spree::Money.new(@refund.payment.credit_allowed) %>
+          <%= t('spree.credit_allowed') %><br/>
+          <%= @refund.payment.credit_allowed %>
         </div>
       </div>
       <div class="col-3">
@@ -29,13 +29,13 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
+          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= f.submit t('spree.actions.refund'), class: 'btn btn-primary' %>
+      <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

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

@@ -20,22 +20,18 @@
       </div>
     <% end %>
 
-    <% if f.object.class.attachment_definitions.size > 1 %>
-      <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
-    <% else %>
-      <%= 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 %>
+    <%= 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>

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

@@ -40,7 +40,6 @@
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
-            <%= hidden_field_tag('user[stock_location_ids][]', nil) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
                 <label>

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

@@ -89,7 +89,7 @@
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
           <% end %>
-          <% if can?(:destroy, user) && user.orders.none? %>
+          <% if can?(:destroy, user) && user.orders.count.zero? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

data/config/routes.rb

@@ -77,8 +77,8 @@ Spree::Core::Engine.routes.draw do
         get :confirm
         put :complete
         post :resend
-        put "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
-        put "/adjustments/finalize", to: "orders#finalize_adjustments"
+        get "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
+        get "/adjustments/finalize", to: "orders#finalize_adjustments"
         put :approve
         put :cancel
         put :resume
@@ -91,7 +91,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
 
-      resources :adjustments, except: [:show]
+      resources :adjustments
       resources :return_authorizations do
         member do
           put :fire
@@ -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/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_lists.scss

@@ -5,38 +5,3 @@
   padding-left: 0;
   list-style: none;
 }
-
-dl {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  width: 100%;
-  overflow: hidden;
-  margin: 5px 0;
-  color: lighten($body-color, 15);
-
-  dt,
-  dd {
-    min-width: 40%;
-    line-height: 16px;
-    padding: 5px;
-  }
-
-  dt {
-    font-weight: $font-weight-bold;
-    padding-left: 0;
-  }
-
-  dd {
-    text-align: right;
-    padding-right: 0;
-    margin-left: 0;
-  }
-}
-
-.dl-collapse {
-  dt,
-  dd {
-    width: auto;
-  }
-}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.11.17
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 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.17
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.17
+        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.17
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.17
+        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
@@ -904,7 +898,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -919,8 +913,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []

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,23 +0,0 @@
-<%
-Spree::Deprecation.warn(
-  "This partial with its support for multiple Spree::Taxon attachments is deprecated and will be removed in a future " \
-  "version of Solidus, please overwrite the standard view if you need to support custom attachments."
-)
-%>
-
-<% 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}_present?") %>
-      <%= 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 %>