solidus_backend 4.3.5 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 480e44614f841840dad96177e38ead273f9b044f5b74aa81837f324d64b4307d
-  data.tar.gz: 0b206738d7af865103063328ee4a1293b91ada68f7d44f0c5694ebd226b99c72
+  metadata.gz: 80a90789fe2e7df10cab902ad495b6d25980448801fa8cc03a593069babb157c
+  data.tar.gz: cfaa6f5111283f821071b3c333ca41804567f44bbbc9476a4dd7419c99785104
 SHA512:
-  metadata.gz: 40ded38c54b7f8212fcb25e9c61f17287d01d7d4b500e8745fdb09370b7af125abfae7c3f9501af48831606a676e1e17f5bb675156e8630e86759e58c3c12c00
-  data.tar.gz: b17d268613e1223870dff99882c0586bfe399331214ce0f9ec516bc944f0a330e0aab1e11589183176a7250c719b1f29e1daf846da5dc9fb6775a88c9e6c22d0
+  metadata.gz: d4caa30a62fc16223f5aa9bfcf41c3fd2f8ed091a15d4a082f9a65e621a5823966fcce5ec4cf291af7d88518210d748a6ad3562bda5373e82589a063029404ed
+  data.tar.gz: c1782137a614b7f6e8713e100f0cea0c49173ad8946ce9e0605573cfaed6444ce7a7a13587e24f975065b0ccde4d89314aa8870b34b4f4196ca4fc40acea6cc3

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

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

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

@@ -8,9 +8,6 @@
 //= require spree/backend/templates/orders/shipping_method
 //= require spree/backend/templates/products/sortable
 //= require spree/backend/templates/products/upload_progress
-//= require spree/backend/templates/promotions/calculators/fields/tiered_flat_rate
-//= require spree/backend/templates/promotions/calculators/fields/tiered_percent
-//= require spree/backend/templates/promotions/rules/option_values
 //= require spree/backend/templates/stock_items/stock_location_stock_item
 //= require spree/backend/templates/taxons/_tree
 //= require spree/backend/templates/taxons/tree

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

@@ -10,17 +10,18 @@
   /**
     * Make the element a select2 dropdown used for finding Variants. By default, the search term will be
     * passed to the defined Spree::Config.variant_search_class by the controller with its defined scope.
-    * @param  {Object|undefined|null} options Options
+    * @param  {Object|undefined|null} options Options to be passed to select2. If null, the default options will be used.
     * @param  {Function|undefined} options.searchParameters Returns a hash object for params to merge on the select2 ajax request
     *                                                       Accepts an argument of the select2 search term. To use Ransack, define
     *                                                       variant_search_term as a falsy value, and q as the Ransack query. Note,
     *                                                       you need to ensure that the attributes are allowed to be Ransacked.
     */
-  $.fn.variantAutocomplete = function(options) {
+  $.fn.variantAutocomplete = function(options = {}) {
     // Default options
-    options = options || {}
-
-    this.select2({
+    const searchParameters = options.searchParameters || null
+    delete options.searchParameters
+    const select2options = options
+    const defaultOptions = {
       placeholder: Spree.translations.variant_placeholder,
       minimumInputLength: 3,
       initSelection: function(element, callback) {
@@ -39,7 +40,7 @@
           }
         },
         data: function(term, page) {
-          const extraParameters = options["searchParameters"] ? options["searchParameters"](term) : {}
+          const extraParameters = searchParameters ? searchParameters(term) : {}
 
           return {
             variant_search_term: term,
@@ -64,7 +65,9 @@
         } else {
           return Select2.util.escapeMarkup(variant.name);
         }
-      }
-    });
+      },
+    }
+
+    this.select2(Object.assign({}, defaultOptions, select2options));
   };
 })();

data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js

@@ -24,6 +24,6 @@ Spree.Views.Cart.EmptyCartButton = Backbone.View.extend({
 
   render: function() {
     var isNew = function (item) { return item.isNew() };
-    this.$el.prop("disabled", !this.collection.length || this.collection.some(isNew));
+    this.$el.prop("disabled", !this.collection.length || this.collection.some(isNew) || this.model.get("completed_at"));
   }
 });

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

@@ -1,4 +1,3 @@
-//= require 'spree/backend/views/calculators/tiered'
 //= require 'spree/backend/views/cart/add_line_item_button'
 //= require 'spree/backend/views/cart/empty_cart_button'
 //= require 'spree/backend/views/cart/line_item_row'
