solidus_backend 3.0.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa1e8e4ed76655a54de7bfa571e16ff869216722bfef15006dddb2748676cb0
-  data.tar.gz: 9119a85ad6f661c566446425b224fe975026d509c53a42da7a59bf0dd6c0bfc1
+  metadata.gz: faffdc96fe202da42b65e2db88378186cc0fd823b480afa9fc3870e4e9573396
+  data.tar.gz: 5bdb6db147ec1110ab143f9ff19986238d98efb351f4b4666bd3279dffd4d2fa
 SHA512:
-  metadata.gz: b473137b585a7ee43e757b0cf7bfe4232f1b43ad5f5725b72448b84a310db04a4be6251b31a8ced31152013ea5c7862b6d3c0cddd0e520482e71d1b73b682e3f
-  data.tar.gz: 99eba5d27ed1c2d61376ad8c5b38132245ac59786020fc33b83826f12fd0c2278a7b794da55d58be08aae15c82076bb8ca722dbd9a1ebedd48398740faa6a1cb
+  metadata.gz: f38458d7b4cc2e78d175fa2f10dc90b3d069eb02e804a65ead5fc7efc8e5e3ea6a74dee3f7a1caa29f7ef137b74183bbd7a3c850bc9f1f02405e448103750baf
+  data.tar.gz: a60fbc0edfd1eb08852eedd2b0cec89bc481e845fa88fc37e32d4ff7126a5d4dd547ba7d816e105c234912d1c47e8e618156361398b35ab535c2c7887e943bfd

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

@@ -11,7 +11,7 @@
       </div>
     </div>
 
-    <% if product.variants.discarded.any? %>
+    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>

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

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

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/solidus_backend.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
 
-  s.add_dependency 'autoprefixer-rails'
+  s.add_dependency 'autoprefixer-rails', '~> 10.2', '>= 10.2.5.1'
   s.add_dependency 'handlebars_assets', '~> 0.23'
 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);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-09-29 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.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,22 @@ dependencies:
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.2.5.1
 - !ruby/object:Gem::Dependency
   name: handlebars_assets
   requirement: !ruby/object:Gem::Requirement
@@ -510,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
@@ -794,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
@@ -913,7 +920,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.