spree_core 6.0.4 → 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 (178) 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/products/auto_match_taxons_job.rb +5 -2
  5. data/app/jobs/spree/search_provider/index_job.rb +8 -0
  6. data/app/jobs/spree/search_provider/remove_job.rb +3 -0
  7. data/app/jobs/spree/stock_locations/stock_items/create_job.rb +5 -2
  8. data/app/mailers/spree/base_mailer.rb +1 -1
  9. data/app/models/concerns/spree/acted_by.rb +2 -2
  10. data/app/models/concerns/spree/customer_methods.rb +6 -4
  11. data/app/models/concerns/spree/deprecated_customer_alias.rb +11 -3
  12. data/app/models/concerns/spree/derived_number.rb +1 -1
  13. data/app/models/concerns/spree/has_custom_fields.rb +12 -10
  14. data/app/models/concerns/spree/integrations_concern.rb +5 -3
  15. data/app/models/concerns/spree/label_translatable.rb +4 -4
  16. data/app/models/concerns/spree/metadata.rb +3 -3
  17. data/app/models/concerns/spree/presentation_translatable.rb +1 -1
  18. data/app/models/concerns/spree/purchase/addresses.rb +8 -5
  19. data/app/models/concerns/spree/purchase/deprecated_aliases.rb +2 -2
  20. data/app/models/concerns/spree/stores/markets.rb +4 -2
  21. data/app/models/concerns/spree/user_address.rb +5 -2
  22. data/app/models/concerns/spree/user_methods.rb +2 -2
  23. data/app/models/spree/address.rb +29 -14
  24. data/app/models/spree/asset.rb +3 -3
  25. data/app/models/spree/base.rb +1 -1
  26. data/app/models/spree/calculator/shipping/flat_rate.rb +6 -4
  27. data/app/models/spree/cart.rb +2 -2
  28. data/app/models/spree/category.rb +8 -6
  29. data/app/models/spree/classification.rb +2 -2
  30. data/app/models/spree/current.rb +19 -0
  31. data/app/models/spree/custom_field.rb +6 -6
  32. data/app/models/spree/custom_field_definition.rb +10 -7
  33. data/app/models/spree/delivery_method.rb +21 -15
  34. data/app/models/spree/delivery_rate.rb +1 -1
  35. data/app/models/spree/digital.rb +1 -1
  36. data/app/models/spree/digital_asset.rb +2 -2
  37. data/app/models/spree/digital_link.rb +4 -4
  38. data/app/models/spree/export.rb +29 -2
  39. data/app/models/spree/fulfillment/custom_events.rb +18 -10
  40. data/app/models/spree/fulfillment.rb +30 -23
  41. data/app/models/spree/fulfillment_item.rb +3 -3
  42. data/app/models/spree/fulfilment_changer.rb +1 -1
  43. data/app/models/spree/gift_card.rb +12 -12
  44. data/app/models/spree/import.rb +23 -15
  45. data/app/models/spree/import_row.rb +6 -6
  46. data/app/models/spree/inventory_unit.rb +1 -1
  47. data/app/models/spree/invitation.rb +8 -4
  48. data/app/models/spree/line_item.rb +10 -8
  49. data/app/models/spree/media.rb +2 -2
  50. data/app/models/spree/metafield.rb +1 -1
  51. data/app/models/spree/metafield_definition.rb +1 -1
  52. data/app/models/spree/metafields.rb +2 -2
  53. data/app/models/spree/option_type.rb +26 -0
  54. data/app/models/spree/option_value.rb +3 -3
  55. data/app/models/spree/order.rb +87 -45
  56. data/app/models/spree/order_inventory.rb +2 -2
  57. data/app/models/spree/order_merger.rb +2 -2
  58. data/app/models/spree/order_updater.rb +34 -20
  59. data/app/models/spree/payment.rb +8 -8
  60. data/app/models/spree/payment_method.rb +11 -9
  61. data/app/models/spree/price.rb +19 -8
  62. data/app/models/spree/price_list.rb +12 -6
  63. data/app/models/spree/price_rules/zone_rule.rb +1 -1
  64. data/app/models/spree/product.rb +26 -24
  65. data/app/models/spree/product_category.rb +3 -3
  66. data/app/models/spree/promotion/rules/category.rb +27 -10
  67. data/app/models/spree/promotion/rules/country.rb +1 -1
  68. data/app/models/spree/promotion/rules/taxon.rb +4 -2
  69. data/app/models/spree/promotion/rules/user.rb +1 -1
  70. data/app/models/spree/promotion_action.rb +1 -1
  71. data/app/models/spree/promotion_rule_category.rb +5 -5
  72. data/app/models/spree/promotion_rule_taxon.rb +2 -2
  73. data/app/models/spree/prototype.rb +4 -1
  74. data/app/models/spree/return_authorization_reason.rb +3 -3
  75. data/app/models/spree/return_reason.rb +1 -1
  76. data/app/models/spree/search_provider/base.rb +2 -2
  77. data/app/models/spree/search_provider.rb +7 -5
  78. data/app/models/spree/shipment.rb +4 -1
  79. data/app/models/spree/shipping_method.rb +4 -1
  80. data/app/models/spree/shipping_rate.rb +1 -1
  81. data/app/models/spree/stock/coordinator.rb +2 -2
  82. data/app/models/spree/stock/estimator.rb +7 -5
  83. data/app/models/spree/stock/package.rb +10 -8
  84. data/app/models/spree/stock_item.rb +1 -1
  85. data/app/models/spree/stock_level/custom_events.rb +1 -1
  86. data/app/models/spree/stock_level.rb +1 -1
  87. data/app/models/spree/stock_location.rb +12 -8
  88. data/app/models/spree/stock_movement.rb +6 -6
  89. data/app/models/spree/stock_reservation.rb +5 -5
  90. data/app/models/spree/store.rb +42 -16
  91. data/app/models/spree/store_credit.rb +2 -2
  92. data/app/models/spree/store_credit_category.rb +5 -5
  93. data/app/models/spree/store_credit_type.rb +2 -2
  94. data/app/models/spree/subscriber.rb +7 -7
  95. data/app/models/spree/tax_rate.rb +5 -5
  96. data/app/models/spree/taxon.rb +3 -3
  97. data/app/models/spree/taxon_rule.rb +2 -2
  98. data/app/models/spree/taxonomy.rb +1 -1
  99. data/app/models/spree/variant.rb +12 -10
  100. data/app/models/spree/variant_media.rb +1 -1
  101. data/app/models/spree/wished_item.rb +1 -1
  102. data/app/models/spree/wishlist.rb +2 -2
  103. data/app/models/spree/wishlist_item/custom_events.rb +2 -2
  104. data/app/models/spree/zone.rb +1 -1
  105. data/app/models/spree/zone_member.rb +1 -1
  106. data/app/services/spree/carts/associate.rb +6 -2
  107. data/app/services/spree/carts/create.rb +1 -1
  108. data/app/services/spree/carts/destroy.rb +1 -1
  109. data/app/services/spree/carts/remove_item.rb +1 -1
  110. data/app/services/spree/carts/remove_line_item.rb +2 -2
  111. data/app/services/spree/carts/remove_out_of_stock_items.rb +3 -1
  112. data/app/services/spree/carts/set_quantity.rb +2 -2
  113. data/app/services/spree/carts/update.rb +17 -0
  114. data/app/services/spree/checkout/add_store_credit.rb +3 -3
  115. data/app/services/spree/checkout/remove_store_credit.rb +2 -2
  116. data/app/services/spree/imports/row_processors/product_variant.rb +19 -0
  117. data/app/services/spree/orders/approve.rb +3 -3
  118. data/app/services/spree/orders/create_user_account.rb +2 -2
  119. data/app/services/spree/products/auto_match_taxons.rb +5 -2
  120. data/app/services/spree/shipments/update.rb +2 -2
  121. data/app/services/spree/stock_locations/stock_items/create.rb +5 -2
  122. data/app/services/spree/stock_reservations/extend.rb +3 -1
  123. data/app/services/spree/stock_reservations/reserve.rb +3 -1
  124. data/app/services/spree/taxons/add_products.rb +4 -2
  125. data/app/services/spree/taxons/regenerate_products.rb +5 -2
  126. data/app/services/spree/taxons/remove_products.rb +4 -2
  127. data/app/workflows/spree/carts/add_item.rb +1 -1
  128. data/app/workflows/spree/carts/recalculate.rb +1 -1
  129. data/app/workflows/spree/fulfillments/update.rb +1 -1
  130. data/app/workflows/spree/orders/cancel.rb +3 -1
  131. data/app/workflows/spree/payments/capture.rb +2 -2
  132. data/app/workflows/spree/seller_transfers/create.rb +1 -1
  133. data/config/locales/en.yml +4 -0
  134. data/db/migrate/20260710000001_rename_taxons_to_categories.rb +1 -1
  135. data/db/migrate/20260728000004_rename_shipping_to_fulfillment_and_delivery.rb +1 -1
  136. data/db/migrate/20260806000001_add_store_id_to_spree_tax_rates_and_categories.rb +1 -1
  137. data/db/migrate/20260807130001_add_country_state_codes_to_consumers.rb +1 -1
  138. data/db/migrate/20260809000001_rename_metafields_to_custom_fields.rb +1 -1
  139. data/db/migrate/20260809150001_promote_shipping_categories_to_delivery_profiles.rb +1 -1
  140. data/db/migrate/20260811000001_add_delivery_tracking_to_fulfillments.rb +1 -1
  141. data/db/migrate/20260824000001_add_store_to_spree_media.rb +1 -1
  142. data/db/migrate/20260828100001_unify_import_and_export_tenancy.rb +1 -1
  143. data/db/migrate/20261016000001_remove_default_from_spree_tax_rates_included_in_price.rb +1 -1
  144. data/lib/spree/agent_tools/default_catalog.rb +2 -2
  145. data/lib/spree/agent_tools/legacy_tools.rb +1 -1
  146. data/lib/spree/core/dependencies.rb +10 -10
  147. data/lib/spree/core/engine.rb +4 -0
  148. data/lib/spree/core/number_generator.rb +4 -3
  149. data/lib/spree/core/preferences/preferable.rb +1 -1
  150. data/lib/spree/core/preferences/preferable_class_methods.rb +5 -1
  151. data/lib/spree/core/pricing/resolver.rb +2 -2
  152. data/lib/spree/core/version.rb +1 -1
  153. data/lib/spree/core.rb +37 -10
  154. data/lib/spree/i18n.rb +6 -2
  155. data/lib/spree/localized_number.rb +1 -1
  156. data/lib/spree/removed_apis.rb +274 -0
  157. data/lib/spree/reporting/default_vocabulary.rb +1 -1
  158. data/lib/spree/testing_support/factories/digital_asset_factory.rb +1 -1
  159. data/lib/spree/testing_support/factories/stock_level_factory.rb +1 -1
  160. data/lib/spree/testing_support/factories/taxon_factory.rb +1 -1
  161. data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -1
  162. data/lib/spree/testing_support/factories/wishlist_item_factory.rb +1 -1
  163. data/lib/spree/testing_support/i18n.rb +7 -2
  164. data/lib/spree/testing_support/order_walkthrough.rb +5 -2
  165. data/lib/spree/upgrades/5_6_to_6_0/manifest.yml +14 -14
  166. data/lib/tasks/carts_migration.rake +1 -1
  167. data/lib/tasks/categories_and_collections.rake +1 -1
  168. data/lib/tasks/deliveries_migration.rake +1 -1
  169. data/lib/tasks/delivery_method_rules_migration.rake +1 -1
  170. data/lib/tasks/delivery_migration.rake +1 -1
  171. data/lib/tasks/delivery_profiles_migration.rake +2 -2
  172. data/lib/tasks/fold_store_credit_categories.rake +1 -1
  173. data/lib/tasks/migrate_country_state_codes.rake +1 -1
  174. data/lib/tasks/migrate_returns.rake +4 -4
  175. data/lib/tasks/migrate_rich_text_to_columns.rake +1 -1
  176. data/lib/tasks/store_settings.rake +1 -1
  177. data/lib/tasks/typed_stock_movements_migration.rake +1 -1
  178. metadata +7 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e465daf49ecae5d15b57e998d9ea505ee2eba53224668e370c290536aad30736