@@ -22,7 +21,6 @@
 //= 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'
 //= require 'spree/backend/views/tables/return_items'

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

@@ -9,8 +9,7 @@ Spree.Views.Order.DetailsAdjustments = Backbone.View.extend({
     var collection = this.collection ? this.collection.chain() : _.chain([this.model]);
     collection
       .map(function(item) {
-        return (item.get("adjustments") || [])
-          .filter(function(adjustment) { return (adjustment.eligible === true); });
+        return (item.get("adjustments") || []);
       })
       .flatten(true)
       .each(function(adjustment){

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

@@ -50,8 +50,6 @@
 //= require spree/backend/products/index
 //= require spree/backend/product_picker
 //= require spree/backend/progress
-//= require spree/backend/promotions
-//= require spree/backend/promotions/activation
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
 //= require spree/backend/stock_management

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

@@ -1,3 +0,0 @@
-.adjustment-ineligible {
-  text-decoration: line-through;
-}

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

@@ -2,7 +2,6 @@
 @import 'spree/backend/sections/orders';
 @import 'spree/backend/sections/products';
 @import 'spree/backend/sections/variants';
-@import 'spree/backend/sections/promotions';
 @import 'spree/backend/sections/bulk_transfer';
 @import 'spree/backend/sections/return_authorizations';
 @import 'spree/backend/sections/log_entries';

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

@@ -20,7 +20,7 @@ module Spree
           flash[:error] = t('spree.no_inventory_selected')
           redirect_to admin_order_cancellations_path(@order)
         else
-          @order.cancellations.short_ship(inventory_units, created_by: created_by)
+          @order.cancellations.short_ship(inventory_units, created_by:)
 
           flash[:success] = t('spree.inventory_canceled')
           redirect_to edit_admin_order_url(@order)

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

@@ -3,6 +3,10 @@
 module Spree
   module Admin
     class DashboardsController < BaseController
+      before_action :deprecate
+      def deprecate
+        Spree.deprecator.warn "The #{self.class.name} is deprecated. If you still use dashboards, please copy all controllers and views from solidus_backend to your application."
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Spree
 
       def update_values_positions
         params[:positions].each do |id, index|
-          Spree::OptionValue.where(id: id).update_all(position: index)
+          Spree::OptionValue.where(id:).update_all(position: index)
         end
 
         respond_to do |format|

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

@@ -15,8 +15,8 @@ module Spree
         def edit
           country_id = default_country_id
 
-          @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
-          @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
+          @order.build_bill_address(country_id:) if @order.bill_address.nil?
+          @order.build_ship_address(country_id:) if @order.ship_address.nil?
 
           @order.bill_address.country_id = country_id if @order.bill_address.country.nil?
           @order.ship_address.country_id = country_id if @order.ship_address.country.nil?

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

@@ -88,7 +88,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
         #
         # TODO : create a global set_list_position on all concerned objects
         # maybe in the acts_as_list gem
-        model_class.where(id: id).first&.set_list_position(index)
+        model_class.where(id:).first&.set_list_position(index)
       end
     end
 

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

@@ -25,7 +25,7 @@ module Spree
       end
 
       def admin_hint(title, text)
-        content_tag(:span, class: 'hint-tooltip', title: title, data: { content: text }) do
+        content_tag(:span, class: 'hint-tooltip', title:, data: { content: text }) do
           content_tag(:i, '', class: 'fa fa-info-circle')
         end
       end
@@ -39,7 +39,7 @@ module Spree
           t('spree.date_picker.format', default: '%Y/%m/%d')
         end
 
-        l(date, format: format)
+        l(date, format:)
       end
 
       def spree_dom_id(record)

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

@@ -114,7 +114,7 @@ module Spree
         name = options[:name] || t('spree.actions.delete')
         confirm = options[:confirm] || t('spree.are_you_sure')
         options[:class] = "#{options[:class]} delete-resource".strip
-        options[:data] = { confirm: confirm, action: 'remove' }
+        options[:data] = { confirm:, action: 'remove' }
         link_to_with_icon 'trash', name, url, options
       end
 

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

@@ -4,7 +4,6 @@
 %>
 <tr id="<%= spree_dom_id(adjustment) %>"
     data-hook="adjustment_row"
-    class="<%= "adjustment-ineligible" if !adjustment.eligible? %>"
     >
   <td><%= display_adjustable(adjustment.adjustable) %></td>
   <td><%= adjustment.label %></td>

data/app/views/spree/admin/dashboards/home.html.erb

@@ -1 +1,2 @@
 <%# Placeholder view for a home dashboard %>
+<p><%= Spree.deprecator.warn "The Home view is deprecated, If you still use dashboards, please copy all controllers and views from solidus_backend to your application." %></p>

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

@@ -8,7 +8,7 @@
       </tr>
     </thead>
     <tbody data-hook="order_details_adjustments">
-      <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
+      <% adjustments.group_by(&:label).each do |label, adjustments| %>
         <tr class="total">
           <td><%= label %>:</td>
           <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>

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

@@ -1,4 +1,4 @@
-<div class="js-order-line-item-adjustments <%= "hidden" if order.line_item_adjustments.eligible.none? %>">
+<div class="js-order-line-item-adjustments <%= "hidden" if order.line_item_adjustments.none? %>">
   <%=
     render "spree/admin/orders/adjustments", {
       adjustments: order.line_item_adjustments,
@@ -7,7 +7,7 @@
     }
   %>
 </div>
-<div class="js-order-shipment-adjustments <%= "hidden" if order.shipment_adjustments.eligible.none? %>">
+<div class="js-order-shipment-adjustments <%= "hidden" if order.shipment_adjustments.none? %>">
   <%=
     render "spree/admin/orders/adjustments", {
       adjustments: order.shipment_adjustments,
@@ -16,7 +16,7 @@
     }
   %>
 </div>
-<div class="js-order-adjustments <%= "hidden" if order.adjustments.eligible.none? %>">
+<div class="js-order-adjustments <%= "hidden" if order.adjustments.none? %>">
   <%=
     render "spree/admin/orders/adjustments", {
       adjustments: order.adjustments,

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

@@ -18,7 +18,7 @@
       order: @order,
       title: t('spree.line_item_adjustments'),
     }
-  ) if @order.line_item_adjustments.eligible.any?
+  ) if @order.line_item_adjustments.any?
 %>
 
 <%=
@@ -29,7 +29,7 @@
       order: @order,
       title: t('spree.shipment_adjustments'),
     }
-  ) if @order.shipment_adjustments.eligible.any?
+  ) if @order.shipment_adjustments.any?
 %>
 
 <%=
