solidus_backend 2.11.4 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f154797f26add4a007c753f802918666a17c1c8e22ca45ec121387f26ae6dc58
-  data.tar.gz: 2d6574a272cf0ae1667f9bdb5bab5a7058ac9f6050f955cf98b6e778818c78c4
+  metadata.gz: 9fcb2fe3e45e4eca63c7d7d0b835aae74460929b257265ec96117d93a42aa6de
+  data.tar.gz: 18157fc502f07af5c6de175802f2ca11e4c4bb79876dfeb72b49e8a3c75c0fcd
 SHA512:
-  metadata.gz: a1fdd05a1bbda7bf56ba8855d73d7dfe02a664b44529a5e098228784745d40c21b36e1c40a40407d56650a1e0c774b066bb4e90fab48d53dbe932f0b1654a87c
-  data.tar.gz: ff314cb4ffcdb0a9dce6d0981656e4ecc96909b409486b73c467867510090de7b84bf46b8982da76488c8be0bf9e8a6c8dbb8e6e099b980c745cfa04a319efc3
+  metadata.gz: a7fe9549edf90b52e830b456ee873c2e954f98a4956a67f6a39d36c967c70432c2f04b2548b8362fd70bdf188069dcaee369cd691ab56e4b917767090eb6023a
+  data.tar.gz: 55c01642e6f79cd86ed05e60e5c6b54980b379fc5c3907a0ffd4e862f5983971f35c005e8f65ba53bf15d6c252d81d06e602061e4a3e296dadf77eb97b2d593c

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

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

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

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

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

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

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

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

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

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

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

@@ -20,7 +20,24 @@
       </div>
     <% end %>
 
-    <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
+    <% 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 %>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="col-5">

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

@@ -1,8 +1,15 @@
+<%
+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? %>
+    <% 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,

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

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

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

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

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 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.4
+        version: 2.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.11.5
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.11.5
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -770,6 +770,10 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_da.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_de.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_el.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-AU.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-GB.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-IN.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-NZ.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es.js