solidus_backend 3.2.2 → 3.2.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c55b819b0c157a4f629d3a65309bd3afe6d2a803ffcea1244c2926c8403af3de
4
- data.tar.gz: 5cb32cd0595023918134a00859f033962b0aa6ec62d98c5220a96ea847d35b88
3
+ metadata.gz: 5b86594eac44c015e9c7d6c206ce3c15086baa96db0338ccb845e026b9d61c0d
4
+ data.tar.gz: 388007e9b8b1dc8fe7ac3c04af96d60bb06d44fbddc0cd84919aaae65a7b5497
5
5
  SHA512:
6
- metadata.gz: e72d2981c0b252a9648d4a617215a20771e4155bb1a4dff301db77e16cfee73f2665883212ffa36a04d2df824ad13010892c6e9ab1fbdfc979f0d0ada567b0dd
7
- data.tar.gz: 5bdd7a9d3d573e92a5ffd682f10e64921ed3cd6bd190aacd52ef7830923e66f3a3196d18d7cca1c735bd677c7d58baf83389b1c53820dcaf1d7f66fb063b10c7
6
+ metadata.gz: a1005b2bed74bc5c3fe9c20bf964aa5c73a96fe45f751752751a1f17f8f18fef03c695cc911d4e6e72f7381aad45399f5a63f188316931bea22bd8db3079e3bf
7
+ data.tar.gz: 5c98470d7f898b841413275bb8296f4c4ed50263c995696b3baf5b8be0ac98e4dbaeb82022b18833facfffd082d5c002fd86bf7c12d81e925c41dbd3d9b01677
@@ -67,9 +67,9 @@ Spree.Models.ImageUpload = Backbone.Model.extend({
67
67
  }
68
68
  return xhr;
69
69
  }
70
- }).done(function() {
70
+ }).then(function() {
71
71
  that.set({progress: 100})
72
- }).error(function(jqXHR, textStatus, errorThrown) {
72
+ }).fail(function() {
73
73
  that.set({serverError: true});
74
74
  });
75
75
  }
@@ -100,30 +100,26 @@ var ShipmentSplitItemView = Backbone.View.extend({
100
100
  variant_id: this.variant.id,
101
101
  quantity: quantity
102
102
  };
103
- var jqXHR;
103
+ var path;
104
104
  if (target_type == 'stock_location') {
105
105
  // transfer to a new location
106
106
  split_attr.stock_location_id = target_id;
107
- jqXHR = Spree.ajax({
108
- type: "POST",
109
- url: Spree.pathFor('api/shipments/transfer_to_location'),
110
- data: split_attr
111
- });
107
+ path = Spree.pathFor("api/shipments/transfer_to_location");
112
108
  } else if (target_type == 'shipment') {
113
109
  // transfer to an existing shipment
114
110
  split_attr.target_shipment_number = target_id;
115
- jqXHR = Spree.ajax({
116
- type: "POST",
117
- url: Spree.pathFor('api/shipments/transfer_to_shipment'),
118
- data: split_attr
119
- });
111
+ path = Spree.pathFor('api/shipments/transfer_to_shipment');
120
112
  } else {
121
113
  alert('Please select the split destination.');
122
114
  return false;
123
115
  }
124
- jqXHR.error(function(msg) {
116
+ Spree.ajax({
117
+ type: "POST",
118
+ url: path,
119
+ data: split_attr
120
+ }).fail(function(msg) {
125
121
  alert(Spree.t("split_failed"));
126
- }).done(function(response) {
122
+ }).then(function(response) {
127
123
  if (response.success) {
128
124
  window.Spree.advanceOrder();
129
125
  } else {
@@ -32,7 +32,8 @@
32
32
  data: function(term, page) {
33
33
  var searchData = {
34
34
  variant_search_term: term,
35
- token: Spree.api_key
35
+ token: Spree.api_key,
36
+ page: page
36
37
  };
37
38
  return _.extend(searchData, searchOptions);
38
39
  },
@@ -40,7 +41,8 @@
40
41
  results: function(data, page) {
41
42
  window.variants = data["variants"];
42
43
  return {
43
- results: data["variants"]
44
+ results: data["variants"],
45
+ more: data.current_page * data.per_page < data.total_count
44
46
  };
45
47
  }
46
48
  },
@@ -33,7 +33,7 @@
33
33
  <%= f.field_container :price do %>
34
34
  <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
35
35
 
36
- <% if f.object.new_record? || f.object.has_default_price? %>
36
+ <% if (f.object.new_record? || f.object.has_default_price?) && !f.object.discarded? %>
37
37
  <%= render "spree/admin/shared/number_with_currency",
38
38
  f: f,
39
39
  amount_attr: :price,
@@ -439,7 +439,7 @@ disabled look for disabled choices in the results dropdown
439
439
  }
440
440
 
441
441
  .select2-more-results.select2-active {
442
- background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 100%;
442
+ background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 95% center;
443
443
  }
444
444
 
445
445
  .select2-results .select2-ajax-error {
@@ -449,6 +449,7 @@ disabled look for disabled choices in the results dropdown
449
449
  .select2-more-results {
450
450
  background: #f4f4f4;
451
451
  display: list-item;
452
+ padding: 0.5em 1em
452
453
  }
453
454
 
454
455
  /* disabled styles */
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.2
4
+ version: 3.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-09 00:00:00.000000000 Z
11
+ date: 2022-11-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.2
19
+ version: 3.2.4
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.2.2
26
+ version: 3.2.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: solidus_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.2.2
33
+ version: 3.2.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.2.2
40
+ version: 3.2.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: font-awesome-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -911,7 +911,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
911
911
  - !ruby/object:Gem::Version
912
912
  version: 1.8.23
913
913
  requirements: []
914
- rubygems_version: 3.3.19
914
+ rubygems_version: 3.3.21
915
915
  signing_key:
916
916
  specification_version: 4
917
917
  summary: Admin interface for the Solidus e-commerce framework.