@@ -40,7 +40,7 @@
       order: @order,
       title: t('spree.order_adjustments'),
     }
-  ) if @order.adjustments.eligible.any?
+  ) if @order.adjustments.any?
 %>
 
 <% if @order.line_items.exists? %>

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

@@ -16,89 +16,11 @@
   <div data-hook="admin_orders_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
-          <div class="date-range-filter field">
-            <%= label_tag :q_created_at_gt, t('spree.date_range') %>
-            <div class="date-range-fields input-group">
-              <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: t('spree.start') %>
-
-              <div class="input-group-prepend input-group-append">
-                <span class="input-group-text range-divider">
-                  <i class="fa fa-arrow-right"></i>
-                </span>
-              </div>
-
-              <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: t('spree.stop') %>
-            </div>
-          </div>
-
-          <div class="field">
-            <%= label_tag :q_state_eq, t('spree.status') %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t(s.name, scope: 'spree.order_state'), s.value]}, {include_blank: true}, class: 'custom-select fullwidth' %>
-          </div>
-
-          <div class="field">
-            <%= label_tag nil, t('spree.promotion') %>
-            <%= f.text_field :order_promotions_promotion_code_value_start, size: 25 %>
-          </div>
-
-          <div class="field">
-            <%= label_tag nil, t('spree.shipment_number') %>
-            <%= f.text_field :shipments_number_start %>
-          </div>
-
-          <div class="field">
-            <%= label_tag :q_shipment_state, t('spree.shipment_state') %>
-            <%= f.select :shipment_state_eq, %i[backorder canceled partial pending ready shipped].map { |state| [t("spree.shipment_states.#{state}"), state] }, { include_blank: true }, { class: "custom-select fullwidth" } %>
-          </div>
-        </div>
-
-        <div class="col-12 col-md-6 col-lg-4 col-xl-6">
-          <div class="row">
-            <div class="col-12 col-xl-6">
-              <div class="field">
-                <%= label_tag :q_number_start, t('spree.order_number', number: '') %>
-                <%= f.text_field :number_start %>
-              </div>
-
-              <div class="field">
-                <%= label_tag :q_email_start, t('spree.email') %>
-                <%= f.text_field :email_start %>
-              </div>
-            </div>
-
-            <div class="col-12 col-xl-6">
-              <div class="field">
-                <%= label_tag :q_bill_address_name_cont, t('spree.name_contains') %>
-                <%= f.text_field :bill_address_name_cont, size: 25 %>
-              </div>
-            </div>
-
-            <div class="col-12 col-xl-6">
-              <div class="field" data-hook="sku-select">
-                <%= label_tag :q_line_items_variant_id_in, t('spree.variant') %>
-                <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-12 col-md-6 col-lg-4 col-xl-3">
-          <% if Spree::Store.count > 1 %>
-            <div class="field">
-              <%= label_tag :q_store_id_eq, t('spree.store') %>
-              <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "custom-select fullwidth" } %>
-            </div>
+        <% Spree::Backend::Config.search_fields[controller_path].each do |field_config| %>
+          <% if !field_config.has_key?(:if) || field_config[:if].call %>
+            <%= render field_config.except(:if).deep_merge(locals: { f: f }) %>
           <% end %>
-
-          <div class="field checkbox">
-            <label>
-              <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
-              <%= t('spree.show_only_complete_orders') %>
-            </label>
-          </div>
-        </div>
-
+        <% end %>
       </div>
 
       <div class="clearfix"></div>

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

@@ -71,8 +71,8 @@
       <tr data-hook="admin_products_index_headers">
         <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
         <th></th>
-        <th><%= sort_link @search,:name, Spree::Product.human_attribute_name(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
-        <th class="align-right"><%= sort_link @search,:master_default_price_amount, Spree::Product.human_attribute_name(:price), {}, {title: 'admin_products_listing_price_title'} %></th>
+        <th><%= sort_link @search,:name, Spree::Product.human_attribute_name(:name), { default_order: "desc", title: 'admin_products_listing_name_title'} %></th>
+        <th class="align-right"><%= sort_link @search,:master_default_price_amount, Spree::Product.human_attribute_name(:price), {title: 'admin_products_listing_price_title'} %></th>
         <th data-hook="admin_products_index_header_actions" class="actions"></th>
       </tr>
     </thead>

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

@@ -4,7 +4,7 @@
 
 <% if available_locale_options_for_select.size > 1 %>
   <li>
-    <%= form_tag(admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
+    <%= form_tag(spree.admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
       <label>
         <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-global-line"></use></svg>
         <select name="switch_to_locale" onchange="this.form.requestSubmit()">

data/app/views/spree/admin/shared/search_fields/_checkbox.html.erb

@@ -0,0 +1,8 @@
+<div class="col-12 col-md-6 col-lg-4 col-xl-3">
+  <div class="field checkbox">
+    <label>
+      <%= f.check_box ransack, {checked: params[:q][ransack] == '1' }, '1', '0' %>
+      <%= label.respond_to?(:call) ? label.call : label  %>
+    </label>
+  </div>
+</div>

data/app/views/spree/admin/shared/search_fields/_date_range_picker.html.erb

@@ -0,0 +1,16 @@
+<div class="col-12 col-md-6 col-lg-4 col-xl-3">
+  <div class="date-range-filter field">
+    <%= label_tag "q_#{attribute}", label.respond_to?(:call) ? label.call : label %>
+    <div class="date-range-fields input-group">
+      <%= f.text_field "#{attribute}_gt", class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: t('spree.start') %>
+
+      <div class="input-group-prepend input-group-append">
+        <span class="input-group-text range-divider">
+          <i class="fa fa-arrow-right"></i>
+        </span>
+      </div>
+
+      <%= f.text_field "#{attribute}_lt", class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: t('spree.stop') %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shared/search_fields/_select.html.erb

@@ -0,0 +1,6 @@
+<div class="col-12 col-md-6 col-lg-4 col-xl-3">
+  <div class="field">
+    <%= label_tag "q_#{ransack}", label.respond_to?(:call) ? label.call : label %>
+    <%= f.select ransack, options_for_select(options.call, params[:q][ransack]), {include_blank: true}, class: 'custom-select fullwidth' %>
+  </div>
+</div>

data/app/views/spree/admin/shared/search_fields/_text_field.html.erb

@@ -0,0 +1,6 @@
+<div class="col-12 col-md-6 col-lg-4 col-xl-3">
+  <div class="field">
+    <%= label_tag "q_#{ransack}", label.respond_to?(:call) ? label.call : label %>
+    <%= f.text_field ransack, class: 'form-control', value: params[:q][ransack] %>
+  </div>
+</div>

data/app/views/spree/admin/shared/search_fields/_variant_autocomplete.html.erb

@@ -0,0 +1,6 @@
+<div class="col-12 col-md-6 col-lg-4 col-xl-3">
+  <div class="field">
+    <%= label_tag "q_#{ransack}", label.respond_to?(:call) ? label.call : label %>
+    <%= f.text_field ransack, class: 'variant_autocomplete fullwidth', value: params[:q][ransack] %>
+  </div>
+</div>

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

@@ -81,7 +81,7 @@
         <td><%= tax_rate.amount %></td>
         <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.expires_at.to_date.to_fs(:short_date) if tax_rate.expires_at %></td>
         <td><%= tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>

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

@@ -69,7 +69,7 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search, :email, Spree.user_class.human_attribute_name(:email), {}, {title: 'users_email_title'} %></th>
+      <th><%= sort_link @search, :email, Spree.user_class.human_attribute_name(:email), {title: 'users_email_title'} %></th>
       <th><%= Spree.user_class.human_attribute_name(:spree_roles) %></th>
       <th class="align-center"><%= t('spree.num_orders') %></th>
       <th class="align-center"><%= Spree.user_class.human_attribute_name(:lifetime_value) %></th>

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

@@ -25,13 +25,13 @@
       </colgroup>
 
       <thead>
-        <th><%= sort_link @search, :completed_at, Spree::Order.human_attribute_name(:completed_at), {}, {title: 'orders_completed_at_title'} %></th>
+        <th><%= sort_link @search, :completed_at, Spree::Order.human_attribute_name(:completed_at), {title: 'orders_completed_at_title'} %></th>
         <th colspan=2><%= Spree::LineItem.human_attribute_name(:description) %></th>
         <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
         <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
         <th><%= Spree::Order.human_attribute_name(:total) %></th>
-        <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {}, {title: 'orders_state_title'} %></th>
-        <th><%= sort_link @search, :number, t('spree.admin.user.order_num'), {}, {title: 'orders_number_title'} %></th>
+        <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {title: 'orders_state_title'} %></th>
+        <th><%= sort_link @search, :number, t('spree.admin.user.order_num'), {title: 'orders_number_title'} %></th>
       </thead>
 
       <tbody>

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

@@ -22,14 +22,14 @@
       </colgroup>
       <thead>
         <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {}, {title: 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {}, {title: 'orders_number_title'} %></th>
+          <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {title: 'orders_completed_at_title'} %></th>
+          <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {title: 'orders_number_title'} %></th>
           <th><%= sort_link @search, :state %></th>
           <th><%= sort_link @search, :payment_state %></th>
           <% if Spree::Order.checkout_step_names.include?(:delivery) %>
             <th><%= sort_link @search, :shipment_state %></th>
           <% end %>
-          <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {}, {title: 'orders_total_title'} %></th>
+          <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {title: 'orders_total_title'} %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -103,7 +103,7 @@
                                   @shipping_categories,
                                   :id,
                                   :name,
-                                  { include_blank: t('.use_product_shipping_category') },
+                                  { include_blank: t('.use_product_shipping_category'), selected: @variant[:shipping_category_id] },
                                   { class: 'custom-select fullwidth' } %>
         </div>
       </div>

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

@@ -23,7 +23,7 @@
       <tr data-hook="zones_header">
         <th><%= sort_link @search,:name, Spree::Zone.human_attribute_name(:name), title: 'zones_order_by_name_title' %></th>
         <th>
-          <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {}, {title: 'zones_order_by_description_title'} %>
+          <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {title: 'zones_order_by_description_title'} %>
         </th>
         <th class="actions"></th>
       </tr>

data/config/routes.rb

@@ -14,17 +14,6 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    resources :promotions do
-      resources :promotion_rules
-      resources :promotion_actions
-      resources :promotion_codes, only: [:index, :new, :create]
-      resources :promotion_code_batches, only: [:index, :new, :create] do
-        get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
-      end
-    end
-
-    resources :promotion_categories, except: [:show]
-
     resources :zones
 
     resources :tax_categories