4
- data.tar.gz: 1a7596942af23ef5da1830f75c76acf3f6bad00e92e1b95b1f400424ddfa7603
3
+ metadata.gz: d62d8e35b3c55f0a54ef1afb0e8270bfb1391899f12b3959ca6959324953e84d
4
+ data.tar.gz: bd148a4547773fff7263a12765b45f5c2573612190ca06293204a7c25c73d775
5
5
  SHA512:
6
- metadata.gz: 3fab6326b8031e792e88fe83aedc58879cef258f145fc828ae04c39425e1c0e1359a4e2ee26d4d64f7abea3b72cd7e79ceb2ba4c6e4dc045e5a266bd0c351255
7
- data.tar.gz: 8dd0f193ddc437e1ab18983e34713743928ec239e4baa025f93aed3bc4b3e6bc85ac0e36630859a561fd1f901fef77cec49685e254c303d1502e2f53ca694e39
6
+ metadata.gz: cacd3ad126f55a1cf7ec44ed1d243041bf1617ea3a38a303373995c39a96c9e2b6ab6d7eaf17f11ba4ba0bca7ee63dba8a4b3b3e7185473849afdd6a99afde68
7
+ data.tar.gz: 27d668eb15bc37af05a04143de22cabc308dec4c14d2e63a15b8697d7c97ee3e18eedd82ce7844aeae6528abda210a629839f5fe21e507cd41be861d287b78e5
@@ -1,9 +1,11 @@
1
1
  module Spree
2
2
  module Imports
3
- # @deprecated Use {Spree::Imports::ProcessJob}; removed in 6.1.
3
+ # @deprecated Use {Spree::Imports::ProcessJob}; removed in 6.3.
4
4
  class CreateRowsJob < Spree::Imports::BaseJob
5
5
  def perform(import_id)
6
- Spree::Deprecation.warn('Spree::Imports::CreateRowsJob is deprecated and will be removed in Spree 6.1. Use Spree::Imports::ProcessJob instead.')
6
+ Spree::Deprecation.warn(
7
+ 'Spree::Imports::CreateRowsJob is deprecated and will be removed in Spree 6.3. Use Spree::Imports::ProcessJob instead.'
8
+ )
7
9
  Spree::Imports::ProcessJob.perform_now(import_id)
8
10
  end
9
11
  end
@@ -1,10 +1,12 @@
1
1
  module Spree
2
2
  module Imports
3
3
  # @deprecated Use {Spree::Imports::ProcessJob} with skip_row_creation:
4
- # true; removed in 6.1.
4
+ # true; removed in 6.3.
5
5
  class ProcessRowsJob < Spree::Imports::BaseJob
6
6
  def perform(import_id)
7
- Spree::Deprecation.warn('Spree::Imports::ProcessRowsJob is deprecated and will be removed in Spree 6.1. Use Spree::Imports::ProcessJob instead.')
7
+ Spree::Deprecation.warn(
8
+ 'Spree::Imports::ProcessRowsJob is deprecated and will be removed in Spree 6.3. Use Spree::Imports::ProcessJob instead.'
9
+ )
8
10
  Spree::Imports::ProcessJob.perform_now(import_id, skip_row_creation: true)
9
11
  end
10
12
  end
@@ -2,10 +2,13 @@ module Spree
2
2
  module Products
3
3
  # @deprecated Renamed to AutoMatchCollectionsJob in 6.0 (behavior moved to
4
4
  # collections). Subclasses it so jobs enqueued under the old class name still
5
- # deserialize and run; removed in 6.1.
5
+ # deserialize and run; removed in 6.3.
6
6
  class AutoMatchTaxonsJob < AutoMatchCollectionsJob
7
7
  def perform(product_id)
8
- Spree::Deprecation.warn('Spree::Products::AutoMatchTaxonsJob is deprecated and will be removed in Spree 6.1. Use Spree::Products::AutoMatchCollectionsJob instead.')
8
+ Spree::Deprecation.warn(
9
+ 'Spree::Products::AutoMatchTaxonsJob is deprecated and will be removed in Spree 6.3. ' \
10
+ 'Use Spree::Products::AutoMatchCollectionsJob instead.'
11
+ )
9
12
  super
10
13
  end
11
14
  end
@@ -3,6 +3,14 @@ module Spree
3
3
  class IndexJob < Spree::BaseJob
4
4
  queue_as Spree.queues.search
5
5
 
6
+ # A bulk write (CSV import, sample data) enqueues thousands of these at
7
+ # once; run in parallel they flood the search service with requests and
8
+ # it answers 429 Too Many Requests. Run one search job per store at a
9
+ # time; the rest wait as blocked executions, so no update is lost. Shared
10
+ # with RemoveJob. The duration only has to outlive one job; expiry lifts
11
+ # the cap, it doesn't drop jobs. Solid Queue only (no-op elsewhere).
12
+ limits_concurrency to: 1, key: ->(*, store_id) { store_id }, group: 'spree_search', duration: 5.minutes if respond_to?(:limits_concurrency)
13
+
6
14
  # Search providers are external services (Meilisearch, etc.); a transient 5xx or
7
15
  # network blip should not drop the index update.
8
16
  retry_on StandardError, wait: :polynomially_longer, attempts: 5
@@ -3,6 +3,9 @@ module Spree
3
3
  class RemoveJob < Spree::BaseJob
4
4
  queue_as Spree.queues.search
5
5
 
6
+ # Shares IndexJob's per-store limit, see there.
7
+ limits_concurrency to: 1, key: ->(*, store_id) { store_id }, group: 'spree_search', duration: 5.minutes if respond_to?(:limits_concurrency)
8
+
6
9
  # Search providers are external services; broad retry covers network blips and 5xx.
7
10
  retry_on StandardError, wait: :polynomially_longer, attempts: 5
8
11
  # Must come after `retry_on StandardError` so DeserializationError lands in discard
@@ -3,10 +3,13 @@ module Spree
3
3
  module StockItems
4
4
  # @deprecated Renamed to Spree::StockLocations::StockLevels::CreateJob in 6.0.
5
5
  # Subclasses it so jobs enqueued under the old class name before the deploy
6
- # still deserialize and run; removed in 6.1.
6
+ # still deserialize and run; removed in 6.3.
7
7
  class CreateJob < StockLevels::CreateJob
8
8
  def perform(*args)
9
- Spree::Deprecation.warn('Spree::StockLocations::StockItems::CreateJob is deprecated and will be removed in Spree 6.1. Use Spree::StockLocations::StockLevels::CreateJob instead.')
9
+ Spree::Deprecation.warn(
10
+ 'Spree::StockLocations::StockItems::CreateJob is deprecated and will be removed in Spree 6.3. ' \
11
+ 'Use Spree::StockLocations::StockLevels::CreateJob instead.'
12
+ )
10
13
  super
11
14
  end
12
15
  end
@@ -29,7 +29,7 @@ module Spree
29
29
  @_store_locale_active = true
30
30
  begin
31
31
  Spree::Locales::SetFallbackLocaleForStore.new.call(store: store) if store
32
- I18n.with_locale(locale, &block)
32
+ Spree::Current.with_content_locale(store&.default_market&.default_locale) { I18n.with_locale(locale, &block) }
33
33
  ensure
34
34
  @_store_locale_active = previously_active
35
35
  Mobility.store_based_fallbacks = previous_fallbacks
@@ -178,7 +178,7 @@ module Spree
178
178
  # Prepended rather than defined outright, so `super` reaches the
179
179
  # generated reader.
180
180
  #
181
- # Removed in 6.1, once the backfill is a release behind.
181
+ # Removed in 6.3, once the backfill is a release behind.
182
182
  def define_transitional_actor_reader(name)
183
183
  transitional_actor_readers.module_eval do
184
184
  define_method(name) do
@@ -188,7 +188,7 @@ module Spree
188
188
  Spree::Deprecation.warn(
189
189
  "#{self.class.name}##{name} resolved through #{Spree.admin_user_class} because " \
190
190
  "#{name}_type is blank. Run `rake spree:upgrade:backfill_actor_types`; the fallback " \
191
- 'is removed in Spree 6.1.'
191
+ 'is removed in Spree 6.3.'
192
192
  )
193
193
 
194
194
  # Fill the type across the whole lazily-preloaded group, not just
@@ -295,14 +295,14 @@ module Spree
295
295
  # @deprecated Carts are {Spree::Cart} since 6.0, so an incomplete order is
296
296
  # a backoffice draft rather than the customer's cart. Use
297
297
  # +carts.where(store: store)+ for carts, or +orders.drafts+ for drafts.
298
- # Removed in Spree 6.1.
298
+ # Removed in Spree 6.3.
299
299
  # @param [Spree::Store] store
300
300
  # @param [Hash] options
301
301
  # @option options [Array<Symbol>] :includes
302
302
  # @return [Spree::Order]
303
303
  def last_incomplete_spree_order(store, options = {})
304
304
  Spree::Deprecation.warn(
305
- 'Spree::CustomerMethods#last_incomplete_spree_order is deprecated and will be removed in Spree 6.1. ' \
305
+ 'Spree::CustomerMethods#last_incomplete_spree_order is deprecated and will be removed in Spree 6.3. ' \
306
306
  'Carts are Spree::Cart since 6.0 and this returns draft orders; use #carts for the customer\'s carts.'
307
307
  )
308
308
 
@@ -393,9 +393,11 @@ module Spree
393
393
  # every column carrying personal data rather than three on this row —
394
394
  # the address book, the address snapshots on past orders, gateway
395
395
  # profiles, OAuth identities and live sessions all outlived this method.
396
- # Removed in Spree 6.1.
396
+ # Removed in Spree 6.3.
397
397
  def scramble_email_and_names
398
- Spree::Deprecation.warn('Spree::CustomerMethods#scramble_email_and_names is deprecated and will be removed in Spree 6.1. Use Spree::Customers::Anonymize instead.')
398
+ Spree::Deprecation.warn(
399
+ 'Spree::CustomerMethods#scramble_email_and_names is deprecated and will be removed in Spree 6.3. Use Spree::Customers::Anonymize instead.'
400
+ )
399
401
 
400
402
  Spree.customer_anonymize_workflow.call(customer: self, store: Spree::Current.store).success?
401
403
  end
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  # Deprecation shim for the 6.0 user_id -> customer_id / belongs_to :user -> :customer
3
3
  # rename. Included by customer-facing models so `.user` / `.user_id` keep working
4
- # for one release. Remove in Spree 6.1.
4
+ # until Spree 6.3.
5
5
  module DeprecatedCustomerAlias
6
6
  extend ActiveSupport::Concern
7
7
 
@@ -10,12 +10,20 @@ module Spree
10
10
  end
11
11
 
12
12
  def user
13
- Spree::Deprecation.warn("#{self.class}#user is deprecated and will be removed in Spree 6.1. Use #customer instead.") if defined?(Spree::Deprecation)
13
+ if defined?(Spree::Deprecation)
14
+ Spree::Deprecation.warn(
15
+ "#{self.class}#user is deprecated and will be removed in Spree 6.3. Use #customer instead."
16
+ )
17
+ end
14
18
  customer
15
19
  end
16
20
 
17
21
  def user=(value)
18
- Spree::Deprecation.warn("#{self.class}#user= is deprecated and will be removed in Spree 6.1. Use #customer= instead.") if defined?(Spree::Deprecation)
22
+ if defined?(Spree::Deprecation)
23
+ Spree::Deprecation.warn(
24
+ "#{self.class}#user= is deprecated and will be removed in Spree 6.3. Use #customer= instead."
25
+ )
26
+ end
19
27
  self.customer = value
20
28
  end
21
29
  end
@@ -11,7 +11,7 @@ module Spree
11
11
  #
12
12
  # Rows created before 6.0 keep their stored number, so gateway references
13
13
  # and packing slips already in the wild still resolve. New rows never write
14
- # the column — it is frozen legacy data awaiting the 6.1 drop.
14
+ # the column — it is frozen legacy data awaiting the 6.3 drop.
15
15
  module DerivedNumber
16
16
  extend ActiveSupport::Concern
17
17
 
@@ -22,19 +22,21 @@ module Spree
22
22
  [namespace, key]
23
23
  end
24
24
 
25
- # Deprecated 6.0 names, removed in 6.1.
25
+ # Deprecated 6.0 names, removed in 6.3.
26
26
  def ensure_metafield_definition_exists!(key_with_namespace, store: Spree::Current.store)
27
- Spree::Deprecation.warn('ensure_metafield_definition_exists! is deprecated and will be removed in Spree 6.1. Use ensure_custom_field_definition_exists! instead.')
27
+ Spree::Deprecation.warn(
28
+ 'ensure_metafield_definition_exists! is deprecated and will be removed in Spree 6.3. Use ensure_custom_field_definition_exists! instead.'
29
+ )
28
30
  ensure_custom_field_definition_exists!(key_with_namespace, store: store)
29
31
  end
30
32
 
31
33
  def with_metafield_key(key_with_namespace)
32
- Spree::Deprecation.warn('.with_metafield_key is deprecated and will be removed in Spree 6.1. Use .with_custom_field_key instead.')
34
+ Spree::Deprecation.warn('.with_metafield_key is deprecated and will be removed in Spree 6.3. Use .with_custom_field_key instead.')
33
35
  with_custom_field_key(key_with_namespace)
34
36
  end
35
37
 
36
38
  def with_metafield_key_value(key_with_namespace, value)
37
- Spree::Deprecation.warn('.with_metafield_key_value is deprecated and will be removed in Spree 6.1. Use .with_custom_field_key_value instead.')
39
+ Spree::Deprecation.warn('.with_metafield_key_value is deprecated and will be removed in Spree 6.3. Use .with_custom_field_key_value instead.')
38
40
  with_custom_field_key_value(key_with_namespace, value)
39
41
  end
40
42
  end
@@ -46,7 +48,7 @@ module Spree
46
48
  has_many :custom_fields, -> { includes(:custom_field_definition) }, as: :resource, inverse_of: :resource, class_name: 'Spree::CustomField', dependent: :destroy
47
49
  has_many :storefront_custom_fields, -> { includes(:custom_field_definition).storefront_visible }, as: :resource, class_name: 'Spree::CustomField'
48
50
 
49
- # Deprecated 6.0 association names, removed in 6.1. `private_metafields`
51
+ # Deprecated 6.0 association names, removed in 6.3. `private_metafields`
50
52
  # has no replacement — read `custom_fields` and filter, or query
51
53
  # Spree::CustomField.admin_only directly.
52
54
  has_many :metafields, -> { includes(:custom_field_definition) }, as: :resource, class_name: 'Spree::CustomField', deprecated: true
@@ -170,26 +172,26 @@ module Spree
170
172
  custom_fields.with_key(namespace, key).exists?
171
173
  end
172
174
 
173
- # Deprecated 6.0 names, removed in 6.1.
175
+ # Deprecated 6.0 names, removed in 6.3.
174
176
  def set_metafield(definition_or_key, value)
175
- Spree::Deprecation.warn('#set_metafield is deprecated and will be removed in Spree 6.1. Use #set_custom_field instead.')
177
+ Spree::Deprecation.warn('#set_metafield is deprecated and will be removed in Spree 6.3. Use #set_custom_field instead.')
176
178
  set_custom_field(definition_or_key, value)
177
179
  end
178
180
 
179
181
  def get_metafield(key_with_namespace)
180
- Spree::Deprecation.warn('#get_metafield is deprecated and will be removed in Spree 6.1. Use #get_custom_field instead.')
182
+ Spree::Deprecation.warn('#get_metafield is deprecated and will be removed in Spree 6.3. Use #get_custom_field instead.')
181
183
  get_custom_field(key_with_namespace)
182
184
  end
183
185
 
184
186
  def has_metafield?(key_with_namespace)
185
- Spree::Deprecation.warn('#has_metafield? is deprecated and will be removed in Spree 6.1. Use #has_custom_field? instead.')
187
+ Spree::Deprecation.warn('#has_metafield? is deprecated and will be removed in Spree 6.3. Use #has_custom_field? instead.')
186
188
  has_custom_field?(key_with_namespace)
187
189
  end
188
190
 
189
191
  # Legacy payloads key the definition as `metafield_definition_id`, which
190
192
  # the new writer rejects — translate rather than silently dropping them.
191
193
  def metafields_attributes=(attributes)
192
- Spree::Deprecation.warn('#metafields_attributes= is deprecated and will be removed in Spree 6.1. Use #custom_fields_attributes= instead.')
194
+ Spree::Deprecation.warn('#metafields_attributes= is deprecated and will be removed in Spree 6.3. Use #custom_fields_attributes= instead.')
193
195
 
194
196
  attributes = attributes.values if attributes.is_a?(Hash)
195
197
  translated = attributes.map do |attrs|
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- # @deprecated Use {Spree::Current.integrations}; removed in Spree 6.1.
2
+ # @deprecated Use {Spree::Current.integrations}; removed in Spree 6.3.
3
3
  #
4
4
  # Nothing in Spree calls these — the per-request integration set lives on
5
5
  # {Spree::Current} — but the concern sits on Spree::Base, so every model has
@@ -7,7 +7,8 @@ module Spree
7
7
  module IntegrationsConcern
8
8
  def store_integrations
9
9
  Spree::Deprecation.warn(
10
- 'Spree::IntegrationsConcern#store_integrations is deprecated and will be removed in Spree 6.1. ' 'Use Spree::Current.integrations instead.'
10
+ 'Spree::IntegrationsConcern#store_integrations is deprecated and will be removed in Spree 6.3. ' \
11
+ 'Use Spree::Current.integrations instead.'
11
12
  )
12
13
 
13
14
  Spree::Current.integrations
@@ -15,7 +16,8 @@ module Spree
15
16
 
16
17
  def store_integration(name)
