solidus_backend 3.1.8 → 3.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/variant_autocomplete.js +4 -2
  3. data/app/views/spree/admin/product_properties/index.html.erb +2 -2
  4. data/app/views/spree/admin/products/_form.html.erb +1 -1
  5. data/app/views/spree/admin/users/_user_page_actions.html.erb +1 -1
  6. data/app/views/spree/admin/users/items.html.erb +1 -1
  7. data/app/views/spree/admin/users/orders.html.erb +1 -1
  8. data/vendor/assets/stylesheets/solidus_admin/select2.scss +2 -1
  9. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dff6dcb76e2419914cf6309bd6bc6fb3433cd757e08c43771724bd3d39bee162
4
- data.tar.gz: 65b5260f7bc8c712e6494dc9b362cc133e22f4497cd4753f294856205284d0e5
3
+ metadata.gz: 68a1543b1368db833acd5d99fedacbcb94b6a29796e686b60910e610320e0ea3
4
+ data.tar.gz: 85130236d083ace48d0a4a0ceded5d856e912419fe29593c568c736480e7a21f
5
5
  SHA512:
6
- metadata.gz: fc109ecd2a95f99968e4719f11fe8f70351ac1d70d9dbf73d96c3662b026ebf2df91a85c43c01980b1ce062ceefbbbf1c9f6e3da13a7e8cb4fd46d84a73c1361
7
- data.tar.gz: 6ed6a6b85e3f135d17ad3f2743b9ce26b624f6f709ff4ee91ebbb26226a8f39fbe82fcb61f972043a308823aa2273cbf692ae26ba83268cae7f2416f488281e9
6
+ metadata.gz: 4b5bbb57cccca2c85b6c463cfddc1f1c5aff508d677e4bd6c9895a7a7df25c8bc6f6344563e81eb8cb2ff57499263062e16f0da288794e226645500827106d64
7
+ data.tar.gz: 976db3f4710ecdf6557d45d39a6db8d265d95e654ecd3820fe2c7efdb8e635e5bc47fad73b799238bf358d13e0cf59650228a2c85e511ce2a4240da2b7285e49
data/app/assets/javascripts/spree/backend/variant_autocomplete.js CHANGED
@@ -34,7 +34,8 @@
34
34
  q: {
35
35
  product_name_or_sku_cont: term
36
36
  },
37
- token: Spree.api_key
37
+ token: Spree.api_key,
38
+ page: page
38
39
  };
39
40
  return _.extend(searchData, searchOptions);
40
41
  },
@@ -42,7 +43,8 @@
42
43
  results: function(data, page) {
43
44
  window.variants = data["variants"];
44
45
  return {
45
- results: data["variants"]
46
+ results: data["variants"],
47
+ more: data.current_page * data.per_page < data.total_count
46
48
  };
47
49
  }
48
50
  },
data/app/views/spree/admin/product_properties/index.html.erb CHANGED
@@ -36,7 +36,7 @@
36
36
  </tbody>
37
37
  </table>
38
38
 
39
- <% if can?([:create, :update], Spree::ProductProperty) %>
39
+ <% if can?(:create, Spree::ProductProperty) && can?(:update, Spree::ProductProperty) %>
40
40
  <%= render 'spree/admin/shared/edit_resource_links' %>
41
41
  <% end %>
42
42
 
@@ -95,7 +95,7 @@
95
95
  <% end %>
96
96
  </tbody>
97
97
  </table>
98
- <% if can?([:create, :update], Spree::VariantPropertyRule) %>
98
+ <% if can?(:create, Spree::VariantPropertyRule) && can?(:update, Spree::VariantPropertyRule) %>
99
99
  <%= render 'spree/admin/shared/edit_resource_links' %>
100
100
  <% end %>
101
101
  </fieldset>
data/app/views/spree/admin/products/_form.html.erb CHANGED
@@ -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,
data/app/views/spree/admin/users/_user_page_actions.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <% content_for :page_actions do %>
2
- <% if can?([:admin, :create], Spree::Order) %>
2
+ <% if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
3
3
  <li>
4
4
  <%= link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id), class: 'btn btn-primary' %>
5
5
  </li>
data/app/views/spree/admin/users/items.html.erb CHANGED
@@ -60,7 +60,7 @@
60
60
  </span>
61
61
  </td>
62
62
  <td class="order-number">
63
- <% if can?([:admin, :edit], order) %>
63
+ <% if can?(:admin, order) && can?(:edit, order) %>
64
64
  <%= link_to order.number, edit_admin_order_url(order) %>
65
65
  <% else %>
66
66
  <%= order.number %>
data/app/views/spree/admin/users/orders.html.erb CHANGED
@@ -38,7 +38,7 @@
38
38
  <tr data-hook="admin_orders_index_rows">
39
39
  <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
40
40
  <td class="order-number">
41
- <% if can?([:admin, :edit], order) %>
41
+ <% if can?(:admin, order) && can?(:edit, order) %>
42
42
  <%= link_to order.number, edit_admin_order_path(order) %>
43
43
  <% else %>
44
44
  <%= order.number %>
data/vendor/assets/stylesheets/solidus_admin/select2.scss CHANGED
@@ -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.1.8
4
+ version: 3.1.9
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-22 00:00:00.000000000 Z
11
+ date: 2023-02-07 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.1.8
19
+ version: 3.1.9
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.1.8
26
+ version: 3.1.9
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.1.8
33
+ version: 3.1.9
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.1.8
40
+ version: 3.1.9
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement