solidus_backend 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e98837af337f5255926cb548c111a842b74df3d4d2c08bf53b495d3363b496
-  data.tar.gz: 623f45cea7da431a725a43fddbbdefa82d39e329a1839d94c7739da82c3ffa71
+  metadata.gz: ff3b0be31692e952e9756dd6d02e2156cd328f6d8f95eeda5ef8f6d8e12e22da
+  data.tar.gz: bcfecf645946ce5324b3b8ce001a7fd7a4d38da8db3e18738e3e4cee183830f2
 SHA512:
-  metadata.gz: 1d4253ccbbac04ec3821a33dc5b1263639af936ad6b91092d4b0524718d7ff0af8e08909f3c1244e76457b47c5c5644f0a256d9d2bcf7ba2dcb49129d0291771
-  data.tar.gz: afb9189394a18f2246df9b141e387d7f1d06ceba92627546f773a8b9e3dbaf4a220c50148bb724fb6cd77aba3bf1b1f0bf03b6a3029422b582b9a8d84737aef2
+  metadata.gz: 76b6ac3adcdf770abf436e0a530a94e61a0ba666eaf6f8272d7a08bb1437eddeeaefc472b5e6b099943b5fc791005c6cb67706573d01c14025040108fa4f00ba
+  data.tar.gz: 414a0910cb90706ae48f73173ec6eb7546b748b0ca2f2a5cf6dee77ee0974ece835bee35faa9d4acb46800caf31a6d9e5b380f9a785e8f7fb3e422968cd38cc4

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

@@ -56,7 +56,7 @@ Spree.Models.ImageUpload = Backbone.Model.extend({
       processData: false,  // tell jQuery not to process the data
       contentType: false,  // tell jQuery not to set contentType
       xhr: function () {
-        var xhr = $.ajaxSettings.xhr();
+        var xhr = $.ajaxSetup.xhr(); // Using default ajax builder but inputting upload settings
         if (xhr.upload) {
           xhr.upload.onprogress = function (event) {
             if (event.lengthComputable) {
@@ -67,9 +67,9 @@ Spree.Models.ImageUpload = Backbone.Model.extend({
         }
         return xhr;
       }
-    }).done(function() {
+    }).then(function() {
       that.set({progress: 100})
-    }).error(function(jqXHR, textStatus, errorThrown) {
+    }).fail(function() {
       that.set({serverError: true});
     });
   }

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

@@ -100,30 +100,26 @@ var ShipmentSplitItemView = Backbone.View.extend({
       variant_id: this.variant.id,
       quantity: quantity
     };
-    var jqXHR;
+    var path;
     if (target_type == 'stock_location') {
       // transfer to a new location
       split_attr.stock_location_id = target_id;
-      jqXHR = Spree.ajax({
-        type: "POST",
-        url: Spree.pathFor('api/shipments/transfer_to_location'),
-        data: split_attr
-      });
+      path = Spree.pathFor("api/shipments/transfer_to_location");
     } else if (target_type == 'shipment') {
       // transfer to an existing shipment
       split_attr.target_shipment_number = target_id;
-      jqXHR = Spree.ajax({
-        type: "POST",
-        url: Spree.pathFor('api/shipments/transfer_to_shipment'),
-        data: split_attr
-      });
+      path = Spree.pathFor('api/shipments/transfer_to_shipment');
     } else {
       alert('Please select the split destination.');
       return false;
     }
-    jqXHR.error(function(msg) {
+    Spree.ajax({
+      type: "POST",
+      url: path,
+      data: split_attr
+    }).fail(function(msg) {
       alert(Spree.t("split_failed"));
-    }).done(function(response) {
+    }).then(function(response) {
       if (response.success) {
         window.Spree.advanceOrder();
       } else {

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

@@ -32,7 +32,8 @@
         data: function(term, page) {
           var searchData = {
             variant_search_term: term,
-            token: Spree.api_key
+            token: Spree.api_key,
+            page: page
           };
           return _.extend(searchData, searchOptions);
         },
@@ -40,7 +41,8 @@
         results: function(data, page) {
           window.variants = data["variants"];
           return {
-            results: data["variants"]
+            results: data["variants"],
+            more: data.current_page * data.per_page < data.total_count
           };
         }
       },

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

@@ -103,10 +103,6 @@ module Spree
           attributes |= [:email]
         end
 
-        if can? :manage, Spree::Role
-          attributes += [{ spree_role_ids: [] }]
-        end
-
         if can? :manage, Spree::StockLocation
           attributes += [{ stock_location_ids: [] }]
         end
@@ -142,9 +138,13 @@ module Spree
       end
 
       def set_roles
-        if user_params[:spree_role_ids]
-          @user.spree_roles = Spree::Role.accessible_by(current_ability).where(id: user_params[:spree_role_ids])
-        end
+        roles_ids = params[:user][:spree_role_ids]
+        return unless roles_ids
+
+        @user.update_spree_roles(
+          Spree::Role.where(id: roles_ids),
+          ability: current_ability
+        )
       end
 
       def set_stock_locations

data/vendor/assets/stylesheets/solidus_admin/select2.scss

@@ -439,7 +439,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
-    background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 100%;
+    background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 95% center;
 }
 
 .select2-results .select2-ajax-error {
@@ -449,6 +449,7 @@ disabled look for disabled choices in the results dropdown
 .select2-more-results {
     background: #f4f4f4;
     display: list-item;
+    padding: 0.5em 1em
 }
 
 /* disabled styles */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-11-03 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.2.1
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement