solidus_backend 3.0.8 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 013dd9d01948eac2de99e184d6bb7f395f82416263cd714a632850955005144b
-  data.tar.gz: 35bf7fdf47cab56c76d89dfee1f711f388c69de5799954c2334bbfb3e5f3f831
+  metadata.gz: d99632eb3b53cdf636ca14545438db728190e9f2443805f2b2f7ba2a3f77ed82
+  data.tar.gz: 0ff28214c5691ac1c04500c69a3f8d9956f0413fd059eb2b53317219dbc48db2
 SHA512:
-  metadata.gz: f38d975c0c853412f13079a7cbc8cb69c06df8c1a1c950a9d7aa26d97387f90480e15bd3c6bf81ebeedafa60ab06c6594795826f1dcc2ca612b41f5ee6517340
-  data.tar.gz: 9a84581e63970a276a646de74b7e75999f93c961722730eef87c0a357b290463c9c1d7d22315c258eaec4616cfe514045645384bf1ceb2a8e14c2ac94d8f566a
+  metadata.gz: 5462a343a6e68e7df57049e33010c2c251e55a203d0d90935ea58e6a974ba60f16bb530d60d5c9eaa11f91d366750caaa45a523e596caf9eb5f9eaec0f376975
+  data.tar.gz: 0411ffc0b40f531e62e6872c496147020c8165d300aa7a4157348b95b589bef7f81c4cca82701735a25c3d14c23feaebc5e5b6e88e57efc17f7ea575644e5aaa

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

@@ -15,7 +15,8 @@ $.fn.productAutocomplete = function (options) {
     initSelection: function (element, callback) {
       $.get(Spree.pathFor('admin/search/products'), {
         ids: element.val().split(','),
-        token: Spree.api_key
+        token: Spree.api_key,
+        show_all: true
       }, function (data) {
         callback(multiple ? data.products : data.products[0]);
       });

data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs

@@ -1,5 +1,5 @@
 <td class="stock-location-name">
-  <a href="/admin/stock_locations/{{stockLocationId}}/stock_movements?q%5Bvariant_sku_eq%5D={{variantSku}}">
+  <a href="{{admin_url}}/stock_locations/{{stockLocationId}}/stock_movements?q%5Bvariant_sku_eq%5D={{variantSku}}">
     {{stockLocationName}}
   </a>
 </td>

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/controllers/spree/admin/locale_controller.rb

@@ -4,21 +4,22 @@ module Spree
   module Admin
     class LocaleController < Spree::Admin::BaseController
       def set
-        locale = params[:switch_to_locale].to_s.presence
+        requested_locale = params[:switch_to_locale].to_s.presence
 
-        if locale && I18n.available_locales.include?(locale.to_sym)
-          I18n.locale = locale
-          session[set_user_language_locale_key] = locale
-
-          respond_to do |format|
-            format.json { render json: { locale: locale, location: spree.admin_url } }
-          end
+        if locale_is_available?(requested_locale)
+          I18n.locale = requested_locale
+          session[set_user_language_locale_key] = requested_locale
+          render json: { locale: requested_locale, location: spree.admin_url }
         else
-          respond_to do |format|
-            format.json { render json: { locale: I18n.locale }, status: 404 }
-          end
+          render json: { locale: I18n.locale }, status: 404
         end
       end
+
+      private
+
+      def locale_is_available?(locale)
+        locale && I18n.available_locales.include?(locale.to_sym)
+      end
     end
   end
 end

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

@@ -86,7 +86,7 @@ module Spree
           if @order.can_complete?
             flash[:success] = t('spree.order_ready_for_confirm')
           else
-            flash[:error] = @order.errors.full_messages
+            flash[:error] = @order.errors.full_messages.join(', ')
           end
           redirect_to confirm_admin_order_url(@order)
         end

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

@@ -104,7 +104,7 @@ module Spree
       end
 
       def product_includes
-        [:variant_images, { variants: [:images], master: [:images, :default_price] }]
+        [:variant_images, { variants: [:images], master: [:images, :prices] }]
       end
 
       def clone_object_url(resource)

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

@@ -78,8 +78,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def update_positions
     ActiveRecord::Base.transaction do
-      params[:positions].each do |id, index|
-        model_class.find_by(id: id)&.set_list_position(index)
+      positions = params[:positions]
+      records = model_class.where(id: positions.keys).to_a
+
+      positions.each do |id, index|
+        records.find { |r| r.id == id.to_i }&.set_list_position(index)
       end
     end
 

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

@@ -29,10 +29,20 @@ module Spree
           @products = Spree::Product.ransack(params[:q]).result
         end
 
-        @products = @products.distinct.page(params[:page]).per(params[:per_page])
+        @products = list_products
         expires_in 15.minutes, public: true
         headers['Surrogate-Control'] = "max-age=#{15.minutes}"
       end
+
+      private
+
+      def list_products
+        if params[:show_all]
+          @products.distinct.page(params[:page])
+        else
+          @products.distinct.page(params[:page]).per(params[:per_page])
+        end
+      end
     end
   end
 end

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

@@ -51,7 +51,12 @@ module Spree
 
       def variant_scope
         scope = Spree::Variant.accessible_by(current_ability)
-        scope = scope.where(product: @product) if @product
+        if @product
+          scope = scope.where(
+            product: @product,
+            is_master: !@product.has_variants?
+          )
+        end
         scope = scope.order(:sku)
         scope
       end

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

@@ -92,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
 
@@ -121,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/controllers/spree/admin/variants_controller.rb

@@ -16,7 +16,7 @@ module Spree
         @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
                                                                       'sku', 'is_master')
         # Shallow Clone of the default price to populate the price field.
-        @object.default_price = @object.product.master.default_price.clone
+        @object.prices.build(@object.product.master.default_price.attributes.except("id", "created_at", "updated_at", "deleted_at"))
       end
 
       def collection
@@ -35,7 +35,7 @@ module Spree
       end
 
       def variant_includes
-        [{ option_values: :option_type }, :default_price]
+        [{ option_values: :option_type }, :prices]
       end
 
       def redirect_on_empty_option_values

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

@@ -48,6 +48,10 @@
             <%= 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">

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/products/index.html.erb

@@ -78,7 +78,7 @@
               <%= render 'spree/admin/shared/image', image: product.gallery.images.first, size: :mini %>
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-            <td class="align-right"><%= product.display_price.to_html %></td>
+            <td class="align-right"><%= product.display_price&.to_html %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
               <%= link_to_edit product, no_text: true, class: 'edit' if can?(:edit, product) && !product.deleted? %>
               &nbsp;

data/app/views/spree/admin/promotion_code_batches/_form_fields.html.erb

@@ -0,0 +1,22 @@
+<div class="field">
+  <%= batch.label :base_code, class: "required" %>
+  <%= batch.text_field :base_code, class: "fullwidth", required: true %>
+</div>
+<div class="field">
+  <%= batch.label :number_of_codes, class: "required" %>
+  <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
+</div>
+<div class="field">
+  <%= batch.label :join_characters %>
+  <%= batch.text_field :join_characters, class: "fullwidth" %>
+</div>
+<% unless promotion_id %>
+  <div class="field">
+    <%= f.label :per_code_usage_limit %>
+    <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
+  </div>
+<% end %>
+<div class="field">
+  <%= batch.label :email %>
+  <%= batch.text_field :email, class: "fullwidth" %>
+</div>

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

@@ -1,28 +1,8 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
 <% admin_breadcrumb(link_to @promotion.name, spree.admin_promotion_path(@promotion.id)) %>
 <% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
-
-<%= form_for :promotion_code_batch, url: collection_url do |f| %>
-  <%= f.hidden_field :promotion_id, value: params[:promotion_id] %>
-
-  <%= f.field_container :base_code do %>
-    <%= f.label :base_code %>
-    <%= f.text_field :base_code, class: "fullwidth" %>
-  <% end %>
-
-  <%= f.field_container :join_characters do %>
-    <%= f.label :join_characters %>
-    <%= f.text_field :join_characters, class: "fullwidth" %>
-  <% end %>
-
-  <%= f.field_container :number_of_codes do %>
-    <%= f.label :number_of_codes %>
-    <%= f.text_field :number_of_codes, class: "fullwidth" %>
-  <% end %>
-
-  <%= f.field_container :email do %>
-    <%= f.label :email %>
-    <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
-  <% end %>
-  <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
+<%= form_for :promotion_code_batch, url: collection_url do |batch| %>
+  <%= batch.hidden_field :promotion_id, value: params[:promotion_id] %>
+  <%= render partial: 'form_fields', locals: {batch: batch, promotion_id: params[:promotion_id]} %>
+  <%= batch.submit t('spree.actions.create'), class: 'btn btn-primary' %>
 <% end %>

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

@@ -35,22 +35,7 @@
 
     <div data-activation-type="multiple_codes">
       <%= fields_for :promotion_code_batch, @promotion_code_batch do |batch| %>
-        <div class="field">
-          <%= batch.label :base_code, class: "required" %>
-          <%= batch.text_field :base_code, class: "fullwidth", required: true %>
-        </div>
-        <div class="field">
-          <%= batch.label :number_of_codes, class: "required" %>
-          <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
-        </div>
-        <div class="field">
-          <%= batch.label :join_characters %>
-          <%= batch.text_field :join_characters, class: "fullwidth" %>
-        </div>
-        <div class="field">
-          <%= f.label :per_code_usage_limit %>
-          <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
-        </div>
+        <%= render partial: 'spree/admin/promotion_code_batches/form_fields', locals: {f: f, batch: batch, promotion_id: params[:promotion_id]} %>
       <% end %>
     </div>
 

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-6">
     <div class="field">
-      <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t(o, scope: 'spree.item_total_rule.operators'),o]}, promotion_rule.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
+      <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(promotion_rule.class.operator_options, promotion_rule.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
     </div>
   </div>
   <div class="col-6">

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/reimbursements/edit.html.erb

@@ -100,7 +100,7 @@
       <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post' } do %>
         <%= t('spree.reimburse') %>
       <% end %>
-      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>
+      <%= link_to t('spree.actions.cancel'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -1,5 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Order), spree.admin_orders_path) %>
-<% admin_breadcrumb(link_to "##{@order.number}", spree.edit_admin_order_path(@order)) %>
+<% admin_breadcrumb(link_to @order.number, spree.edit_admin_order_path(@order)) %>
 
 
 <% content_for :sidebar_title do %>

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