17
18
  Spree::Deprecation.warn(
18
- 'Spree::IntegrationsConcern#store_integration is deprecated and will be removed in Spree 6.1. ' 'Use Spree::Current.integrations.find { |integration| integration.type.to_s.demodulize.underscore == name } instead.'
19
+ 'Spree::IntegrationsConcern#store_integration is deprecated and will be removed in Spree 6.3. ' \
20
+ 'Use Spree::Current.integrations.find { |integration| integration.type.to_s.demodulize.underscore == name } instead.'
19
21
  )
20
22
 
21
23
  Spree::Current.integrations.find { |integration| integration.type.to_s.demodulize.underscore == name }
@@ -16,7 +16,7 @@ module Spree
16
16
  end
17
17
  end
18
18
 
19
- # @deprecated The column is +label+ since 6.0; removed in 6.1.
19
+ # @deprecated The column is +label+ since 6.0; removed in 6.3.
20
20
  #
21
21
  # Unlike the attribute aliases the other 6.0 renames use, this is a plain
22
22
  # method — Mobility owns +label+, so it cannot be an alias_attribute. It
@@ -24,13 +24,13 @@ module Spree
24
24
  # and +find_by(presentation:)+ name a column that no longer exists and
25
25
  # raise. Query by +label+.
26
26
  def presentation(*args, **kwargs)
27
- Spree::Deprecation.warn("#{self.class.name}#presentation is deprecated and will be removed in Spree 6.1. Use #label instead.")
27
+ Spree::Deprecation.warn("#{self.class.name}#presentation is deprecated and will be removed in Spree 6.3. Use #label instead.")
28
28
  label(*args, **kwargs)
29
29
  end
30
30
 
31
- # @deprecated See {#presentation}; removed in 6.1.
31
+ # @deprecated See {#presentation}; removed in 6.3.
32
32
  def presentation=(value)
33
- Spree::Deprecation.warn("#{self.class.name}#presentation= is deprecated and will be removed in Spree 6.1. Use #label= instead.")
33
+ Spree::Deprecation.warn("#{self.class.name}#presentation= is deprecated and will be removed in Spree 6.3. Use #label= instead.")
34
34
  self.label = value
35
35
  end
36
36
  end
@@ -11,7 +11,7 @@ module Spree
11
11
  serialize :metadata, coder: HashSerializer
12
12
  end
13
13
 
14
- # Deprecated alias for the renamed `metadata` column. Removed in Spree 6.1.
14
+ # Deprecated alias for the renamed `metadata` column. Removed in Spree 6.3.
15
15
  #
16
16
  # Only the reader and writer are bridged. The column is gone, so the attribute
17
17
  # methods Active Record generated alongside it — `private_metadata?`,
@@ -19,12 +19,12 @@ module Spree
19
19
  # `private_metadata_before_type_cast` and the rest of the dirty-tracking family
20
20
  # — no longer exist and raise NoMethodError. Call the `metadata` equivalents.
21
21
  def private_metadata
22
- Spree::Deprecation.warn('private_metadata is deprecated and will be removed in Spree 6.1. Use metadata instead.')
22
+ Spree::Deprecation.warn('private_metadata is deprecated and will be removed in Spree 6.3. Use metadata instead.')
23
23
  metadata
24
24
  end
25
25
 
26
26
  def private_metadata=(value)
27
- Spree::Deprecation.warn('private_metadata= is deprecated and will be removed in Spree 6.1. Use metadata= instead.')
27
+ Spree::Deprecation.warn('private_metadata= is deprecated and will be removed in Spree 6.3. Use metadata= instead.')
28
28
  self.metadata = value
29
29
  end
30
30
 
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::PresentationTranslatable, renamed to
3
3
  # Spree::LabelTranslatable in 6.0 along with the column it wrapped.
4
- # Remove in 6.1.
4
+ # Remove in 6.3.
5
5
  PresentationTranslatable = LabelTranslatable
6
6
  end
@@ -7,7 +7,7 @@ module Spree
7
7
  # of checkout addresses to the customer's defaults, and the ship→bill cloning
8
8
  # predicate. The shipping address is canonical: use_shipping copies it
9
9
  # onto the billing address; the reverse use_billing direction is a
10
- # deprecated 6.1-removal bridge. Clone callbacks are wired per model.
10
+ # deprecated 6.3-removal bridge. Clone callbacks are wired per model.
11
11
  module Addresses
12
12
  extend ActiveSupport::Concern
13
13
 
@@ -85,13 +85,16 @@ module Spree
85
85
  end
86
86
 
87
87
  # @deprecated The shipping address is canonical — use +use_shipping+ to
88
- # copy it onto the billing address. Removed in 6.1.
88
+ # copy it onto the billing address. Removed in 6.3.
89
89
  def use_billing=(value)
90
- Spree::Deprecation.warn('use_billing is deprecated and will be removed in Spree 6.1. The shipping address comes first — use use_shipping to copy it onto the billing address.')
90
+ Spree::Deprecation.warn(
91
+ 'use_billing is deprecated and will be removed in Spree 6.3. ' \
92
+ 'The shipping address comes first — use use_shipping to copy it onto the billing address.'
93
+ )
91
94
  @use_billing = value
92
95
  end
93
96
 
94
- # @deprecated See {#use_billing=}; removed in 6.1.
97
+ # @deprecated See {#use_billing=}; removed in 6.3.
95
98
  # @return [Boolean]
96
99
  def use_billing?
97
100
  use_billing.in?([true, 'true', '1'])
@@ -194,7 +197,7 @@ module Spree
194
197
  # customer's default ship address.
195
198
  #
196
199
  # @deprecated The shipping address is canonical (see {#use_billing=});
197
- # removed in 6.1 together with the use_billing bridge.
200
+ # removed in 6.3 together with the use_billing bridge.
198
201
  # @return [true]
199
202
  def clone_billing_address
200
203
  self.ship_address = bill_address if bill_address
@@ -4,7 +4,7 @@ module Spree
4
4
  # {Spree::Cart} and {Spree::Order}. Before 6.0 a cart was an incomplete
5
5
  # order, so extensions written against 5.x (payment gateways, checkout
6
6
  # plugins) call the legacy names on carts too. Every legacy name warns and
