spree_core 6.0.3 → 6.0.5

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 (221) hide show
  1. checksums.yaml +4 -4
  2. data/app/jobs/spree/imports/create_rows_job.rb +4 -2
  3. data/app/jobs/spree/imports/process_rows_job.rb +4 -2
  4. data/app/jobs/spree/payments/handle_webhook_job.rb +12 -1
  5. data/app/jobs/spree/products/auto_match_taxons_job.rb +5 -2
  6. data/app/jobs/spree/search_provider/index_job.rb +8 -0
  7. data/app/jobs/spree/search_provider/remove_job.rb +3 -0
  8. data/app/jobs/spree/stock_locations/stock_items/create_job.rb +5 -2
  9. data/app/mailers/spree/base_mailer.rb +1 -1
  10. data/app/models/concerns/spree/acted_by.rb +2 -2
  11. data/app/models/concerns/spree/customer_methods.rb +6 -4
  12. data/app/models/concerns/spree/deprecated_customer_alias.rb +11 -3
  13. data/app/models/concerns/spree/derived_number.rb +1 -1
  14. data/app/models/concerns/spree/has_custom_fields.rb +16 -11
  15. data/app/models/concerns/spree/integrations_concern.rb +5 -3
  16. data/app/models/concerns/spree/label_translatable.rb +4 -4
  17. data/app/models/concerns/spree/metadata.rb +3 -3
  18. data/app/models/concerns/spree/personal_data_matching.rb +5 -1
  19. data/app/models/concerns/spree/presentation_translatable.rb +1 -1
  20. data/app/models/concerns/spree/product_scopes.rb +2 -2
  21. data/app/models/concerns/spree/publishable.rb +26 -3
  22. data/app/models/concerns/spree/purchase/addresses.rb +8 -5
  23. data/app/models/concerns/spree/purchase/deprecated_aliases.rb +2 -2
  24. data/app/models/concerns/spree/stores/markets.rb +4 -2
  25. data/app/models/concerns/spree/user_address.rb +5 -2
  26. data/app/models/concerns/spree/user_methods.rb +2 -2
  27. data/app/models/spree/address.rb +29 -14
  28. data/app/models/spree/asset.rb +3 -3
  29. data/app/models/spree/authentication/strategies/base_strategy.rb +10 -1
  30. data/app/models/spree/base.rb +1 -1
  31. data/app/models/spree/calculator/shipping/flat_rate.rb +6 -4
  32. data/app/models/spree/cart.rb +9 -4
  33. data/app/models/spree/category.rb +8 -6
  34. data/app/models/spree/classification.rb +2 -2
  35. data/app/models/spree/current.rb +19 -0
  36. data/app/models/spree/custom_field.rb +6 -6
  37. data/app/models/spree/custom_field_definition.rb +10 -7
  38. data/app/models/spree/delivery_method.rb +21 -15
  39. data/app/models/spree/delivery_rate.rb +1 -1
  40. data/app/models/spree/digital.rb +1 -1
  41. data/app/models/spree/digital_asset.rb +2 -2
  42. data/app/models/spree/digital_link.rb +4 -4
  43. data/app/models/spree/export.rb +29 -2
  44. data/app/models/spree/fulfillment/custom_events.rb +18 -10
  45. data/app/models/spree/fulfillment.rb +30 -23
  46. data/app/models/spree/fulfillment_item.rb +3 -3
  47. data/app/models/spree/fulfilment_changer.rb +1 -1
  48. data/app/models/spree/gift_card.rb +12 -12
  49. data/app/models/spree/import.rb +23 -15
  50. data/app/models/spree/import_row.rb +6 -6
  51. data/app/models/spree/inventory_unit.rb +1 -1
  52. data/app/models/spree/invitation.rb +14 -6
  53. data/app/models/spree/line_item.rb +10 -8
  54. data/app/models/spree/media.rb +27 -3
  55. data/app/models/spree/metafield.rb +1 -1
  56. data/app/models/spree/metafield_definition.rb +1 -1
  57. data/app/models/spree/metafields.rb +2 -2
  58. data/app/models/spree/option_type.rb +26 -0
  59. data/app/models/spree/option_value.rb +3 -3
  60. data/app/models/spree/order.rb +92 -46
  61. data/app/models/spree/order_inventory.rb +2 -2
  62. data/app/models/spree/order_merger.rb +2 -2
  63. data/app/models/spree/order_updater.rb +34 -20
  64. data/app/models/spree/payment.rb +8 -8
  65. data/app/models/spree/payment_method.rb +11 -9
  66. data/app/models/spree/price.rb +22 -8
  67. data/app/models/spree/price_list.rb +12 -6
  68. data/app/models/spree/price_rules/zone_rule.rb +1 -1
  69. data/app/models/spree/product.rb +32 -33
  70. data/app/models/spree/product_category.rb +10 -4
  71. data/app/models/spree/product_collection.rb +8 -1
  72. data/app/models/spree/promotion/rules/category.rb +27 -10
  73. data/app/models/spree/promotion/rules/country.rb +1 -1
  74. data/app/models/spree/promotion/rules/taxon.rb +4 -2
  75. data/app/models/spree/promotion/rules/user.rb +1 -1
  76. data/app/models/spree/promotion_action.rb +1 -1
  77. data/app/models/spree/promotion_rule_category.rb +5 -5
  78. data/app/models/spree/promotion_rule_taxon.rb +2 -2
  79. data/app/models/spree/prototype.rb +4 -1
  80. data/app/models/spree/return_authorization_reason.rb +3 -3
  81. data/app/models/spree/return_reason.rb +1 -1
  82. data/app/models/spree/search_provider/base.rb +2 -2
  83. data/app/models/spree/search_provider.rb +7 -5
  84. data/app/models/spree/seller.rb +93 -10
  85. data/app/models/spree/seller_requirements/complete_profile.rb +26 -7
  86. data/app/models/spree/shipment.rb +4 -1
  87. data/app/models/spree/shipping_method.rb +4 -1
  88. data/app/models/spree/shipping_rate.rb +1 -1
  89. data/app/models/spree/stock/coordinator.rb +2 -2
  90. data/app/models/spree/stock/estimator.rb +7 -5
  91. data/app/models/spree/stock/package.rb +10 -8
  92. data/app/models/spree/stock_item.rb +1 -1
  93. data/app/models/spree/stock_level/custom_events.rb +1 -1
  94. data/app/models/spree/stock_level.rb +31 -2
  95. data/app/models/spree/stock_location.rb +12 -8
  96. data/app/models/spree/stock_movement.rb +7 -6
  97. data/app/models/spree/stock_reservation.rb +5 -5
  98. data/app/models/spree/store.rb +42 -16
  99. data/app/models/spree/store_credit.rb +2 -2
  100. data/app/models/spree/store_credit_category.rb +5 -5
  101. data/app/models/spree/store_credit_type.rb +2 -2
  102. data/app/models/spree/subscriber.rb +7 -7
  103. data/app/models/spree/tax_rate.rb +5 -5
  104. data/app/models/spree/taxon.rb +3 -3
  105. data/app/models/spree/taxon_rule.rb +2 -2
  106. data/app/models/spree/taxonomy.rb +1 -1
  107. data/app/models/spree/variant.rb +12 -10
  108. data/app/models/spree/variant_media.rb +1 -1
  109. data/app/models/spree/wished_item.rb +1 -1
  110. data/app/models/spree/wishlist.rb +2 -2
  111. data/app/models/spree/wishlist_item/custom_events.rb +2 -2
  112. data/app/models/spree/zone.rb +1 -1
  113. data/app/models/spree/zone_member.rb +1 -1
  114. data/app/services/spree/carts/associate.rb +6 -2
  115. data/app/services/spree/carts/create.rb +1 -1
  116. data/app/services/spree/carts/destroy.rb +23 -7
  117. data/app/services/spree/carts/remove_item.rb +1 -1
  118. data/app/services/spree/carts/remove_line_item.rb +2 -2
  119. data/app/services/spree/carts/remove_out_of_stock_items.rb +3 -1
  120. data/app/services/spree/carts/set_quantity.rb +2 -2
  121. data/app/services/spree/carts/update.rb +17 -0
  122. data/app/services/spree/checkout/add_store_credit.rb +3 -3
  123. data/app/services/spree/checkout/remove_store_credit.rb +2 -2
  124. data/app/services/spree/collections/regenerate_products.rb +37 -15
  125. data/app/services/spree/companies/add_member.rb +9 -4
  126. data/app/services/spree/diagnostics/error_log.rb +139 -0
  127. data/app/services/spree/diagnostics/section.rb +72 -0
  128. data/app/services/spree/diagnostics/sections.rb +121 -0
  129. data/app/services/spree/diagnostics/stack.rb +73 -0
  130. data/app/services/spree/diagnostics.rb +132 -0
  131. data/app/services/spree/imports/row_processors/product_variant.rb +19 -0
  132. data/app/services/spree/newsletter/subscribe.rb +7 -3
  133. data/app/services/spree/orders/approve.rb +3 -3
  134. data/app/services/spree/orders/create_user_account.rb +2 -2
  135. data/app/services/spree/orders/remove_line_item.rb +16 -5
  136. data/app/services/spree/product_memberships.rb +21 -1
  137. data/app/services/spree/product_types/apply_to_products.rb +12 -2
  138. data/app/services/spree/products/auto_match_collections.rb +20 -4
  139. data/app/services/spree/products/auto_match_taxons.rb +5 -2
  140. data/app/services/spree/shipments/update.rb +2 -2
  141. data/app/services/spree/stock_locations/stock_items/create.rb +5 -2
  142. data/app/services/spree/stock_reservations/extend.rb +3 -1
  143. data/app/services/spree/stock_reservations/reserve.rb +12 -7
  144. data/app/services/spree/store_credits/apply.rb +9 -1
  145. data/app/services/spree/taxons/add_products.rb +4 -2
  146. data/app/services/spree/taxons/regenerate_products.rb +5 -2
  147. data/app/services/spree/taxons/remove_products.rb +4 -2
  148. data/app/services/spree/update_check.rb +7 -31
  149. data/app/tools/spree/agent_tools/describe_resource.rb +3 -0
  150. data/app/tools/spree/agent_tools/get_resource.rb +1 -1
  151. data/app/tools/spree/agent_tools/resource_write.rb +1 -1
  152. data/app/tools/spree/agent_tools/search_resources.rb +42 -10
  153. data/app/workflows/spree/carts/add_item.rb +52 -1
  154. data/app/workflows/spree/carts/complete.rb +14 -2
  155. data/app/workflows/spree/carts/recalculate.rb +1 -1
  156. data/app/workflows/spree/fulfillments/update.rb +1 -1
  157. data/app/workflows/spree/orders/cancel.rb +3 -1
  158. data/app/workflows/spree/payments/capture.rb +2 -2
  159. data/app/workflows/spree/payments/handle_webhook.rb +7 -3
  160. data/app/workflows/spree/seller_transfers/create.rb +1 -1
  161. data/app/workflows/spree/sellers/approve.rb +6 -0
  162. data/app/workflows/spree/sellers/create.rb +5 -2
  163. data/app/workflows/spree/stock_levels/bulk_upsert.rb +19 -7
  164. data/config/locales/be.yml +1 -1
  165. data/config/locales/en.yml +12 -0
  166. data/config/locales/fr.yml +1 -1
  167. data/config/locales/lt.yml +1 -1
  168. data/config/locales/ru.yml +1 -1
  169. data/config/locales/uk.yml +1 -1
  170. data/db/migrate/20240303174340_fix_spree_stock_item_unique_index.rb +14 -10
  171. data/db/migrate/20260710000001_rename_taxons_to_categories.rb +1 -1
  172. data/db/migrate/20260728000004_rename_shipping_to_fulfillment_and_delivery.rb +1 -1
  173. data/db/migrate/20260806000001_add_store_id_to_spree_tax_rates_and_categories.rb +1 -1
  174. data/db/migrate/20260807130001_add_country_state_codes_to_consumers.rb +1 -1
  175. data/db/migrate/20260809000001_rename_metafields_to_custom_fields.rb +1 -1
  176. data/db/migrate/20260809150001_promote_shipping_categories_to_delivery_profiles.rb +1 -1
  177. data/db/migrate/20260811000001_add_delivery_tracking_to_fulfillments.rb +1 -1
  178. data/db/migrate/20260814000001_rename_stock_items_to_stock_levels.rb +13 -7
  179. data/db/migrate/20260824000001_add_store_to_spree_media.rb +1 -1
  180. data/db/migrate/20260828100001_unify_import_and_export_tenancy.rb +1 -1
  181. data/db/migrate/20261016000001_remove_default_from_spree_tax_rates_included_in_price.rb +1 -1
  182. data/lib/spree/agent_tool.rb +3 -3
  183. data/lib/spree/agent_tools/default_catalog.rb +2 -2
  184. data/lib/spree/agent_tools/legacy_tools.rb +1 -1
  185. data/lib/spree/agent_tools/operation_tool.rb +1 -1
  186. data/lib/spree/agent_tools/record_summary.rb +8 -2
  187. data/lib/spree/agent_tools/resource_map.rb +82 -7
  188. data/lib/spree/core/dependencies.rb +10 -10
  189. data/lib/spree/core/engine.rb +14 -0
  190. data/lib/spree/core/number_generator.rb +4 -3
  191. data/lib/spree/core/preferences/preferable.rb +1 -1
  192. data/lib/spree/core/preferences/preferable_class_methods.rb +5 -1
  193. data/lib/spree/core/pricing/resolver.rb +2 -2
  194. data/lib/spree/core/version.rb +1 -1
  195. data/lib/spree/core.rb +48 -10
  196. data/lib/spree/i18n.rb +6 -2
  197. data/lib/spree/localized_number.rb +1 -1
  198. data/lib/spree/removed_apis.rb +274 -0
  199. data/lib/spree/reporting/default_vocabulary.rb +26 -6
  200. data/lib/spree/testing_support/factories/digital_asset_factory.rb +1 -1
  201. data/lib/spree/testing_support/factories/stock_level_factory.rb +1 -1
  202. data/lib/spree/testing_support/factories/taxon_factory.rb +1 -1
  203. data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -1
  204. data/lib/spree/testing_support/factories/wishlist_item_factory.rb +1 -1
  205. data/lib/spree/testing_support/i18n.rb +7 -2
  206. data/lib/spree/testing_support/order_walkthrough.rb +5 -2
  207. data/lib/spree/upgrades/5_6_to_6_0/manifest.yml +14 -14
  208. data/lib/tasks/carts_migration.rake +1 -1
  209. data/lib/tasks/categories_and_collections.rake +1 -1
  210. data/lib/tasks/deliveries_migration.rake +1 -1
  211. data/lib/tasks/delivery_method_rules_migration.rake +1 -1
  212. data/lib/tasks/delivery_migration.rake +1 -1
  213. data/lib/tasks/delivery_profiles_migration.rake +2 -2
  214. data/lib/tasks/diagnostics.rake +11 -0
  215. data/lib/tasks/fold_store_credit_categories.rake +1 -1
  216. data/lib/tasks/migrate_country_state_codes.rake +1 -1
  217. data/lib/tasks/migrate_returns.rake +4 -4
  218. data/lib/tasks/migrate_rich_text_to_columns.rake +1 -1
  219. data/lib/tasks/store_settings.rake +1 -1
  220. data/lib/tasks/typed_stock_movements_migration.rake +1 -1
  221. metadata +13 -6
@@ -23,7 +23,29 @@ module Spree
23
23
  Entry = Struct.new(:key, :model_name, :permission, :serializer_name,
24
24
  :dashboard_path, :scope_name, :write_permission,
25
25
  :writable_attributes, :create_workflow_key, :update_workflow_key,
26
- :distinct, :api_paths, keyword_init: true) do
26
+ :distinct, :api_paths, :index_paths, :access_permissions, keyword_init: true) do
27
+ # Whether this caller may read the resource.
28
+ #
29
+ # Imports and exports have no key of their own: each record is gated
30
+ # by the scope of the resource it carries. They list those keys in
31
+ # `access_permissions`, and holding any one of them is enough to
32
+ # reach the endpoint, which filters to the records that key covers.
33
+ #
34
+ # @param context [Spree::AgentTools::Context]
35
+ # @return [Boolean]
36
+ def readable_by?(context)
37
+ return context.permitted?(permission) if access_permissions.nil?
38
+
39
+ access_permissions.any? { |key| context.holds?(key) }
40
+ end
41
+
42
+ # Every key that can open this resource.
43
+ #
44
+ # @return [Array<String>]
45
+ def permission_keys
46
+ access_permissions || [permission]
47
+ end
48
+
27
49
  # The Admin API path for one of this resource's operations, which is
28
50
  # how a tool reaches it.
29
51
  #
@@ -106,12 +128,32 @@ module Spree
106
128
  # @param action [Symbol]
107
129
  # @return [String, nil]
108
130
  def parent_param(action)
109
- Array(api_path(action)&.scan(/:([a-z_]+)/)).flatten.reject { |name| name == 'id' }.first
131
+ param_in(api_path(action))
132
+ end
133
+
134
+ # The records this resource can be listed under, each with the
135
+ # collection path that lists it there — claims under an order,
136
+ # products under a category or collection, variants under a product.
137
+ # A path nested twice is left out: one parent id cannot fill it.
138
+ #
139
+ # @return [Hash{String => String}] parent resource key => path
140
+ def index_parents
141
+ Array(index_paths.presence || api_path(:index)).each_with_object({}) do |path, parents|
142
+ next unless path.scan(/:[a-z_]+_id\b/).one?
143
+
144
+ parent = path.scan(PARENT_SEGMENT).flatten.first
145
+ parents[parent] ||= path if parent
146
+ end
110
147
  end
111
148
 
112
149
  # The operation's path with its segments filled, or nil when a nested
113
150
  # resource was not given the record it lives under.
114
151
  #
152
+ # A search given a parent runs on the collection under that parent,
153
+ # chosen by the parent id's prefix, and is nil when the resource is
154
+ # not listed under that kind of record. Listing the whole store
155
+ # instead answered "the claims on order B" with every claim.
156
+ #
115
157
  # Each value is percent-encoded so it stays one segment: a `?` or `/`
116
158
  # in an id would otherwise send the call to a different route than
117
159
  # the one the tool checked and the approver was shown. A path with a
@@ -123,11 +165,11 @@ module Spree
123
165
  # @param parent_id [String, nil]
124
166
  # @return [String, nil]
125
167
  def path_for(action, id: nil, parent_id: nil)
126
- path = api_path(action)
168
+ path = action.to_sym == :index && parent_id.present? ? index_path_under(parent_id) : api_path(action)
127
169
  return if path.blank?
128
170
 
129
171
  path = path.sub(':id', ERB::Util.url_encode(id.to_s)) if id.present?
130
- parent = parent_param(action)
172
+ parent = param_in(path)
131
173
  if parent
132
174
  return if parent_id.blank?
133
175
 
@@ -275,6 +317,15 @@ module Spree
275
317
  model_name.constantize
276
318
  end
277
319
 
320
+ # The prefix of this resource's ids (`or` for orders), or nil.
321
+ #
322
+ # @return [String, nil]
323
+ def id_prefix
324
+ model_class.try(:_prefix_id_prefix).presence
325
+ rescue NameError
326
+ nil
327
+ end
328
+
278
329
  # Records of this kind the asking admin may see.
279
330
  #
280
331
  # Takes the context rather than the store so the ability filter cannot
@@ -342,6 +393,23 @@ module Spree
342
393
  def filterable_scopes
343
394
  model_class.ransackable_scopes.map(&:to_s).sort
344
395
  end
396
+
397
+ private
398
+
399
+ def param_in(path)
400
+ Array(path&.scan(/:([a-z_]+)/)).flatten.reject { |name| name == 'id' }.first
401
+ end
402
+
403
+ # One parent needs no matching; the endpoint answers for an id of the
404
+ # wrong kind. Several are told apart by the id's prefix (`ctg_` is a
405
+ # category, `coll_` a collection).
406
+ def index_path_under(parent_id)
407
+ parents = index_parents
408
+ return parents.values.first if parents.one?
409
+
410
+ prefix = parent_id.to_s[/\A([a-z]+)_/, 1]
411
+ parents.find { |key, _path| prefix && ResourceMap.find(key)&.id_prefix == prefix }&.last
412
+ end
345
413
  end
346
414
 
347
415
 
@@ -381,10 +449,15 @@ module Spree
381
449
  # @param distinct [Boolean, nil] false where the controller disables
382
450
  # DISTINCT on its own collection, which Postgres requires when the
383
451
  # sort column is not in the select list
452
+ # @param index_paths [Array<String>, nil] every collection path the
453
+ # resource is listed at, the nested ones under a parent included
454
+ # @param access_permissions [Array<String>, nil] keys any one of which
455
+ # opens the resource, in place of `permission`
384
456
  # @return [Entry]
385
457
  def register(key:, model_name:, permission:, serializer_name:, dashboard_path: nil, scope_name: nil,
386
458
  write_permission: nil, writable_attributes: [], create_workflow_key: nil,
387
- update_workflow_key: nil, distinct: nil, api_paths: nil)
459
+ update_workflow_key: nil, distinct: nil, api_paths: nil, index_paths: nil,
460
+ access_permissions: nil)
388
461
  entry = Entry.new(key: key.to_s, model_name: model_name, permission: permission,
389
462
  serializer_name: serializer_name, dashboard_path: dashboard_path,
390
463
  scope_name: scope_name, write_permission: write_permission,
@@ -392,7 +465,9 @@ module Spree
392
465
  create_workflow_key: create_workflow_key,
393
466
  update_workflow_key: update_workflow_key,
394
467
  distinct: distinct,
395
- api_paths: api_paths&.to_a)
468
+ api_paths: api_paths&.to_a,
469
+ index_paths: index_paths,
470
+ access_permissions: access_permissions)
396
471
  entries[entry.key] = entry
397
472
  end
398
473
 
@@ -457,7 +532,7 @@ module Spree
457
532
  # @param context [Spree::AgentTools::Context]
458
533
  # @return [Array<Entry>]
459
534
  def available_for(context)
460
- all.select { |entry| context.permitted?(entry.permission) }
535
+ all.select { |entry| entry.readable_by?(context) }
461
536
  end
462
537
 
463
538
  private
@@ -285,14 +285,14 @@ module Spree
285
285
  include Spree::DependenciesHelper
286
286
 
287
287
  # 6.0 tier rename: these seams resolve Spree::Workflow classes now.
288
- # The old *_service names stay settable and readable one release so
288
+ # The old *_service names stay settable and readable until 6.3 so
289
289
  # applications don't crash at boot — but a legacy write is stashed,
290
290
  # NOT applied to the workflow seam: a class written against the old
291
291
  # service contract is not interchangeable with the workflow the new
292
292
  # call sites consume. Reads return the stashed value (legacy code
293
293
  # calling its own class keeps working), falling back to the workflow
294
294
  # class — safe for legacy callers, whose old keyword vocabulary the
295
- # workflows accept through alias_argument bridges. Removed in 6.1.
295
+ # workflows accept through alias_argument bridges. Removed in 6.3.
296
296
  LEGACY_WORKFLOW_KEYS = {
297
297
  cart_add_item_service: :cart_add_item_workflow,
298
298
  cart_recalculate_service: :cart_recalculate_workflow,
@@ -309,7 +309,7 @@ module Spree
309
309
  # service rename: the new class speaks the fulfillment keyword
310
310
  # vocabulary (still accepting the old shipment keywords with a
311
311
  # warning), but a legacy override written against the old keywords is
312
- # not interchangeable with what the new call sites pass. Removed in 6.1.
312
+ # not interchangeable with what the new call sites pass. Removed in 6.3.
313
313
  LEGACY_SERVICE_KEYS = {
314
314
  shipment_update_service: :fulfillment_update_workflow,
315
315
  fulfillment_update_service: :fulfillment_update_workflow,
@@ -321,7 +321,7 @@ module Spree
321
321
  # Pure renames: the class, its contract and its keyword vocabulary are
322
322
  # unchanged, so unlike LEGACY_WORKFLOW_KEYS an override written against
323
323
  # the old name IS applied — there is nothing incompatible about it.
324
- # Removed in 6.1.
324
+ # Removed in 6.3.
325
325
  RENAMED_SERVICE_KEYS = {
326
326
  checkout_add_store_credit_service: :store_credit_apply_service,
327
327
  checkout_remove_store_credit_service: :store_credit_remove_service
@@ -330,7 +330,7 @@ module Spree
330
330
  RENAMED_SERVICE_KEYS.each do |legacy, current|
331
331
  define_method("#{legacy}=") do |value|
332
332
  Spree::Deprecation.warn(
333
- "Spree::Dependencies##{legacy}= is deprecated and will be removed in Spree 6.1. " \
333
+ "Spree::Dependencies##{legacy}= is deprecated and will be removed in Spree 6.3. " \
334
334
  "Use #{current}= instead."
335
335
  )
336
336
  send("#{current}=", value)
@@ -338,7 +338,7 @@ module Spree
338
338
 
339
339
  define_method(legacy) do
340
340
  Spree::Deprecation.warn(
341
- "Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.1. " \
341
+ "Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.3. " \
342
342
  "Use #{current} instead."
343
343
  )
344
344
  send(current)
@@ -348,7 +348,7 @@ module Spree
348
348
  # constantized reader too.
349
349
  define_method("#{legacy}_class") do
350
350
  Spree::Deprecation.warn(
351
- "Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.1. " \
351
+ "Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.3. " \
352
352
  "Use #{current} instead."
353
353
  )
354
354
  send("#{current}_class")
@@ -364,18 +364,18 @@ module Spree
364
364
  Spree::Deprecation.warn(
365
365
  "Spree::Dependencies##{legacy}= is deprecated and NO LONGER CONSULTED by Spree — " \
366
366
  "the override was not applied. Port the class to the #{current} contract and " \
367
- "set #{current}= instead. The #{legacy} name is removed in Spree 6.1."
367
+ "set #{current}= instead. The #{legacy} name is removed in Spree 6.3."
368
368
  )
369
369
  legacy_workflow_overrides[legacy] = value
370
370
  end
371
371
 
372
372
  define_method(legacy) do
373
- Spree::Deprecation.warn("Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.1. Use #{current} instead.")
373
+ Spree::Deprecation.warn("Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.3. Use #{current} instead.")
374
374
  legacy_workflow_overrides.fetch(legacy) { send(current) }
375
375
  end
376
376
 
377
377
  define_method("#{legacy}_class") do
378
- Spree::Deprecation.warn("Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.1. Use #{current} instead.")
378
+ Spree::Deprecation.warn("Spree::Dependencies##{legacy} is deprecated and will be removed in Spree 6.3. Use #{current} instead.")
379
379
  if legacy_workflow_overrides.key?(legacy)
380
380
  value = legacy_workflow_overrides[legacy]
381
381
  value.is_a?(String) ? value.constantize : value
@@ -99,6 +99,7 @@ module Spree
99
99
  # wins over the environment — is never rejected for a stale env var.
100
100
  config.after_initialize do
101
101
  Spree::Core::Configuration.validate_env!(Spree::Config)
102
+ Rails.error.subscribe(Spree::RemovedApis::ErrorSubscriber.new)
102
103
  end
103
104
 
104
105
  # I18n's config lives in fiber/thread-local storage that survives across
@@ -596,7 +597,10 @@ module Spree
596
597
  app/models/spree/classification.rb
597
598
  app/models/spree/promotion/rules/taxon.rb
598
599
  app/models/spree/promotion_rule_taxon.rb
600
+ app/models/spree/prototype.rb
599
601
  app/models/spree/return_authorization_reason.rb
602
+ app/models/spree/shipment.rb
603
+ app/models/spree/shipping_method.rb
600
604
  app/models/spree/taxon.rb
601
605
  app/services/spree/checkout/add_store_credit.rb
602
606
  app/services/spree/checkout/remove_store_credit.rb
@@ -606,6 +610,16 @@ module Spree
606
610
  Rails.autoloaders.main.do_not_eager_load(*DEPRECATED_ALIAS_FILES.map { |path| root.join(path) })
607
611
  end
608
612
 
613
+ # Hands reported errors to the diagnostics error log, resolving the
614
+ # class per call so a development reload picks up the new one.
615
+ module DiagnosticsErrorSubscriber
616
+ def self.report(...) = Spree::Diagnostics::ErrorLog.new.report(...)
617
+ end
618
+
619
+ initializer 'spree.diagnostics.error_log' do
620
+ Rails.error.subscribe(DiagnosticsErrorSubscriber)
621
+ end
622
+
609
623
  # filter sensitive information during logging
610
624
  initializer 'spree.params.filter' do |app|
611
625
  app.config.filter_parameters += [
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  module Core
3
- # @deprecated Use {Spree::HasNumber} instead. Removed in Spree 6.1.
3
+ # @deprecated Use {Spree::HasNumber} instead. Removed in Spree 6.3.
4
4
  #
5
5
  # # before
6
6
  # include Spree::Core::NumberGenerator.new(prefix: 'R')
@@ -9,7 +9,7 @@ module Spree
9
9
  # has_spree_number prefix: 'R'
10
10
  #
11
11
  # Kept as a shell so existing models and extension decorators keep
12
- # working for one release. Including it wires up {Spree::HasNumber} with
12
+ # working until 6.3. Including it wires up {Spree::HasNumber} with
13
13
  # the given prefix, which means numbers now follow the store's format
14
14
  # preference (sequential by default) rather than always being random.
15
15
  # Hosts that need the old random numbers should switch the store's
@@ -25,13 +25,14 @@ module Spree
25
25
  attr_accessor :prefix, :length
26
26
 
27
27
  def initialize(options)
28
+ super()
28
29
  @prefix = options.fetch(:prefix)
29
30
  @length = options.fetch(:length, DEFAULT_LENGTH)
30
31
  @letters = options[:letters]
31
32
 
32
33
  Spree::Deprecation.warn(
33
34
  'Spree::Core::NumberGenerator is deprecated and will be removed in ' \
34
- "Spree 6.1. Replace `include Spree::Core::NumberGenerator.new(prefix: '#{@prefix}')` " \
35
+ "Spree 6.3. Replace `include Spree::Core::NumberGenerator.new(prefix: '#{@prefix}')` " \
35
36
  "with `has_spree_number prefix: '#{@prefix}'`. " \
36
37
  'See docs/plans/6.0-document-numbers.md.'
37
38
  )
@@ -283,7 +283,7 @@ module Spree::Preferences::Preferable
283
283
  # `(value, owner = nil)` shapes.
284
284
  value = parse_on_set.arity.abs > 1 ? parse_on_set.call(value, self) : parse_on_set.call(value)
285
285
  end
286
- # Spree 6.0 bridge, removed with incomplete declarations in 6.1: an id list
286
+ # Spree 6.0 bridge, removed with incomplete declarations in 6.3: an id list
287
287
  # an extension declared without `of: :id` still has its prefixed ids
288
288
  # decoded, as the API did for every `*_ids` key before.
289
289
  if definition[:type] == :array && definition[:of].nil? && name.to_s.end_with?('_ids') && value.is_a?(Array)
@@ -192,6 +192,10 @@ module Spree::Preferences
192
192
  raise ArgumentError, "`currency:` applies to a :money preference, not `#{name}` (#{type})" if options[:currency] && type != :money
193
193
  raise ArgumentError, "`of: :object` needs `properties:` on preference `#{name}`" if options[:of] == :object && options[:properties].blank?
194
194
 
195
+ warn_incomplete_preference_declaration(name, type, options)
196
+ end
197
+
198
+ def warn_incomplete_preference_declaration(name, type, options)
195
199
  missing = case type
196
200
  when :any then 'a type other than :any'
197
201
  when :array then '`of:`' unless options[:of]
@@ -201,7 +205,7 @@ module Spree::Preferences
201
205
 
202
206
  Spree::Deprecation.warn(
203
207
  "#{self.name} preference `#{name}` (#{type}) needs #{missing}; until it has one, its schema accepts any value. " \
204
- 'Spree 6.1 will raise for an incomplete declaration.'
208
+ 'Spree 6.3 will raise for an incomplete declaration.'
205
209
  )
206
210
  end
207
211
 
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  module Pricing
3
- # @deprecated Use {Spree::Pricing::PriceResolution}; removed in 6.1.
3
+ # @deprecated Use {Spree::Pricing::PriceResolution}; removed in 6.3.
4
4
  #
5
5
  # Answering a price used to mean walking the store's price lists and
6
6
  # falling back to the variant's base price. That is now one engine among
@@ -22,7 +22,7 @@ module Spree
22
22
  # @return [Spree::Price, nil]
23
23
  def resolve
24
24
  Spree::Deprecation.warn(
25
- 'Spree::Pricing::Resolver is deprecated and will be removed in Spree 6.1. ' \
25
+ 'Spree::Pricing::Resolver is deprecated and will be removed in Spree 6.3. ' \
26
26
  'Use Spree::Pricing::PriceResolution.call(context) instead.'
27
27
  )
28
28
 
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- VERSION = '6.0.3'.freeze
2
+ VERSION = '6.0.5'.freeze
3
3
 
4
4
  def self.version
5
5
  VERSION
data/lib/spree/core.rb CHANGED
@@ -86,15 +86,23 @@ module Spree
86
86
  resolve_class_setting(:customer_class, @@customer_class, constantize)
87
87
  end
88
88
 
89
- # @deprecated Spree.user_class was renamed to Spree.customer_class in 6.0; removed in 6.1.
89
+ # @deprecated Spree.user_class was renamed to Spree.customer_class in 6.0; removed in 6.3.
90
90
  def self.user_class(constantize: true)
91
- Spree::Deprecation.warn('Spree.user_class is deprecated and will be removed in Spree 6.1. Use Spree.customer_class instead.') if defined?(Spree::Deprecation)
91
+ if defined?(Spree::Deprecation)
92
+ Spree::Deprecation.warn(
93
+ 'Spree.user_class is deprecated and will be removed in Spree 6.3. Use Spree.customer_class instead.'
94
+ )
95
+ end
92
96
  customer_class(constantize: constantize)
93
97
  end
94
98
 
95
- # @deprecated Spree.user_class= was renamed to Spree.customer_class= in 6.0; removed in 6.1.
99
+ # @deprecated Spree.user_class= was renamed to Spree.customer_class= in 6.0; removed in 6.3.
96
100
  def self.user_class=(value)
97
- Spree::Deprecation.warn('Spree.user_class= is deprecated and will be removed in Spree 6.1. Use Spree.customer_class= instead.') if defined?(Spree::Deprecation)
101
+ if defined?(Spree::Deprecation)
102
+ Spree::Deprecation.warn(
103
+ 'Spree.user_class= is deprecated and will be removed in Spree 6.3. Use Spree.customer_class= instead.'
104
+ )
105
+ end
98
106
  self.customer_class = value
99
107
  end
100
108
 
@@ -135,24 +143,38 @@ module Spree
135
143
  payouts: :default,
136
144
  maintenance_tasks: :default
137
145
  ).tap do |queues|
138
- # @deprecated The taxons queue was renamed to categories in 6.0; removed in 6.1.
146
+ # @deprecated The taxons queue was renamed to categories in 6.0; removed in 6.3.
139
147
  queues.define_singleton_method(:taxons) do
140
- Spree::Deprecation.warn('Spree.queues.taxons is deprecated and will be removed in Spree 6.1. Use Spree.queues.categories instead.') if defined?(Spree::Deprecation)
148
+ if defined?(Spree::Deprecation)
149
+ Spree::Deprecation.warn(
150
+ 'Spree.queues.taxons is deprecated and will be removed in Spree 6.3. Use Spree.queues.categories instead.'
151
+ )
152
+ end
141
153
  categories
142
154
  end
143
155
 
144
- # @deprecated Renamed with the stock level rename in 6.0; removed in 6.1.
156
+ # @deprecated Renamed with the stock level rename in 6.0; removed in 6.3.
145
157
  #
146
158
  # The writer matters as much as the reader here: these are ordered options, so
147
159
  # an existing initializer assigning the old name would quietly define a
148
160
  # field nobody reads and its jobs would fall back to the default queue.
149
161
  queues.define_singleton_method(:stock_location_stock_items) do
150
- Spree::Deprecation.warn('Spree.queues.stock_location_stock_items is deprecated and will be removed in Spree 6.1. Use Spree.queues.stock_location_stock_levels instead.') if defined?(Spree::Deprecation)
162
+ if defined?(Spree::Deprecation)
163
+ Spree::Deprecation.warn(
164
+ 'Spree.queues.stock_location_stock_items is deprecated and will be removed in Spree 6.3. ' \
165
+ 'Use Spree.queues.stock_location_stock_levels instead.'
166
+ )
167
+ end
151
168
  stock_location_stock_levels
152
169
  end
153
170
 
154
171
  queues.define_singleton_method(:stock_location_stock_items=) do |value|
155
- Spree::Deprecation.warn('Spree.queues.stock_location_stock_items= is deprecated and will be removed in Spree 6.1. Use Spree.queues.stock_location_stock_levels= instead.') if defined?(Spree::Deprecation)
172
+ if defined?(Spree::Deprecation)
173
+ Spree::Deprecation.warn(
174
+ 'Spree.queues.stock_location_stock_items= is deprecated and will be removed in Spree 6.3. ' \
175
+ 'Use Spree.queues.stock_location_stock_levels= instead.'
176
+ )
177
+ end
156
178
  self.stock_location_stock_levels = value
157
179
  end
158
180
  end
@@ -170,6 +192,17 @@ module Spree
170
192
  @@search_provider = value.to_s
171
193
  end
172
194
 
195
+ # Sections of the diagnostics report (see Spree::Diagnostics), as class
196
+ # names so an initializer can add one before its class is autoloaded.
197
+ #
198
+ # Spree.diagnostics_sections << 'MyGem::DiagnosticsSection'
199
+ #
200
+ # @return [Array<String>]
201
+ def self.diagnostics_sections
202
+ @@diagnostics_sections ||= %w[Platform Runtime Infrastructure Preferences].
203
+ map { |name| "Spree::Diagnostics::Sections::#{name}" }
204
+ end
205
+
173
206
  # Tax ID validators, keyed by registration kind.
174
207
  #
175
208
  # Core ships one, for +eu_vat+, and it checks format only — the shape of an EU
@@ -466,7 +499,11 @@ module Spree
466
499
  end
467
500
 
468
501
  def self.metafields
469
- Spree::Deprecation.warn('Spree.metafields is deprecated and will be removed in Spree 6.1. Use Spree.custom_fields instead.') if defined?(Spree::Deprecation)
502
+ if defined?(Spree::Deprecation)
503
+ Spree::Deprecation.warn(
504
+ 'Spree.metafields is deprecated and will be removed in Spree 6.3. Use Spree.custom_fields instead.'
505
+ )
506
+ end
470
507
  custom_fields
471
508
  end
472
509
 
@@ -690,6 +727,7 @@ require 'spree/agent_tool'
690
727
  require 'spree/agent_tools'
691
728
  require 'spree/events'
692
729
  require 'spree/store_scope_guard'
730
+ require 'spree/removed_apis'
693
731
  require 'spree/uploads'
694
732
 
695
733
  # Not autoloaded from app/: the registry keeps registered steps in
data/lib/spree/i18n.rb CHANGED
@@ -5,9 +5,13 @@ module Spree
5
5
 
6
6
  class << self
7
7
  # @deprecated Use +I18n.t+ with the full key, e.g. +I18n.t('spree.free')+.
8
- # Will be removed in Spree 6.1.
8
+ # Will be removed in Spree 6.3.
9
9
  def translate(key, options = {})
10
- Spree::Deprecation.warn('Spree.t is deprecated and will be removed in Spree 6.1. Use I18n.t with the full key, e.g. I18n.t("spree.free").') if defined?(Spree::Deprecation)
10
+ if defined?(Spree::Deprecation)
11
+ Spree::Deprecation.warn(
12
+ 'Spree.t is deprecated and will be removed in Spree 6.3. Use I18n.t with the full key, e.g. I18n.t("spree.free").'
13
+ )
14
+ end
11
15
 
12
16
  I18n.t(key, **options.symbolize_keys, scope: [:spree, *Array(options[:scope]).map(&:to_sym)].uniq)
13
17
  end
@@ -5,7 +5,7 @@ module Spree
5
5
  # Strips all non-price-like characters from the number, taking into account locale settings.
6
6
  def self.parse(number)
7
7
  Spree::Deprecation.warn(
8
- 'Spree::LocalizedNumber is deprecated and will be removed in Spree 6.1. ' \
8
+ 'Spree::LocalizedNumber is deprecated and will be removed in Spree 6.3. ' \
9
9
  'Parse a canonical decimal string with BigDecimal, or Spree::Money::Rounding.parse_canonical for API input.'
10
10
  )
11
11
  return number unless number.is_a?(String)