solidus_backend 4.6.2 → 4.7.0

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 (58) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +17 -17
  3. data/app/assets/javascripts/spree/backend/components/tabs.js +0 -2
  4. data/app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js +1 -1
  5. data/app/controllers/spree/admin/adjustments_controller.rb +1 -1
  6. data/app/controllers/spree/admin/base_controller.rb +9 -9
  7. data/app/controllers/spree/admin/cancellations_controller.rb +3 -3
  8. data/app/controllers/spree/admin/customer_returns_controller.rb +6 -6
  9. data/app/controllers/spree/admin/images_controller.rb +2 -2
  10. data/app/controllers/spree/admin/locale_controller.rb +4 -4
  11. data/app/controllers/spree/admin/option_types_controller.rb +1 -1
  12. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
  13. data/app/controllers/spree/admin/orders_controller.rb +29 -29
  14. data/app/controllers/spree/admin/payment_methods_controller.rb +3 -3
  15. data/app/controllers/spree/admin/payments_controller.rb +9 -9
  16. data/app/controllers/spree/admin/prices_controller.rb +1 -1
  17. data/app/controllers/spree/admin/product_properties_controller.rb +1 -1
  18. data/app/controllers/spree/admin/products_controller.rb +14 -14
  19. data/app/controllers/spree/admin/properties_controller.rb +3 -3
  20. data/app/controllers/spree/admin/refunds_controller.rb +2 -2
  21. data/app/controllers/spree/admin/reimbursements_controller.rb +4 -8
  22. data/app/controllers/spree/admin/resource_controller.rb +10 -10
  23. data/app/controllers/spree/admin/return_authorizations_controller.rb +14 -11
  24. data/app/controllers/spree/admin/return_items_controller.rb +1 -1
  25. data/app/controllers/spree/admin/search_controller.rb +8 -8
  26. data/app/controllers/spree/admin/stock_items_controller.rb +5 -5
  27. data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
  28. data/app/controllers/spree/admin/stock_movements_controller.rb +5 -5
  29. data/app/controllers/spree/admin/store_credits_controller.rb +10 -10
  30. data/app/controllers/spree/admin/style_guide_controller.rb +19 -19
  31. data/app/controllers/spree/admin/taxons/attachment_controller.rb +2 -2
  32. data/app/controllers/spree/admin/taxons_controller.rb +5 -5
  33. data/app/controllers/spree/admin/theme_controller.rb +3 -3
  34. data/app/controllers/spree/admin/users/api_key_controller.rb +2 -2
  35. data/app/controllers/spree/admin/users_controller.rb +6 -6
  36. data/app/controllers/spree/admin/variant_property_rule_values_controller.rb +1 -1
  37. data/app/controllers/spree/admin/variants_controller.rb +8 -8
  38. data/app/helpers/spree/admin/adjustments_helper.rb +7 -7
  39. data/app/helpers/spree/admin/base_helper.rb +10 -10
  40. data/app/helpers/spree/admin/navigation_helper.rb +37 -37
  41. data/app/helpers/spree/admin/orders_helper.rb +2 -2
  42. data/app/helpers/spree/admin/reimbursement_type_helper.rb +1 -1
  43. data/app/helpers/spree/admin/stock_locations_helper.rb +1 -1
  44. data/app/helpers/spree/admin/store_credit_events_helper.rb +9 -9
  45. data/app/views/spree/admin/search/users.json.jbuilder +2 -2
  46. data/config/initializers/assets.rb +1 -1
  47. data/config/initializers/form_builder.rb +1 -1
  48. data/config/routes.rb +9 -9
  49. data/lib/solidus_backend.rb +1 -1
  50. data/lib/spree/backend/callbacks.rb +2 -2
  51. data/lib/spree/backend/config.rb +1 -1
  52. data/lib/spree/backend/engine.rb +3 -3
  53. data/lib/spree/backend.rb +12 -12
  54. data/lib/spree/backend_configuration/deprecated_tab_constants.rb +2 -0
  55. data/lib/spree/backend_configuration.rb +46 -46
  56. data/lib/spree_backend.rb +1 -1
  57. data/solidus_backend.gemspec +22 -21
  58. metadata +30 -13
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/preferences/configuration'
4
- require 'spree/backend_configuration/menu_item'
3
+ require "spree/preferences/configuration"
4
+ require "spree/backend_configuration/menu_item"
5
5
 
6
6
  module Spree
7
7
  class BackendConfiguration < Preferences::Configuration
@@ -10,13 +10,13 @@ module Spree
10
10
  # @!attribute [rw] themes
11
11
  # @return [Hash] A hash containing the themes that are available for the admin panel
12
12
  preference :themes, :hash, default: {
13
- classic: 'spree/backend/all',
14
- classic_dark: 'spree/backend/themes/classic_dark',
15
- classic_dark_dimmed: 'spree/backend/themes/classic_dimmed',
16
- solidus: 'spree/backend/themes/solidus_admin',
17
- solidus_dark: 'spree/backend/themes/solidus_admin_dark',
18
- solidus_dimmed: 'spree/backend/themes/solidus_admin_dimmed',
19
- solidus_admin: 'spree/backend/themes/solidus_admin'
13
+ classic: "spree/backend/all",
14
+ classic_dark: "spree/backend/themes/classic_dark",
15
+ classic_dark_dimmed: "spree/backend/themes/classic_dimmed",
16
+ solidus: "spree/backend/themes/solidus_admin",
17
+ solidus_dark: "spree/backend/themes/solidus_admin_dark",
18
+ solidus_dimmed: "spree/backend/themes/solidus_admin_dimmed",
19
+ solidus_admin: "spree/backend/themes/solidus_admin"
20
20
  }
21
21
 
22
22
  # @!attribute [rw] show_reverse_charge_fields
@@ -38,7 +38,7 @@ module Spree
38
38
  ransack: :state_eq,
39
39
  label: -> { I18n.t(:status, scope: :spree) },
40
40
  options: -> {
41
- Spree::Order.state_machines[:state].states.collect { |s| [I18n.t(s.name, scope: 'spree.order_state'), s.value] }
41
+ Spree::Order.state_machines[:state].states.collect { |s| [I18n.t(s.name, scope: "spree.order_state"), s.value] }
42
42
  }
43
43
  }
44
44
  },
@@ -92,7 +92,7 @@ module Spree
92
92
  locals: {
93
93
  ransack: :store_id_eq,
94
94
  label: -> { I18n.t(:store, scope: :spree) },
95
- options: -> { Spree::Store.all.map { |store| [store.name, store.id] } },
95
+ options: -> { Spree::Store.all.map { |store| [store.name, store.id] } }
96
96
  },
97
97
  if: -> { Spree::Store.many? }
98
98
  },
@@ -108,11 +108,11 @@ module Spree
108
108
 
109
109
  # @!attribute [rw] theme
110
110
  # @return [String] Default admin theme name
111
- versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin", "4.4.0" => "solidus" }
111
+ versioned_preference :theme, :string, initial_value: "classic", boundaries: {"4.2.0" => "solidus_admin", "4.4.0" => "solidus"}
112
112
 
113
113
  # @!attribute [rw] dark_theme
114
114
  # @return [String] Dark admin theme name
115
- versioned_preference :dark_theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin", "4.4.0" => 'solidus_dark' }
115
+ versioned_preference :dark_theme, :string, initial_value: "classic", boundaries: {"4.2.0" => "solidus_admin", "4.4.0" => "solidus_dark"}
116
116
 
117
117
  def theme_path(user_theme)
118
118
  themes.fetch(user_theme&.to_sym, themes.fetch(theme.to_sym))
@@ -121,7 +121,7 @@ module Spree
121
121
  # @!attribute [rw] admin_updated_navbar
122
122
  # @return [Boolean] Should the updated navbar be used in admin (default: +false+)
123
123
  #
124
- versioned_preference :admin_updated_navbar, :boolean, initial_value: false, boundaries: { "4.2.0" => true }
124
+ versioned_preference :admin_updated_navbar, :boolean, initial_value: false, boundaries: {"4.2.0" => true}
125
125
 
126
126
  preference :frontend_product_path,
127
127
  :proc,
@@ -135,14 +135,14 @@ module Spree
135
135
 
136
136
  # @!attribute [rw] prefer_menu_item_partials
137
137
  # @return [Boolean] Whether or not to prefer menu item partials when both a partial and children are present.
138
- versioned_preference :prefer_menu_item_partials, :boolean, initial_value: true, boundaries: { "4.2.0" => false }
138
+ versioned_preference :prefer_menu_item_partials, :boolean, initial_value: true, boundaries: {"4.2.0" => false}
139
139
 
140
- autoload :ORDER_TABS, 'spree/backend_configuration/deprecated_tab_constants'
141
- autoload :PRODUCT_TABS, 'spree/backend_configuration/deprecated_tab_constants'
142
- autoload :CONFIGURATION_TABS, 'spree/backend_configuration/deprecated_tab_constants'
143
- autoload :PROMOTION_TABS, 'spree/backend_configuration/deprecated_tab_constants'
144
- autoload :STOCK_TABS, 'spree/backend_configuration/deprecated_tab_constants'
145
- autoload :USER_TABS, 'spree/backend_configuration/deprecated_tab_constants'
140
+ autoload :ORDER_TABS, "spree/backend_configuration/deprecated_tab_constants"
141
+ autoload :PRODUCT_TABS, "spree/backend_configuration/deprecated_tab_constants"
142
+ autoload :CONFIGURATION_TABS, "spree/backend_configuration/deprecated_tab_constants"
143
+ autoload :PROMOTION_TABS, "spree/backend_configuration/deprecated_tab_constants"
144
+ autoload :STOCK_TABS, "spree/backend_configuration/deprecated_tab_constants"
145
+ autoload :USER_TABS, "spree/backend_configuration/deprecated_tab_constants"
146
146
 
147
147
  # By default, this is set to +Spree::UnauthorizedRedirectHandler+. If you need your admin to behave
148
148
  # differently when a user is unauthorized, you can create your own class that respects the same interface.
@@ -176,7 +176,7 @@ module Spree
176
176
  @menu_items ||= [
177
177
  MenuItem.new(
178
178
  label: :orders,
179
- icon: admin_updated_navbar ? 'ri-inbox-line' : 'shopping-cart',
179
+ icon: admin_updated_navbar ? "ri-inbox-line" : "shopping-cart",
180
180
  condition: -> { can?(:admin, Spree::Order) },
181
181
  match_path: %r{/(
182
182
  adjustments|
@@ -188,79 +188,79 @@ module Spree
188
188
  payments|
189
189
  return_authorizations|
190
190
  shipments
191
- )}x,
191
+ )}x
192
192
  ),
193
193
  MenuItem.new(
194
194
  label: :products,
195
- icon: admin_updated_navbar ? 'ri-price-tag-3-line' : 'th-large',
195
+ icon: admin_updated_navbar ? "ri-price-tag-3-line" : "th-large",
196
196
  condition: -> { can?(:admin, Spree::Product) },
197
- partial: 'spree/admin/shared/product_sub_menu',
197
+ partial: "spree/admin/shared/product_sub_menu",
198
198
  data_hook: :admin_product_sub_tabs,
199
199
  children: [
200
200
  MenuItem.new(
201
201
  label: :products,
202
202
  condition: -> { can? :admin, Spree::Product },
203
- match_path: '/products',
203
+ match_path: "/products"
204
204
  ),
205
205
  MenuItem.new(
206
206
  label: :option_types,
207
207
  condition: -> { can? :admin, Spree::OptionType },
208
- match_path: '/option_types',
208
+ match_path: "/option_types"
209
209
  ),
210
210
  MenuItem.new(
211
211
  label: :properties,
212
- condition: -> { can? :admin, Spree::Property },
212
+ condition: -> { can? :admin, Spree::Property }
213
213
  ),
214
214
  MenuItem.new(
215
215
  label: :taxonomies,
216
- condition: -> { can? :admin, Spree::Taxonomy },
216
+ condition: -> { can? :admin, Spree::Taxonomy }
217
217
  ),
218
218
  MenuItem.new(
219
219
  url: :admin_taxons_path,
220
220
  condition: -> { can? :admin, Spree::Taxon },
221
221
  label: :display_order,
222
- match_path: '/taxons',
223
- ),
224
- ],
222
+ match_path: "/taxons"
223
+ )
224
+ ]
225
225
  ),
226
226
  MenuItem.new(
227
227
  label: :stock,
228
- icon: admin_updated_navbar ? 'ri-stack-line' : 'cubes',
228
+ icon: admin_updated_navbar ? "ri-stack-line" : "cubes",
229
229
  match_path: %r{/(stock_items)},
230
230
  condition: -> { can?(:admin, Spree::StockItem) },
231
- url: :admin_stock_items_path,
231
+ url: :admin_stock_items_path
232
232
  ),
233
233
  MenuItem.new(
234
234
  label: :users,
235
- icon: admin_updated_navbar ? 'ri-user-line' : 'user',
235
+ icon: admin_updated_navbar ? "ri-user-line" : "user",
236
236
  match_path: %r{/(users|store_credits)},
237
237
  condition: -> { Spree.user_class && can?(:admin, Spree.user_class) },
238
- url: :admin_users_path,
238
+ url: :admin_users_path
239
239
  ),
240
240
  MenuItem.new(
241
241
  label: :settings,
242
- icon: admin_updated_navbar ? 'ri-settings-line' : 'wrench',
242
+ icon: admin_updated_navbar ? "ri-settings-line" : "wrench",
243
243
  data_hook: :admin_settings_sub_tabs,
244
- partial: 'spree/admin/shared/settings_sub_menu',
244
+ partial: "spree/admin/shared/settings_sub_menu",
245
245
  condition: -> { can? :admin, Spree::Store },
246
246
  url: :admin_stores_path,
247
247
  children: [
248
248
  MenuItem.new(
249
249
  label: :stores,
250
250
  condition: -> { can? :admin, Spree::Store },
251
- url: :admin_stores_path,
251
+ url: :admin_stores_path
252
252
  ),
253
253
  MenuItem.new(
254
254
  label: :payments,
255
255
  condition: -> { can? :admin, Spree::PaymentMethod },
256
- url: :admin_payment_methods_path,
256
+ url: :admin_payment_methods_path
257
257
  ),
258
258
 
259
259
  MenuItem.new(
260
260
  label: :taxes,
261
261
  condition: -> { can?(:admin, Spree::TaxCategory) || can?(:admin, Spree::TaxRate) },
262
262
  url: :admin_tax_categories_path,
263
- match_path: %r(tax_categories|tax_rates),
263
+ match_path: %r{tax_categories|tax_rates}
264
264
  ),
265
265
  MenuItem.new(
266
266
  label: :checkout,
@@ -271,7 +271,7 @@ module Spree
271
271
  can?(:show, Spree::AdjustmentReason)
272
272
  },
273
273
  url: :admin_refund_reasons_path,
274
- match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons)
274
+ match_path: %r{refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons}
275
275
  ),
276
276
  MenuItem.new(
277
277
  label: :shipping,
@@ -281,14 +281,14 @@ module Spree
281
281
  can?(:admin, Spree::StockLocation)
282
282
  },
283
283
  url: :admin_shipping_methods_path,
284
- match_path: %r(shipping_methods|shipping_categories|stock_locations),
284
+ match_path: %r{shipping_methods|shipping_categories|stock_locations}
285
285
  ),
286
286
  MenuItem.new(
287
287
  label: :zones,
288
288
  condition: -> { can?(:admin, Spree::Zone) },
289
- url: :admin_zones_path,
290
- ),
291
- ],
289
+ url: :admin_zones_path
290
+ )
291
+ ]
292
292
  )
293
293
  ]
294
294
  end
data/lib/spree_backend.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/backend'
3
+ require "spree/backend"
@@ -1,37 +1,38 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative '../core/lib/spree/core/version.rb'
3
+ require_relative "../core/lib/spree/core/version"
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.platform = Gem::Platform::RUBY
7
- s.name = 'solidus_backend'
8
- s.version = Spree.solidus_version
9
- s.summary = 'Admin interface for the Solidus e-commerce framework.'
6
+ s.platform = Gem::Platform::RUBY
7
+ s.name = "solidus_backend"
8
+ s.version = Spree.solidus_version
9
+ s.summary = "Admin interface for the Solidus e-commerce framework."
10
10
  s.description = s.summary
11
11
 
12
- s.author = 'Solidus Team'
13
- s.email = 'contact@solidus.io'
14
- s.homepage = 'http://solidus.io'
15
- s.license = 'BSD-3-Clause'
12
+ s.author = "Solidus Team"
13
+ s.email = "contact@solidus.io"
14
+ s.homepage = "http://solidus.io"
15
+ s.license = "BSD-3-Clause"
16
16
 
17
- s.metadata['rubygems_mfa_required'] = 'true'
17
+ s.metadata["rubygems_mfa_required"] = "true"
18
18
 
19
19
  s.files = `git ls-files -z`.split("\x0").reject do |f|
20
20
  f.match(%r{^(spec|bin)/})
21
21
  end
22
22
 
23
- s.required_ruby_version = '>= 3.1.0'
24
- s.required_rubygems_version = '>= 1.8.23'
23
+ s.required_ruby_version = ">= 3.2.0"
24
+ s.required_rubygems_version = ">= 1.8.23"
25
25
 
26
- s.add_dependency 'solidus_api', s.version
27
- s.add_dependency 'solidus_core', s.version
26
+ s.add_dependency "solidus_api", s.version
27
+ s.add_dependency "solidus_core", s.version
28
28
 
29
- s.add_dependency 'font-awesome-rails', '~> 4.0'
30
- s.add_dependency 'jbuilder', '~> 2.8'
31
- s.add_dependency 'jquery-rails'
32
- s.add_dependency 'kaminari', '~> 1.1'
33
- s.add_dependency 'responders'
34
- s.add_dependency 'sassc-rails'
29
+ s.add_dependency "font-awesome-rails", "~> 4.0"
30
+ s.add_dependency "jbuilder", "~> 2.8"
31
+ s.add_dependency "jquery-rails"
32
+ s.add_dependency "kaminari", "~> 1.1"
33
+ s.add_dependency "responders"
35
34
 
36
- s.add_dependency 'handlebars_assets', '~> 0.23'
35
+ s.add_dependency "handlebars_assets", "~> 0.23"
36
+ s.add_dependency "sassc-rails"
37
+ s.add_dependency "sprockets-rails", "!= 3.5.0"
37
38
  end
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.2
4
+ version: 4.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
+ autorequire:
8
9
  bindir: bin
9
10
  cert_chain: []
10
- date: 1980-01-02 00:00:00.000000000 Z
11
+ date: 2026-04-15 00:00:00.000000000 Z
11
12
  dependencies:
12
13
  - !ruby/object:Gem::Dependency
13
14
  name: solidus_api
@@ -15,28 +16,28 @@ dependencies:
15
16
  requirements:
16
17
  - - '='
17
18
  - !ruby/object:Gem::Version
18
- version: 4.6.2
19
+ version: 4.7.0
19
20
  type: :runtime
20
21
  prerelease: false
21
22
  version_requirements: !ruby/object:Gem::Requirement
22
23
  requirements:
23
24
  - - '='
24
25
  - !ruby/object:Gem::Version
25
- version: 4.6.2
26
+ version: 4.7.0
26
27
  - !ruby/object:Gem::Dependency
27
28
  name: solidus_core
28
29
  requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
31
  - - '='
31
32
  - !ruby/object:Gem::Version
32
- version: 4.6.2
33
+ version: 4.7.0
33
34
  type: :runtime
34
35
  prerelease: false
35
36
  version_requirements: !ruby/object:Gem::Requirement
36
37
  requirements:
37
38
  - - '='
38
39
  - !ruby/object:Gem::Version
39
- version: 4.6.2
40
+ version: 4.7.0
40
41
  - !ruby/object:Gem::Dependency
41
42
  name: font-awesome-rails
42
43
  requirement: !ruby/object:Gem::Requirement
@@ -107,6 +108,20 @@ dependencies:
107
108
  - - ">="
108
109
  - !ruby/object:Gem::Version
109
110
  version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: handlebars_assets
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - "~>"
116
+ - !ruby/object:Gem::Version
117
+ version: '0.23'
118
+ type: :runtime
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - "~>"
123
+ - !ruby/object:Gem::Version
124
+ version: '0.23'
110
125
  - !ruby/object:Gem::Dependency
111
126
  name: sassc-rails
112
127
  requirement: !ruby/object:Gem::Requirement
@@ -122,19 +137,19 @@ dependencies:
122
137
  - !ruby/object:Gem::Version
123
138
  version: '0'
124
139
  - !ruby/object:Gem::Dependency
125
- name: handlebars_assets
140
+ name: sprockets-rails
126
141
  requirement: !ruby/object:Gem::Requirement
127
142
  requirements:
128
- - - "~>"
143
+ - - "!="
129
144
  - !ruby/object:Gem::Version
130
- version: '0.23'
145
+ version: 3.5.0
131
146
  type: :runtime
132
147
  prerelease: false
133
148
  version_requirements: !ruby/object:Gem::Requirement
134
149
  requirements:
135
- - - "~>"
150
+ - - "!="
136
151
  - !ruby/object:Gem::Version
137
- version: '0.23'
152
+ version: 3.5.0
138
153
  description: Admin interface for the Solidus e-commerce framework.
139
154
  email: contact@solidus.io
140
155
  executables: []
@@ -843,6 +858,7 @@ licenses:
843
858
  - BSD-3-Clause
844
859
  metadata:
845
860
  rubygems_mfa_required: 'true'
861
+ post_install_message:
846
862
  rdoc_options: []
847
863
  require_paths:
848
864
  - lib
@@ -850,14 +866,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
850
866
  requirements:
851
867
  - - ">="
852
868
  - !ruby/object:Gem::Version
853
- version: 3.1.0
869
+ version: 3.2.0
854
870
  required_rubygems_version: !ruby/object:Gem::Requirement
855
871
  requirements:
856
872
  - - ">="
857
873
  - !ruby/object:Gem::Version
858
874
  version: 1.8.23
859
875
  requirements: []
860
- rubygems_version: 3.7.2
876
+ rubygems_version: 3.5.22
877
+ signing_key:
861
878
  specification_version: 4
862
879
  summary: Admin interface for the Solidus e-commerce framework.
863
880
  test_files: []