7
- # forwards to its replacement. Removed in 6.1.
7
+ # forwards to its replacement. Removed in 6.3.
8
8
  #
9
9
  # Renamed columns are also registered with +alias_attribute+, so the legacy
10
10
  # name keeps working in +where+ / +find_by+ (those paths do not warn).
@@ -80,7 +80,7 @@ module Spree
80
80
  private
81
81
 
82
82
  def warn_deprecated_name(legacy_name, current_name)
83
- Spree::Deprecation.warn("#{self.class.name}##{legacy_name} is deprecated and will be removed in Spree 6.1. Use ##{current_name} instead.")
83
+ Spree::Deprecation.warn("#{self.class.name}##{legacy_name} is deprecated and will be removed in Spree 6.3. Use ##{current_name} instead.")
84
84
  end
85
85
  end
86
86
  end
@@ -34,9 +34,11 @@ module Spree
34
34
  end
35
35
  end
36
36
 
37
- # @deprecated Use +default_country_code+. Removed in 6.1.
37
+ # @deprecated Use +default_country_code+. Removed in 6.3.
38
38
  def default_country_iso_code
39
- Spree::Deprecation.warn('Spree::Store#default_country_iso_code is deprecated, use #default_country_code instead')
39
+ Spree::Deprecation.warn(
40
+ 'Spree::Store#default_country_iso_code is deprecated and will be removed in Spree 6.3. Use #default_country_code instead.'
41
+ )
40
42
  default_country_code
41
43
  end
42
44
 
@@ -31,9 +31,12 @@ module Spree
31
31
  # it accepts to the customer's defaults on its own (see
32
32
  # Spree::Purchase::Addresses), and a guest who registers after placing
33
33
  # an order has that order's addresses adopted by Spree::Customers::Create.
34
- # Removed in Spree 6.1.
34
+ # Removed in Spree 6.3.
35
35
  def persist_order_address(order)
36
- Spree::Deprecation.warn('Spree::UserAddress#persist_order_address is deprecated and will be removed in Spree 6.1. Checkout already promotes the addresses it accepts to the customer\'s defaults.')
36
+ Spree::Deprecation.warn(
37
+ 'Spree::UserAddress#persist_order_address is deprecated and will be removed in Spree 6.3. ' \
38
+ "Checkout already promotes the addresses it accepts to the customer's defaults."
39
+ )
37
40
 
38
41
  # FIXME: we should check if the User's address is associated with country accepted by Store
39
42
  # if not we should try to find an address with valid country in User's address book
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  # Deprecation alias for Spree::CustomerMethods, renamed from Spree::UserMethods in 6.0.
3
3
  # True constant alias — the underlying module, its associations, and prefix (cust)
4
- # are all Spree::CustomerMethods. Remove in Spree 6.1.
4
+ # are all Spree::CustomerMethods. Remove in Spree 6.3.
5
5
  UserMethods = CustomerMethods
6
- Spree::Deprecation.warn('Spree::UserMethods is deprecated and will be removed in Spree 6.1. Use Spree::CustomerMethods instead.')
6
+ Spree::Deprecation.warn('Spree::UserMethods is deprecated and will be removed in Spree 6.3. Use Spree::CustomerMethods instead.')
7
7
  end
@@ -65,7 +65,7 @@ module Spree
65
65
 
66
66
  # @deprecated The canonical names are +country_code+ and +state_code+,
67
67
  # matching the tax tables. Kept because the Store API shipped
68
- # +country_iso+ and +state_abbr+; both are removed in 6.1.
68
+ # +country_iso+ and +state_abbr+; both are removed in 6.3.
69
69
  alias_attribute :state_abbr, :state_code
70
70
  alias_attribute :country_iso, :country_code
71
71
 
@@ -133,9 +133,9 @@ module Spree
133
133
  value.to_s.gsub(/[\s-]/, '').upcase
134
134
  end
135
135
 
136
- # @deprecated Use {.normalize_postal_code}; removed in 6.1.
136
+ # @deprecated Use {.normalize_postal_code}; removed in 6.3.
137
137
  def self.normalize_zipcode(value)
138
- Spree::Deprecation.warn('Spree::Address.normalize_zipcode is deprecated and will be removed in Spree 6.1. Use .normalize_postal_code instead.')
138
+ Spree::Deprecation.warn('Spree::Address.normalize_zipcode is deprecated and will be removed in Spree 6.3. Use .normalize_postal_code instead.')
139
139
  normalize_postal_code(value)
140
140
  end
141
141
 
@@ -144,9 +144,11 @@ module Spree
144
144
  self.class.normalize_postal_code(postal_code)
145
145
  end
146
146
 
147
- # @deprecated Use {#normalized_postal_code}; removed in 6.1.
147
+ # @deprecated Use {#normalized_postal_code}; removed in 6.3.
148
148
  def normalized_zipcode
149
- Spree::Deprecation.warn('Spree::Address#normalized_zipcode is deprecated and will be removed in Spree 6.1. Use #normalized_postal_code instead.')
149
+ Spree::Deprecation.warn(
150
+ 'Spree::Address#normalized_zipcode is deprecated and will be removed in Spree 6.3. Use #normalized_postal_code instead.'
151
+ )
150
152
  normalized_postal_code
151
153
  end
152
154
 
@@ -166,7 +168,7 @@ module Spree
166
168
  params.delete(:country_id)
167
169
  params.delete(:state_id)
168
170
 
169
- # Legacy write names accepted until 6.1; the columns are country_code
171
+ # Legacy write names accepted until 6.5; the columns are country_code
170
172
  # and state_code. The renamed name and postal-code columns need no entry
171
173
  # here — alias_attribute resolves those inside `where` too, while these
172
174
  # two are not attribute aliases.
@@ -239,19 +241,31 @@ module Spree
239
241
 
240
242
  # @deprecated The address's owner may be a customer, a company node or a
241
243
  # seller, so {#owner} replaces the customer-only association. Removed in
242
- # Spree 6.1.
244
+ # Spree 6.3.
243
245
  def user
