solidus_backend 2.11.1 → 2.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa06c5143ed4281567a88b1a3237c63e96c608a32c4f3d11ee54811f6b776108
-  data.tar.gz: 479a858bb8c4e43936ecee55d573ebd15228772438c461e86c95ed5a4d65f91d
+  metadata.gz: c1b58601ef7b61261811b03984aa63749a174d5efc135e2cfca62163f6667e1a
+  data.tar.gz: bdb3ac45f4eae916f9960f76f2833b7d33900786515bf01e4979caa0c021b423
 SHA512:
-  metadata.gz: f96eb0492d0bc0af33cd16e7a6f25b4d3c43164683fd6d3f5572062af4bb65fff5ba651930ee2b2b1da564a6c5769ab3cf78bc9dfb0da9b0e922087b4d2ab16c
-  data.tar.gz: 1605c6b1a664c1703a776fd1669bd17c946d826e7fec078f15e74f77d7973071e0ea0385e13a7277efb4f8dc9c92d016733da1da6cddc33f4007c58c9e93b547
+  metadata.gz: 483807d22e4eb7999550d9871762165e19e46671019a97b6376fcb0740edd63a70160b7d2af742e17d863b42cff40005bd17ec513a45cad105b64500f130e605
+  data.tar.gz: 798f80886650797f53a705c9ee0029e8234f3360a62434fbd82115ba88bfd680a4079e4bc9e67d9feb66870fd897a29a1a2cc25bfe43dbb5474b5f3ab3d28be3

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/assets/stylesheets/spree/backend/_bootstrap_custom.scss

@@ -13,7 +13,7 @@ $secondary:        $color-dark-accent !default;
 $blue:   $color-primary !default;
 $red:    $color-red !default;
 $orange: $color-yellow !default;
-$green:  $color-success !default;
+$green:  $color-green !default;
 
 // Body
 //

data/app/assets/stylesheets/spree/backend/components/_actions.scss

@@ -1,3 +1,65 @@
+$color-action-success-bg: theme-color-level(success, -10) !default;
+$color-action-success-brd: theme-color-level(success, -9) !default;
+$color-action-warning-bg: theme-color-level(warning, -10) !default;
+$color-action-warning-brd: theme-color-level(warning, -9) !default;
+$color-action-danger-bg: theme-color-level(danger, -10) !default;
+$color-action-danger-brd: theme-color-level(danger, -9) !default;
+
+$color-action-edit-bg: $color-action-success-bg !default;
+$color-action-edit-brd: $color-action-success-brd !default;
+$color-action-clone-bg: $color-action-warning-bg !default;
+$color-action-clone-brd: $color-action-warning-brd !default;
+$color-action-remove-bg: $color-action-danger-bg !default;
+$color-action-remove-brd: $color-action-danger-brd !default;
+$color-action-void-bg: $color-action-danger-bg !default;
+$color-action-void-brd: $color-action-danger-brd !default;
+$color-action-cancel-bg: $color-action-warning-bg !default;
+$color-action-cancel-brd: $color-action-warning-brd !default;
+$color-action-capture-bg: $color-action-success-bg !default;
+$color-action-capture-brd: $color-action-success-brd !default;
+$color-action-save-bg: $color-action-success-bg !default;
+$color-action-save-brd: $color-action-success-brd !default;
+$color-action-mail-bg: $color-action-success-bg !default;
+$color-action-mail-brd: $color-action-success-brd !default;
+$color-action-failure-bg: $color-action-danger-bg !default;
+$color-action-failure-brd: $color-action-danger-brd !default;
+
+$actions: (
+  edit,
+  clone,
+  remove,
+  void,
+  capture,
+  save,
+  cancel,
+  mail,
+  failure
+) !default;
+
+$actions-bg-colors: (
+  $color-action-edit-bg,
+  $color-action-clone-bg,
+  $color-action-remove-bg,
+  $color-action-void-bg,
+  $color-action-capture-bg,
+  $color-action-save-bg,
+  $color-action-cancel-bg,
+  $color-action-mail-bg,
+  $color-action-failure-bg
+) !default;
+
+$actions-brd-colors: (
+  $color-action-edit-brd,
+  $color-action-clone-brd,
+  $color-action-remove-brd,
+  $color-action-void-brd,
+  $color-action-capture-brd,
+  $color-action-save-brd,
+  $color-action-cancel-brd,
+  $color-action-mail-brd,
+  $color-action-failure-brd
+) !default;
+
 table tbody tr {
   &.highlight {
 

data/app/assets/stylesheets/spree/backend/components/_messages.scss

@@ -44,16 +44,16 @@
   color: $body-color;
 
   &.notice {
-    background-color: rgba(lighten($color-notice, 15), .95);
-    border-top-color: $color-notice;
+    background-color: rgba(theme-color-level(warning, -8), .95);
+    border-top-color: theme-color(warning);
   }
   &.success {
-    background-color: rgba(lighten($color-success, 30), .95);
-    border-top-color: $color-success;
+    background-color: rgba(theme-color-level(success, -10), .95);
+    border-top-color: theme-color(success);
   }
   &.error {
-    background-color: rgba(lighten($color-error, 30), .95);
-    border-top-color: $color-error;
+    background-color: rgba(theme-color-level(danger, -8), .95);
+    border-top-color: theme-color(danger);
   }
 }
 

data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss

@@ -11,7 +11,7 @@ $output-solidus-deprecation-warnings: true !default;
   @if $output-solidus-deprecation-warnings == true {
     @if global-variable-exists($variable) {
       @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
-        "removed in 3.0.0. Please use Bootstraps $#{$replacement} instead";
+        "removed in 3.0.0. Please use Bootstraps #{$replacement} instead";
     }
   }
 }

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -62,11 +62,11 @@ $color-tab-active-bg:           $color-white !default;
 $color-tab-active-border:       $color-white !default;
 
 // Basic flash colors