@@ -62,8 +62,8 @@
     <%= f.field_container :cart_tax_country_iso do %>
       <%= f.label :cart_tax_country_iso %>
       <%= f.field_hint :cart_tax_country_iso %>
-      <%= f.collection_select :cart_tax_country_iso,
-        available_countries(restrict_to_zone: nil), :iso, :name,
+      <%= f.select :cart_tax_country_iso,
+        Spree::Country.all.map { |c| [c.name, c.iso] },
         { include_blank: t(".no_cart_tax_country") },
         { class: "custom-select fullwidth" } %>
       <%= f.error_message_on :cart_tax_country_iso %>

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.can_be_deleted? %>
+          <% if can?(:destroy, user) && user.orders.count.zero? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

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

@@ -65,7 +65,7 @@
       <div class="col-3">
         <div class="field" data-hook="price">
           <%= f.label :price %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.find_or_build_default_price.currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.default_price_or_build.currency %>
         </div>
       </div>
 

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

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

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

@@ -4,14 +4,14 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div class="row">
-      <div class="col-10">
-        <div data-hook="admin_variants_index_search" class="field">
-          <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
-          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
-        </div>
+    <div class="col-10">
+      <div data-hook="admin_variants_index_search" class="field">
+        <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
+        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
       </div>
+    </div>
 
+    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,10 +20,10 @@
           </label>
         </div>
       </div>
-    </div>
+    <% end %>
 
     <div class="actions filter-actions">
-      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
+      <%= f.button :search %>
     </div>
   <% end %>
 <% end %>

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

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

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

data/lib/spree/backend/engine.rb

@@ -8,6 +8,10 @@ module Spree
       # Leave initializer empty for backwards-compatability. Other apps
       # might still rely on this event.
       initializer "spree.backend.environment", before: :load_config_initializers do; end
+
+      config.after_initialize do
+        Spree::Backend::Config.check_load_defaults_called('Spree::Backend::Config')
+      end
     end
   end
 end

data/vendor/assets/javascripts/solidus_admin/select2_locales/{select2_locale_pt-PT.js → select2_locale_pt.js}

@@ -4,7 +4,7 @@
 (function ($) {
     "use strict";
 
-    $.fn.select2.locales['pt-PT'] = {
+    $.fn.select2.locales['pt'] = {
         formatNoMatches: function () { return "Nenhum resultado encontrado"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduza " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
@@ -13,5 +13,5 @@
         formatSearching: function () { return "A pesquisar…"; }
     };
 
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']);
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['pt']);
 })(jQuery);

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: 3.0.8
+  version: 3.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2021-09-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: 3.0.8
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +516,7 @@ files:
 - app/views/spree/admin/promotion_categories/edit.html.erb
 - app/views/spree/admin/promotion_categories/index.html.erb
 - app/views/spree/admin/promotion_categories/new.html.erb
+- app/views/spree/admin/promotion_code_batches/_form_fields.html.erb
 - app/views/spree/admin/promotion_code_batches/download.csv.ruby
 - app/views/spree/admin/promotion_code_batches/index.html.erb
 - app/views/spree/admin/promotion_code_batches/new.html.erb
@@ -800,7 +801,7 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_nl.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pl.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pt-BR.js
-- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pt-PT.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pt.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ro.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_rs.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ru.js
@@ -919,7 +920,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.