solidus_backend 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55b819b0c157a4f629d3a65309bd3afe6d2a803ffcea1244c2926c8403af3de
-  data.tar.gz: 5cb32cd0595023918134a00859f033962b0aa6ec62d98c5220a96ea847d35b88
+  metadata.gz: 5b86594eac44c015e9c7d6c206ce3c15086baa96db0338ccb845e026b9d61c0d
+  data.tar.gz: 388007e9b8b1dc8fe7ac3c04af96d60bb06d44fbddc0cd84919aaae65a7b5497
 SHA512:
-  metadata.gz: e72d2981c0b252a9648d4a617215a20771e4155bb1a4dff301db77e16cfee73f2665883212ffa36a04d2df824ad13010892c6e9ab1fbdfc979f0d0ada567b0dd
-  data.tar.gz: 5bdd7a9d3d573e92a5ffd682f10e64921ed3cd6bd190aacd52ef7830923e66f3a3196d18d7cca1c735bd677c7d58baf83389b1c53820dcaf1d7f66fb063b10c7
+  metadata.gz: a1005b2bed74bc5c3fe9c20bf964aa5c73a96fe45f751752751a1f17f8f18fef03c695cc911d4e6e72f7381aad45399f5a63f188316931bea22bd8db3079e3bf
+  data.tar.gz: 5c98470d7f898b841413275bb8296f4c4ed50263c995696b3baf5b8be0ac98e4dbaeb82022b18833facfffd082d5c002fd86bf7c12d81e925c41dbd3d9b01677

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

@@ -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/views/spree/admin/products/_form.html.erb

@@ -33,7 +33,7 @@
         <%= f.field_container :price do %>
           <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
 
-          <% if f.object.new_record? || f.object.has_default_price? %>
+          <% if (f.object.new_record? || f.object.has_default_price?) && !f.object.discarded? %>
             <%= render "spree/admin/shared/number_with_currency",
                        f: f,
                        amount_attr: :price,

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.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-11-09 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.2
+        version: 3.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -911,7 +911,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.