-@include bs-deprecated-variable("color-success", "brand-success");
+@include bs-deprecated-variable("color-success", "theme-color(success)");
 $color-success:                 $color-green !default;
-@include bs-deprecated-variable("color-notice", "brand-warning");
+@include bs-deprecated-variable("color-notice", "theme-color(warning)");
 $color-notice:                  $color-yellow !default;
-@include bs-deprecated-variable("color-error", "brand-danger");
+@include bs-deprecated-variable("color-error", "theme-color(danger)");
 $color-error:                   $color-red !default;
 
 // Breadcrumb custom variable
@@ -113,26 +113,6 @@ $color-pill-warning-text: $color-pill-text;
 $color-pill-error: #ff967b;
 $color-pill-error-text: $color-pill-text;
 
-// Actions colors
-$color-action-edit-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-edit-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-clone-bg:          lighten($color-notice,  (5 * 5)  ) !default;
-$color-action-clone-brd:         lighten($color-notice,  (15 * 5) ) !default;
-$color-action-remove-bg:         lighten($color-error,   (5 * 5)  ) !default;
-$color-action-remove-brd:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-bg:           lighten($color-error,   (10 * 5) ) !default;
-$color-action-void-brd:          lighten($color-error,   (20 * 5) ) !default;
-$color-action-cancel-bg:         lighten($color-notice,  (10 * 5) ) !default;
-$color-action-cancel-brd:        lighten($color-notice,  (20 * 5) ) !default;
-$color-action-capture-bg:        lighten($color-success, (5 * 5)  ) !default;
-$color-action-capture-brd:       lighten($color-success, (20 * 5) ) !default;
-$color-action-save-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-save-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-mail-bg:           lighten($color-success, (5 * 5)  ) !default;
-$color-action-mail-brd:          lighten($color-success, (20 * 5) ) !default;
-$color-action-failure-bg:        lighten($color-error,   (10 * 5) ) !default;
-$color-action-failure-brd:       lighten($color-error,   (20 * 5) ) !default;
-
 // Available states
 $states: (
   active,
@@ -160,11 +140,6 @@ $states: (
   void
 ) !default;
 
-// Available actions
-$actions: edit, clone, remove, void, capture, save, cancel, mail, failure !default;
-$actions-bg-colors: $color-action-edit-bg, $color-action-clone-bg, $color-action-remove-bg, $color-action-void-bg, $color-action-capture-bg, $color-action-save-bg, $color-action-cancel-bg, $color-action-mail-bg, $color-action-failure-bg !default;
-$actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-action-remove-brd, $color-action-void-brd, $color-action-capture-brd, $color-action-save-brd, $color-action-cancel-brd, $color-action-mail-brd, $color-action-failure-brd !default;
-
 // Sidebar
 //--------------------------------------------------------------
 $width-sidebar:                  200px !default;

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

@@ -11,8 +11,9 @@ module Spree
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def create
-        @refund.attributes = refund_params.merge(perform_after_create: false)
-        if @refund.save && @refund.perform!
+        @refund.attributes = refund_params
+
+        if @refund.valid? && @refund.perform!
           flash[:success] = flash_message_for(@refund, :successfully_created)
           respond_with(@refund) do |format|
             format.html { redirect_to location_after_save }

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

@@ -84,7 +84,7 @@
                
               <%= link_to_clone product, no_text: true, class: 'clone' if can?(:clone, product) %>
               &nbsp;
-              <%= link_to_delete product, no_text: true if can?(:delete, product) && !product.deleted? %>
+              <%= link_to_delete product, no_text: true if can?(:destroy, product) && !product.deleted? %>
             </td>
           </tr>
       <% end %>

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

@@ -3,24 +3,24 @@
     <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
   <% end %>
 
-  <% if can?(:show, Spree::PaymentMethod) %>
+  <% if can?(:admin, Spree::PaymentMethod) %>
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:show, Spree::TaxCategory) || can?(:show, Spree::TaxRate) %>
+  <% if can?(:admin, Spree::TaxCategory) || can?(:admin, Spree::TaxRate) %>
     <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
   <% end %>
 