244
- Spree::Deprecation.warn('Spree::Address#user is deprecated and will be removed in Spree 6.1. Use #owner instead.') if defined?(Spree::Deprecation)
246
+ if defined?(Spree::Deprecation)
247
+ Spree::Deprecation.warn(
248
+ 'Spree::Address#user is deprecated and will be removed in Spree 6.3. Use #owner instead.'
249
+ )
250
+ end
245
251
  customer_owner
246
252
  end
247
253
 
248
254
  def user=(value)
249
- Spree::Deprecation.warn('Spree::Address#user= is deprecated and will be removed in Spree 6.1. Use #owner= instead.') if defined?(Spree::Deprecation)
255
+ if defined?(Spree::Deprecation)
256
+ Spree::Deprecation.warn(
257
+ 'Spree::Address#user= is deprecated and will be removed in Spree 6.3. Use #owner= instead.'
258
+ )
259
+ end
250
260
  self.owner = value
251
261
  end
252
262
 
253
263
  def user_id
254
- Spree::Deprecation.warn('Spree::Address#user_id is deprecated and will be removed in Spree 6.1. Use #owner_id instead.') if defined?(Spree::Deprecation)
264
+ if defined?(Spree::Deprecation)
265
+ Spree::Deprecation.warn(
266
+ 'Spree::Address#user_id is deprecated and will be removed in Spree 6.3. Use #owner_id instead.'
267
+ )
268
+ end
255
269
  owner_id if customer_owned?
256
270
  end
257
271
 
@@ -322,11 +336,12 @@ module Spree
322
336
  # @deprecated Overriding Ruby's +Object#clone+ was a mistake: this returns
323
337
  # a value copy with the owner, label and metadata stripped, which is not
324
338
  # what +clone+ means anywhere else in Ruby. The override is removed in
325
- # Spree 6.1 and +clone+ becomes the standard shallow copy. Use
339
+ # Spree 6.3 and +clone+ becomes the standard shallow copy. Use
326
340
  # {#snapshot} for the ownerless copy a purchase keeps.
327
341
  def clone
328
342
  Spree::Deprecation.warn(
329
- 'Spree::Address#clone is deprecated. From Spree 6.1 it behaves as the standard Ruby Object#clone — a shallow copy keeping the owner and every other attribute. Use #snapshot for the ownerless copy a purchase keeps.'
343
+ 'Spree::Address#clone is deprecated. From Spree 6.3 it behaves as the standard Ruby Object#clone — ' \
344
+ 'a shallow copy keeping the owner and every other attribute. Use #snapshot for the ownerless copy a purchase keeps.'
330
345
  )
331
346
 
332
347
  self.class.new(value_attributes)
@@ -431,7 +446,7 @@ module Spree
431
446
  require_zipcode?
432
447
  end
433
448
 
434
- # @deprecated Override {#require_postal_code?}; removed in 6.1.
449
+ # @deprecated Override {#require_postal_code?}; removed in 6.3.
435
450
  def require_zipcode?
436
451
  !quick_checkout && (country ? country.zipcode_required? : true)
437
452
  end
@@ -519,7 +534,7 @@ module Spree
519
534
  end
520
535
 
521
536
  # The ISO code is what the address stores; the association is kept in step
522
- # with it for the one release it still exists. Assigning +country+ directly
537
+ # with it until 6.3 removes it. Assigning +country+ directly
523
538
  # is equally supported — whichever half was set fills in the other.
524
539
  def normalize_country
525
540
  submitted_iso = self[:country_code].presence
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Spree
4
4
  # Deprecation alias for Spree::Media, renamed from Spree::Asset in 6.0.
5
- # Retained for one release so existing code and extensions that reference
5
+ # Retained until 6.3 so existing code and extensions that reference
6
6
  # Spree::Asset keep working; the canonical class is Spree::Media. Removed in
7
- # 6.1, together with Spree::Image (which this replaces).
7
+ # 6.3, together with Spree::Image (which this replaces).
8
8
  #
9
9
  # This is a true constant alias — the underlying class, table (spree_media)
10
10
  # and prefix (media) are all Spree::Media. Only the constant differs, so
@@ -12,5 +12,5 @@ module Spree
12
12
  # resolving to Spree::Media.
13
13
  Asset = Media
14
14
 
15
- Spree::Deprecation.warn('Spree::Asset is deprecated and will be removed in Spree 6.1. Use Spree::Media instead.')
15
+ Spree::Deprecation.warn('Spree::Asset is deprecated and will be removed in Spree 6.3. Use Spree::Media instead.')
16
16
  end
@@ -306,7 +306,7 @@ class Spree::Base < ApplicationRecord
306
306
 
307
307
  # @deprecated Legacy Tom Select helper for the removed Rails admin. No replacement.
308
308
  def self.to_tom_select_json
309
- Spree::Deprecation.warn('Spree::Base.to_tom_select_json is deprecated and will be removed in Spree 6.1.')
309
+ Spree::Deprecation.warn('Spree::Base.to_tom_select_json is deprecated and will be removed in Spree 6.3.')
310
310
 
311
311
  pluck(:name, :id).map do |name, id|
312
312
  {
@@ -11,11 +11,13 @@ module Spree
11
11
  # currency so upgraded stores quote unchanged.
12
12
  preference :currency, :string, format: :currency, default: -> { Spree::Store.default.default_currency }
13
13
 
14
- preference :minimum_item_total, :money, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
15
- preference :maximum_item_total, :money, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
14
+ RULE_DEPRECATION = 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.3.'.freeze
16
15
 
17
- preference :minimum_weight, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
18
- preference :maximum_weight, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
16
+ preference :minimum_item_total, :money, default: nil, nullable: true, deprecated: RULE_DEPRECATION
17
+ preference :maximum_item_total, :money, default: nil, nullable: true, deprecated: RULE_DEPRECATION
18
+
19
+ preference :minimum_weight, :decimal, default: nil, nullable: true, deprecated: RULE_DEPRECATION
20
+ preference :maximum_weight, :decimal, default: nil, nullable: true, deprecated: RULE_DEPRECATION
19
21
 
20
22
  def self.description
21
23
  I18n.t('spree.shipping_flat_rate_per_order')