-  <% if can?(:show, Spree::RefundReason) || can?(:show, Spree::ReimbursementType) ||
+  <% if can?(:admin, Spree::RefundReason) || can?(:admin, Spree::ReimbursementType) ||
     can?(:show, Spree::ReturnReason) || can?(:show, Spree::AdjustmentReason) %>
     <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
   <% end %>
 
-  <% if can?(:show, Spree::ShippingMethod) || can?(:show, Spree::ShippingCategory) || can?(:show, Spree::StockLocation) %>
+  <% if can?(:admin, Spree::ShippingMethod) || can?(:admin, Spree::ShippingCategory) || can?(:admin, Spree::StockLocation) %>
     <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 
-  <% if can?(:show, Spree::Zone) %>
+  <% if can?(:admin, Spree::Zone) %>
     <%= tab :zones, url: spree.admin_zones_path %>
   <% end %>
 </ul>

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

@@ -56,7 +56,7 @@
                 <span><%= t store_credit.invalidated? ? 'spree.say_yes' : 'spree.say_no' %></span>
               </td>
               <td class="actions" data-hook="admin_store_credits_index_row_actions">
-                <% if can?(:show, store_credit) %>
+                <% if can?(:edit, store_credit) %>
                   <%= link_to_edit_url admin_user_store_credit_path(@user, store_credit), { no_text: true, class: 'edit' } %>
                 <% end %>
               </td>

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -39,17 +39,17 @@ colors = [
     used_for: 'Buttons primary actions, links, active states.'
   },
   {
-    name: '$color-success',
+    name: 'theme-color(success)',
     value: '#52B73B',
     used_for: 'Success actions.'
   },
   {
-    name: '$color-error',
+    name: 'theme-color(danger)',
     value: '#CE452A',
     used_for: 'Errors, destructive action warnings.'
   },
   {
-    name: '$color-notice',
+    name: 'theme-color(warning)',
     value: '#FFDD59',
     used_for: 'Warnings actions.'
   }

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).exists? %>
+    <% 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/lib/spree/backend_configuration.rb

@@ -133,17 +133,17 @@ module Spree
           'wrench',
           condition: -> {
             can?(:admin, Spree::Store) ||
-            can?(:show, Spree::AdjustmentReason) ||
-            can?(:show, Spree::PaymentMethod) ||
-            can?(:show, Spree::RefundReason) ||
-            can?(:show, Spree::ReimbursementType) ||
-            can?(:show, Spree::ShippingCategory) ||
-            can?(:show, Spree::ShippingMethod) ||
-            can?(:show, Spree::StockLocation) ||
-            can?(:show, Spree::TaxCategory) ||
-            can?(:show, Spree::TaxRate) ||
-            can?(:show, Spree::ReturnReason) ||
-            can?(:show, Spree::Zone)
+            can?(:admin, Spree::AdjustmentReason) ||
+            can?(:admin, Spree::PaymentMethod) ||
+            can?(:admin, Spree::RefundReason) ||
+            can?(:admin, Spree::ReimbursementType) ||
+            can?(:admin, Spree::ShippingCategory) ||
+            can?(:admin, Spree::ShippingMethod) ||
+            can?(:admin, Spree::StockLocation) ||
+            can?(:admin, Spree::TaxCategory) ||
+            can?(:admin, Spree::TaxRate) ||
+            can?(:admin, Spree::ReturnReason) ||
+            can?(:admin, Spree::Zone)
           },
           label: :settings,
           partial: 'spree/admin/shared/settings_sub_menu',

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.1
+  version: 2.11.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-03-18 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.1
+        version: 2.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.11.6
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.11.6
 - !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