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
@@ -4,7 +4,7 @@ module Spree
4
4
  class StockLevel < Spree.base_class
5
5
  # Dual-emits the pre-6.0 `stock_item.*` lifecycle events beside the
6
6
  # `stock_level.*` ones, so a webhook endpoint a merchant configured against
7
- # the old names keeps receiving deliveries for one release. Removed in 6.1,
7
+ # the old names keeps receiving deliveries. Removed in 6.5,
8
8
  # the same way {Spree::Fulfillment::CustomEvents} carries `shipment.*`.
9
9
  #
10
10
  # The twins are written here rather than as an option on
@@ -7,7 +7,7 @@ module Spree
7
7
  include Spree::HasCustomFields
8
8
  include Spree::Metadata
9
9
  include Spree::HasExternalReferences
10
- # Dual-emits the pre-rename `stock_item.*` names for one release.
10
+ # Dual-emits the pre-rename `stock_item.*` names until 6.5.
11
11
  include Spree::StockLevel::CustomEvents
12
12
 
13
13
  publishes_lifecycle_events
@@ -96,27 +96,31 @@ module Spree
96
96
  stock_levels.exists?(variant: variant)
97
97
  end
98
98
 
99
- # @deprecated Use {#stock_levels}; removed in 6.1.
99
+ # @deprecated Use {#stock_levels}; removed in 6.3.
100
100
  def stock_items
101
- Spree::Deprecation.warn('Spree::StockLocation#stock_items is deprecated and will be removed in Spree 6.1. Use #stock_levels instead.')
101
+ Spree::Deprecation.warn('Spree::StockLocation#stock_items is deprecated and will be removed in Spree 6.3. Use #stock_levels instead.')
102
102
  stock_levels
103
103
  end
104
104
 
105
- # @deprecated Use {#stock_level}; removed in 6.1.
105
+ # @deprecated Use {#stock_level}; removed in 6.3.
106
106
  def stock_item(variant_id)
107
- Spree::Deprecation.warn('Spree::StockLocation#stock_item is deprecated and will be removed in Spree 6.1. Use #stock_level instead.')
107
+ Spree::Deprecation.warn('Spree::StockLocation#stock_item is deprecated and will be removed in Spree 6.3. Use #stock_level instead.')
108
108
  stock_level(variant_id)
109
109
  end
110
110
 
111
- # @deprecated Use {#set_up_stock_level}; removed in 6.1.
111
+ # @deprecated Use {#set_up_stock_level}; removed in 6.3.
112
112
  def set_up_stock_item(variant)
113
- Spree::Deprecation.warn('Spree::StockLocation#set_up_stock_item is deprecated and will be removed in Spree 6.1. Use #set_up_stock_level instead.')
113
+ Spree::Deprecation.warn(
114
+ 'Spree::StockLocation#set_up_stock_item is deprecated and will be removed in Spree 6.3. Use #set_up_stock_level instead.'
115
+ )
114
116
  set_up_stock_level(variant)
115
117
  end
116
118
 
117
- # @deprecated Use {#stock_level_or_create}; removed in 6.1.
119
+ # @deprecated Use {#stock_level_or_create}; removed in 6.3.
118
120
  def stock_item_or_create(variant_or_variant_id)
119
- Spree::Deprecation.warn('Spree::StockLocation#stock_item_or_create is deprecated and will be removed in Spree 6.1. Use #stock_level_or_create instead.')
121
+ Spree::Deprecation.warn(
122
+ 'Spree::StockLocation#stock_item_or_create is deprecated and will be removed in Spree 6.3. Use #stock_level_or_create instead.'
123
+ )
120
124
  stock_level_or_create(variant_or_variant_id)
121
125
  end
122
126
 
@@ -21,7 +21,7 @@ module Spree
21
21
  # without this the default scope propagates into every join — taking the
22
22
  # history of those units out of `for_store` and out of the API with it.
23
23
  belongs_to :stock_level, -> { with_deleted }, class_name: 'Spree::StockLevel', inverse_of: :stock_movements
24
- # @deprecated Replaced by the concrete cause keys below; dropped in 6.1.
24
+ # @deprecated Replaced by the concrete cause keys below; dropped in 6.3.
25
25
  belongs_to :originator, polymorphic: true, optional: true
26
26
 
27
27
  # The cause. A fulfillment-driven row carries its order too, so "which
@@ -76,7 +76,7 @@ module Spree
76
76
  delegate :variant, :variant_id, to: :stock_level, allow_nil: true
77
77
  delegate :product, to: :variant
78
78
 
79
- # `stock_item_id` rides along for one release beside the name that replaced
79
+ # `stock_item_id` rides along until 6.5 beside the name that replaced
80
80
  # it: Ransack resolves attribute aliases, and dropping the old filter would
81
81
  # hand a client still sending it the whole collection rather than an error.
82
82
  self.whitelisted_ransackable_attributes = %w[quantity kind reason created_at stock_level_id
@@ -139,15 +139,15 @@ module Spree
139
139
  Spree::Money.new(unit_cost, currency: purchase_order&.currency)
140
140
  end
141
141
 
142
- # @deprecated Use {#stock_level}; removed in 6.1.
142
+ # @deprecated Use {#stock_level}; removed in 6.3.
143
143
  def stock_item
144
- Spree::Deprecation.warn('Spree::StockMovement#stock_item is deprecated and will be removed in Spree 6.1. Use #stock_level instead.')
144
+ Spree::Deprecation.warn('Spree::StockMovement#stock_item is deprecated and will be removed in Spree 6.3. Use #stock_level instead.')
145
145
  stock_level
146
146
  end
147
147
 
148
- # @deprecated Use {#stock_level=}; removed in 6.1.
148
+ # @deprecated Use {#stock_level=}; removed in 6.3.
149
149
  def stock_item=(record)
150
- Spree::Deprecation.warn('Spree::StockMovement#stock_item= is deprecated and will be removed in Spree 6.1. Use #stock_level= instead.')
150
+ Spree::Deprecation.warn('Spree::StockMovement#stock_item= is deprecated and will be removed in Spree 6.3. Use #stock_level= instead.')
151
151
  self.stock_level = record
152
152
  end
153
153
 
@@ -28,7 +28,7 @@ module Spree
28
28
  joins(:order).where(spree_orders: { store_id: store.id })
29
29
  }
30
30
 
31
- # `stock_item_id` rides along for one release beside the name that replaced
31
+ # `stock_item_id` rides along until 6.5 beside the name that replaced
32
32
  # it — see the same allowlist on Spree::StockMovement.
33
33
  self.whitelisted_ransackable_attributes = %w[stock_level_id stock_item_id line_item_id order_id
34
34
  quantity expires_at]
@@ -73,15 +73,15 @@ module Spree
73
73
  order || cart
74
74
  end
75
75
 
76
- # @deprecated Use {#stock_level}; removed in 6.1.
76
+ # @deprecated Use {#stock_level}; removed in 6.3.
77
77
  def stock_item
78
- Spree::Deprecation.warn('Spree::StockReservation#stock_item is deprecated and will be removed in Spree 6.1. Use #stock_level instead.')
78
+ Spree::Deprecation.warn('Spree::StockReservation#stock_item is deprecated and will be removed in Spree 6.3. Use #stock_level instead.')
79
79
  stock_level
80
80
  end
81
81
 
82
- # @deprecated Use {#stock_level=}; removed in 6.1.
82
+ # @deprecated Use {#stock_level=}; removed in 6.3.
83
83
  def stock_item=(record)
84
- Spree::Deprecation.warn('Spree::StockReservation#stock_item= is deprecated and will be removed in Spree 6.1. Use #stock_level= instead.')
84
+ Spree::Deprecation.warn('Spree::StockReservation#stock_item= is deprecated and will be removed in Spree 6.3. Use #stock_level= instead.')
85
85
  self.stock_level = record
86
86
  end
87
87
 
@@ -262,7 +262,7 @@ module Spree
262
262
  has_many :store_credits, class_name: 'Spree::StoreCredit'
263
263
  has_many :store_credit_events, through: :store_credits, class_name: 'Spree::StoreCreditEvent'
264
264
 
265
- # @deprecated Taxonomy is data-only in 6.0 and dropped in 6.1; use #categories.
265
+ # @deprecated Taxonomy is data-only in 6.0 and dropped in 6.3; use #categories.
266
266
  has_many :taxonomies, class_name: 'Spree::Taxonomy', deprecated: true
267
267
  has_many :categories, class_name: 'Spree::Category'
268
268
  has_many :collections, class_name: 'Spree::Collection', dependent: :destroy_async
@@ -276,20 +276,20 @@ module Spree
276
276
  has_many :custom_field_definitions, class_name: 'Spree::CustomFieldDefinition',
277
277
  inverse_of: :store, dependent: :destroy_async
278
278
 
279
- # @deprecated Use #categories; removed in 6.1.
279
+ # @deprecated Use #categories; removed in 6.3.
280
280
  def taxons
281
- Spree::Deprecation.warn('Spree::Store#taxons is deprecated and will be removed in Spree 6.1. Use #categories instead.')
281
+ Spree::Deprecation.warn('Spree::Store#taxons is deprecated and will be removed in Spree 6.3. Use #categories instead.')
282
282
  categories
283
283
  end
284
284
 
285
285
  def taxons=(value)
286
- Spree::Deprecation.warn('Spree::Store#taxons= is deprecated and will be removed in Spree 6.1. Use #categories= instead.')
286
+ Spree::Deprecation.warn('Spree::Store#taxons= is deprecated and will be removed in Spree 6.3. Use #categories= instead.')
287
287
  self.categories = value
288
288
  end
289
289
 
290
- # @deprecated Use {#stock_levels}; removed in 6.1.
290
+ # @deprecated Use {#stock_levels}; removed in 6.3.
291
291
  def stock_items
292
- Spree::Deprecation.warn('Spree::Store#stock_items is deprecated and will be removed in Spree 6.1. Use #stock_levels instead.')
292
+ Spree::Deprecation.warn('Spree::Store#stock_items is deprecated and will be removed in Spree 6.3. Use #stock_levels instead.')
293
293
  stock_levels
294
294
  end
295
295
 
@@ -414,6 +414,26 @@ module Spree
414
414
  validate :order_number_sequence_start_unchanged_after_first_number, on: :update
415
415
  validates :mail_from_address, email: { allow_blank: false }
416
416
  validates :customer_support_email, email: { allow_blank: true }
417
+ # Storefronts render these as links, so only a handle, a scheme-less address
418
+ # or an http(s) URL is accepted, never another scheme, a space or an invisible
419
+ # character. Ruby's \s is ASCII-only, hence the Unicode classes.
420
+ # Checked only when the value changes, so a value saved before this rule
421
+ # does not block saving the store's other settings.
422
+ SOCIAL_FIELDS = %i[facebook twitter instagram].freeze
423
+ SOCIAL_FIELD_FORMAT = %r{
424
+ \A(?!(?:.*/)?\.\.(?:/|\z)) # no ".." path segment
425
+ (?:
426
+ https?://[\p{L}\p{N}.-]+(?::\d{1,5})? # a web address: a host (no userinfo) and an optional port
427
+ (?:[/?\#][^[:space:][:cntrl:]\p{Cf}]*)? # then a path, query or fragment
428
+ | (?://[\p{L}\p{N}.-]+(?::\d{1,5})? # a protocol-relative host, where a port is unambiguous
429
+ | @?[\p{L}\p{N}_.-]*[\p{L}\p{N}_][\p{L}\p{N}_.-]*) # or a handle or bare host, never "name:"
430
+ (?:/[^[:space:][:cntrl:]\p{Cf}]*)? # and an optional path
431
+ )\z
432
+ }xi
433
+ normalizes(*SOCIAL_FIELDS, with: ->(value) { value.strip.presence })
434
+ SOCIAL_FIELDS.each do |field|
435
+ validates field, format: { with: SOCIAL_FIELD_FORMAT }, allow_blank: true, if: :"will_save_change_to_#{field}?"
436
+ end
417
437
  # FIXME: we should remove this condition in v5
418
438
  if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
419
439
  connected? &&
@@ -499,9 +519,11 @@ module Spree
499
519
  @default_country_for_market = country
500
520
  end
501
521
 
502
- # @deprecated Use +default_country_code=+. Removed in 6.1.
522
+ # @deprecated Use +default_country_code=+. Removed in 6.3.
503
523
  def default_country_iso=(code)
504
- Spree::Deprecation.warn('Spree::Store#default_country_iso= is deprecated, use #default_country_code= instead')
524
+ Spree::Deprecation.warn(
525
+ 'Spree::Store#default_country_iso= is deprecated and will be removed in Spree 6.3. Use #default_country_code= instead.'
526
+ )
505
527
  self.default_country_code = code
506
528
  end
507
529
 
@@ -713,15 +735,15 @@ module Spree
713
735
  preferred_capture_method.presence || Spree::CaptureMethod::DEFAULT_CAPTURE_METHOD
714
736
  end
715
737
 
716
- # @deprecated Use #preferred_capture_method; removed in 6.1.
738
+ # @deprecated Use #preferred_capture_method; removed in 6.3.
717
739
  def preferred_auto_capture
718
- Spree::Deprecation.warn('Store#preferred_auto_capture is deprecated and will be removed in Spree 6.1. Use #preferred_capture_method instead.')
740
+ Spree::Deprecation.warn('Store#preferred_auto_capture is deprecated and will be removed in Spree 6.3. Use #preferred_capture_method instead.')
719
741
  capture_at_checkout?
720
742
  end
721
743
 
722
- # @deprecated Use #preferred_capture_method=; removed in 6.1.
744
+ # @deprecated Use #preferred_capture_method=; removed in 6.3.
723
745
  def preferred_auto_capture=(value)
724
- Spree::Deprecation.warn('Store#preferred_auto_capture= is deprecated and will be removed in Spree 6.1. Use #preferred_capture_method= instead.')
746
+ Spree::Deprecation.warn('Store#preferred_auto_capture= is deprecated and will be removed in Spree 6.3. Use #preferred_capture_method= instead.')
725
747
  # Turning it off only says "not at checkout" — it cannot distinguish
726
748
  # dispatch from manual, so an existing on_dispatch choice is preserved.
727
749
  self.preferred_capture_method = if value.to_b
@@ -733,15 +755,19 @@ module Spree
733
755
  end
734
756
  end
735
757
 
736
- # @deprecated Use #preferred_capture_method; removed in 6.1.
758
+ # @deprecated Use #preferred_capture_method; removed in 6.3.
737
759
  def preferred_auto_capture_on_dispatch
738
- Spree::Deprecation.warn('Store#preferred_auto_capture_on_dispatch is deprecated and will be removed in Spree 6.1. Use #preferred_capture_method instead.')
760
+ Spree::Deprecation.warn(
761
+ 'Store#preferred_auto_capture_on_dispatch is deprecated and will be removed in Spree 6.3. Use #preferred_capture_method instead.'
762
+ )
739
763
  capture_on_dispatch?
740
764
  end
741
765
 
742
- # @deprecated Use #preferred_capture_method=; removed in 6.1.
766
+ # @deprecated Use #preferred_capture_method=; removed in 6.3.
743
767
  def preferred_auto_capture_on_dispatch=(value)
744
- Spree::Deprecation.warn('Store#preferred_auto_capture_on_dispatch= is deprecated and will be removed in Spree 6.1. Use #preferred_capture_method= instead.')
768
+ Spree::Deprecation.warn(
769
+ 'Store#preferred_auto_capture_on_dispatch= is deprecated and will be removed in Spree 6.3. Use #preferred_capture_method= instead.'
770
+ )
745
771
  self.preferred_capture_method = if value.to_b
746
772
  'on_dispatch'
747
773
  elsif capture_on_dispatch?
@@ -43,9 +43,9 @@ module Spree
43
43
 
44
44
  # Redemption order: the oldest credit is spent first.
45
45
  scope :oldest_first, -> { order(:created_at, :id) }
46
- # @deprecated Removed in Spree 6.1 — store credit types are gone; use {.oldest_first}.
46
+ # @deprecated Removed in Spree 6.3 — store credit types are gone; use {.oldest_first}.
47
47
  scope :order_by_priority, lambda {
48
- Spree::Deprecation.warn('Spree::StoreCredit.order_by_priority is deprecated and will be removed in Spree 6.1. Use .oldest_first instead.')
48
+ Spree::Deprecation.warn('Spree::StoreCredit.order_by_priority is deprecated and will be removed in Spree 6.3. Use .oldest_first instead.')
49
49
  oldest_first
50
50
  }
51
51
 
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- # @deprecated Removed in Spree 6.1 together with its table. Store credit no
2
+ # @deprecated Removed in Spree 6.3 together with its table. Store credit no
3
3
  # longer carries a category — the reason a credit exists lives in
4
4
  # {Spree::StoreCredit#originator} (the return, exchange, claim or gift
5
5
  # card that issued it) and in its free-text +memo+. The class stays only
@@ -12,22 +12,22 @@ module Spree
12
12
  DEFAULT_NON_EXPIRING_TYPES = [GIFT_CARD_CATEGORY_NAME]
13
13
 
14
14
  after_initialize do
15
- Spree::Deprecation.warn('Spree::StoreCreditCategory is deprecated and will be removed in Spree 6.1. ' \
15
+ Spree::Deprecation.warn('Spree::StoreCreditCategory is deprecated and will be removed in Spree 6.3. ' \
16
16
  'Store credits no longer carry a category — use StoreCredit#originator and #memo instead.')
17
17
  end
18
18
 
19
19
  class << self
20
- # @deprecated Removed in Spree 6.1. Refund workflows no longer set a
20
+ # @deprecated Removed in Spree 6.3. Refund workflows no longer set a
21
21
  # category on the store credit they issue.
22
22
  def default_refund_category(_options = {})
23
- Spree::Deprecation.warn('Spree::StoreCreditCategory.default_refund_category is deprecated and will be removed in Spree 6.1. ' \
23
+ Spree::Deprecation.warn('Spree::StoreCreditCategory.default_refund_category is deprecated and will be removed in Spree 6.3. ' \
24
24
  'Store credits no longer carry a category.')
25
25
  first
26
26
  end
27
27
 
28
28
  # @deprecated use {.default_refund_category}
29
29
  def default_reimbursement_category(options = {})
30
- Spree::Deprecation.warn('Spree::StoreCreditCategory.default_reimbursement_category is deprecated and will be removed in Spree 6.1. ' \
30
+ Spree::Deprecation.warn('Spree::StoreCreditCategory.default_reimbursement_category is deprecated and will be removed in Spree 6.3. ' \
31
31
  'Store credits no longer carry a category.')
32
32
  default_refund_category(options)
33
33
  end
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- # @deprecated Removed in Spree 6.1 together with its table. Nothing in Spree
2
+ # @deprecated Removed in Spree 6.3 together with its table. Nothing in Spree
3
3
  # ever created a store credit type, so the +priority+ it was meant to
4
4
  # provide never drove redemption order; store credits are now spent
5
5
  # oldest first ({Spree::StoreCredit.oldest_first}). The class stays only so
@@ -11,7 +11,7 @@ module Spree
11
11
  DEFAULT_TYPE_NAME = 'Expiring'.freeze
12
12
 
13
13
  after_initialize do
14
- Spree::Deprecation.warn('Spree::StoreCreditType is deprecated and will be removed in Spree 6.1. ' \
14
+ Spree::Deprecation.warn('Spree::StoreCreditType is deprecated and will be removed in Spree 6.3. ' \
15
15
  'Store credits are spent oldest first — see Spree::StoreCredit.oldest_first.')
16
16
  end
17
17
  end
@@ -11,7 +11,7 @@ module Spree
11
11
  # class OrderCompletedNotifier < Spree::Subscriber
12
12
  # subscribes_to 'order.placed'
13
13
  #
14
- # def call(event)
14
+ # def handle(event)
15
15
  # order_id = event.payload['id']
16
16
  # Spree::OrderMailer.confirm_email(order_id).deliver_later
17
17
  # end
@@ -21,7 +21,7 @@ module Spree
21
21
  # class OrderAuditLogger < Spree::Subscriber
22
22
  # subscribes_to 'order.placed', 'order.canceled'
23
23
  #
24
- # def call(event)
24
+ # def handle(event)
25
25
  # AuditLog.create!(
26
26
  # event_name: event.name,
27
27
  # payload: event.payload,
@@ -34,7 +34,7 @@ module Spree
34
34
  # class OrderEventLogger < Spree::Subscriber
35
35
  # subscribes_to 'order.*'
36
36
  #
37
- # def call(event)
37
+ # def handle(event)
38
38
  # Rails.logger.info("Order event: #{event.name}")
39
39
  # end
40
40
  # end
@@ -66,7 +66,7 @@ module Spree
66
66
  # class CriticalOrderHandler < Spree::Subscriber
67
67
  # subscribes_to 'order.placed', async: false
68
68
  #
69
- # def call(event)
69
+ # def handle(event)
70
70
  # # This runs synchronously
71
71
  # end
72
72
  # end
@@ -141,9 +141,9 @@ module Spree
141
141
 
142
142
  # Handle an event
143
143
  #
144
- # Override this method in subclasses to handle events.
145
- # If you've defined event handlers with `on`, this method
146
- # will route to the appropriate handler automatically.
144
+ # Routes the event to the handler named with `on`, or to #handle.
145
+ # Subclasses implement #handle; overriding this method skips the
146
+ # `on` routing.
147
147
  #
148
148
  # @param event [Spree::Event] The event to handle
149
149
  # @return [void]
@@ -8,7 +8,7 @@ module Spree
8
8
  # Rates name their country and state directly since 6.0. No code reads
9
9
  # zone_id any more, but the column stays in the database through 6.0: it is
10
10
  # what `spree:migrate_tax_zones` converts from, and that task runs after
11
- # db:migrate. The physical drop lands in 6.1.
11
+ # db:migrate. The physical drop lands in 6.3.
12
12
  #
13
13
  # The same goes for included_in_price: whether tax sits inside a price is
14
14
  # the market's choice (Spree::Market#tax_inclusive), and the column is read
@@ -79,15 +79,15 @@ module Spree
79
79
  self.amount = parsed && parsed / 100
80
80
  end
81
81
 
82
- # @deprecated Use {#rate_percent}; removed in 6.1.
82
+ # @deprecated Use {#rate_percent}; removed in 6.3.
83
83
  def amount_percentage
84
- Spree::Deprecation.warn('Spree::TaxRate#amount_percentage is deprecated and will be removed in Spree 6.1. Use #rate_percent instead.')
84
+ Spree::Deprecation.warn('Spree::TaxRate#amount_percentage is deprecated and will be removed in Spree 6.3. Use #rate_percent instead.')
85
85
  rate_percent
86
86
  end
87
87
 
88
- # @deprecated Use {#rate_percent=}; removed in 6.1.
88
+ # @deprecated Use {#rate_percent=}; removed in 6.3.
89
89
  def amount_percentage=(value)
90
- Spree::Deprecation.warn('Spree::TaxRate#amount_percentage= is deprecated and will be removed in Spree 6.1. Use #rate_percent= instead.')
90
+ Spree::Deprecation.warn('Spree::TaxRate#amount_percentage= is deprecated and will be removed in Spree 6.3. Use #rate_percent= instead.')
91
91
  self.rate_percent = value
92
92
  end
93
93
 
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Spree
4
4
  # Deprecation alias for Spree::Category, renamed from Spree::Taxon 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::Taxon keep working; the canonical class is Spree::Category. Removed
7
- # in 6.1 (along with the spree_taxonomies table and the automatic-taxon columns).
7
+ # in 6.3 (along with the spree_taxonomies table and the automatic-taxon columns).
8
8
  #
9
9
  # This is a true constant alias — the underlying class, table (spree_categories),
10
10
  # prefix (ctg), and model_name are all Spree::Category. Only the constant differs,
@@ -13,5 +13,5 @@ module Spree
13
13
  # when this file loads (on first reference; it is kept out of eager loading).
14
14
  Taxon = Category
15
15
 
16
- Spree::Deprecation.warn('Spree::Taxon is deprecated and will be removed in Spree 6.1. Use Spree::Category instead.')
16
+ Spree::Deprecation.warn('Spree::Taxon is deprecated and will be removed in Spree 6.3. Use Spree::Category instead.')
17
17
  end
@@ -10,7 +10,7 @@ module Spree
10
10
  ].freeze
11
11
 
12
12
  # Category no longer declares the has_many :taxon_rules inverse (categories are
13
- # manual in 6.0), so this is a plain belongs_to. Data-only until 6.1.
13
+ # manual in 6.0), so this is a plain belongs_to. Data-only until 6.3.
14
14
  belongs_to :taxon, class_name: 'Spree::Category', touch: true
15
15
 
16
16
  validates :type, :value, presence: true
@@ -19,7 +19,7 @@ module Spree
19
19
  delegate :store, to: :taxon
20
20
 
21
21
  # Retained as a data-only model in 6.0 so the taxons -> collections data
22
- # migration can read existing automatic-taxon rules; dropped in 6.1 along
22
+ # migration can read existing automatic-taxon rules; dropped in 6.3 along
23
23
  # with the spree_taxon_rules table. Automatic membership now lives on
24
24
  # Spree::Collection (rule matching + regeneration moved there).
25
25
  end
@@ -4,7 +4,7 @@ module Spree
4
4
  # spree_taxonomies table are retained solely so the 5.6 -> 6.0 upgrade task
5
5
  # (spree:migrate_categories_and_collections) can read existing rows to
6
6
  # backfill category store_id, and so an interrupted upgrade can be rolled
7
- # back. Both drop in 6.1.
7
+ # back. Both drop in 6.3.
8
8
  class Taxonomy < Spree.base_class
9
9
  has_prefix_id :txnmy # Spree-specific: taxonomy
10
10
 
@@ -546,21 +546,21 @@ module Spree
546
546
  update_column(:primary_media_id, first_media&.id)
547
547
  end
548
548
 
549
- # @deprecated Read #gallery_media directly; removed in 6.1. Nothing in
549
+ # @deprecated Read #gallery_media directly; removed in 6.3. Nothing in
550
550
  # Spree calls this — a hover image is a storefront presentation choice,
551
551
  # not something core should name.
552
552
  # @return [Spree::Media, nil]
553
553
  def secondary_image
554
- Spree::Deprecation.warn('Spree::Variant#secondary_image is deprecated and will be removed in Spree 6.1. Use #gallery_media instead.')
554
+ Spree::Deprecation.warn('Spree::Variant#secondary_image is deprecated and will be removed in Spree 6.3. Use #gallery_media instead.')
555
555
  gallery_media.second
556
556
  end
557
557
 
558
- # @deprecated Read #gallery_media directly; removed in 6.1. Nothing in
558
+ # @deprecated Read #gallery_media directly; removed in 6.3. Nothing in
559
559
  # Spree calls this, and which images to show beside the main one is a
560
560
  # storefront presentation choice.
561
561
  # @return [Array<Spree::Media>]
562
562
  def additional_images
563
- Spree::Deprecation.warn('Spree::Variant#additional_images is deprecated and will be removed in Spree 6.1. Use #gallery_media instead.')
563
+ Spree::Deprecation.warn('Spree::Variant#additional_images is deprecated and will be removed in Spree 6.3. Use #gallery_media instead.')
564
564
  gallery_media.reject { |media| media.id == primary_media&.id }
565
565
  end
566
566
 
@@ -752,15 +752,15 @@ module Spree
752
752
  stock_levels.where.not(stock_location_id: location_ids_in_payload).destroy_all if persisted?
753
753
  end
754
754
 
755
- # @deprecated Use {#stock_levels}; removed in 6.1.
755
+ # @deprecated Use {#stock_levels}; removed in 6.3.
756
756
  def stock_items
757
- Spree::Deprecation.warn('Spree::Variant#stock_items is deprecated and will be removed in Spree 6.1. Use #stock_levels instead.')
757
+ Spree::Deprecation.warn('Spree::Variant#stock_items is deprecated and will be removed in Spree 6.3. Use #stock_levels instead.')
758
758
  stock_levels
759
759
  end
760
760
 
761
- # @deprecated Use {#stock_levels=}; removed in 6.1.
761
+ # @deprecated Use {#stock_levels=}; removed in 6.3.
762
762
  def stock_items=(value)
763
- Spree::Deprecation.warn('Spree::Variant#stock_items= is deprecated and will be removed in Spree 6.1. Use #stock_levels= instead.')
763
+ Spree::Deprecation.warn('Spree::Variant#stock_items= is deprecated and will be removed in Spree 6.3. Use #stock_levels= instead.')
764
764
  self.stock_levels = value
765
765
  end
766
766
 
@@ -788,9 +788,11 @@ module Spree
788
788
  end
789
789
  end
790
790
 
791
- # @deprecated Use +stock_levels_attributes=+; removed in 6.1.
791
+ # @deprecated Use +stock_levels_attributes=+; removed in 6.3.
792
792
  def stock_items_attributes=(value)
793
- Spree::Deprecation.warn('Spree::Variant#stock_items_attributes= is deprecated and will be removed in Spree 6.1. Use #stock_levels_attributes= instead.')
793
+ Spree::Deprecation.warn(
794
+ 'Spree::Variant#stock_items_attributes= is deprecated and will be removed in Spree 6.3. Use #stock_levels_attributes= instead.'
795
+ )
794
796
  self.stock_levels_attributes = value
795
797
  end
796
798
 
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  # FK column is `media_id`, matching Spree::Media and its table. The `:asset`
3
- # association name stays readable for one release alongside `:media`.
3
+ # association name stays readable until 6.3.
4
4
  class VariantMedia < Spree.base_class
5
5
  self.table_name = 'spree_variant_media'
6
6
 
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::WishedItem, renamed to
3
- # Spree::WishlistItem in 6.0. Remove in 6.1.
3
+ # Spree::WishlistItem in 6.0. Remove in 6.3.
4
4
  WishedItem = WishlistItem
5
5
  end
@@ -30,9 +30,9 @@ module Spree
30
30
  @wishlist_items_count ||= variant_ids.count
31
31
  end
32
32
 
33
- # @deprecated Use {#wishlist_items_count}; removed in 6.1.
33
+ # @deprecated Use {#wishlist_items_count}; removed in 6.3.
34
34
  def wished_items_count
35
- Spree::Deprecation.warn('Spree::Wishlist#wished_items_count is deprecated and will be removed in Spree 6.1. Use #wishlist_items_count instead.')
35
+ Spree::Deprecation.warn('Spree::Wishlist#wished_items_count is deprecated and will be removed in Spree 6.3. Use #wishlist_items_count instead.')
36
36
  wishlist_items_count
37
37
  end
38
38
 
@@ -4,8 +4,8 @@ module Spree
4
4
  class WishlistItem < Spree.base_class
5
5
  # Dual-emits the pre-6.0 `wished_item.*` lifecycle events beside the
6
6
  # `wishlist_item.*` ones, so a webhook endpoint a merchant configured
7
- # against the old names keeps receiving deliveries for one release.
8
- # Removed in 6.1, the same way {Spree::StockLevel::CustomEvents} carries
7
+ # against the old names keeps receiving deliveries until 6.5.
8
+ # Removed in 6.5, the same way {Spree::StockLevel::CustomEvents} carries
9
9
  # `stock_item.*`.
10
10
  module CustomEvents
11
11
  LEGACY_EVENT_PREFIX = 'wished_item'
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- # Migration-only shell, removed in Spree 6.1: rows survive solely as source
2
+ # Migration-only shell, removed in Spree 6.3: rows survive solely as source
3
3
  # data for the 5.6→6.0 zone, market and tax migrations. Countries and states
4
4
  # are reference data in 6.0, so member ids resolve against the legacy tables
5
5
  # rather than through associations.
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- # Migration-only shell, removed in Spree 6.1 with {Spree::Zone}.
2
+ # Migration-only shell, removed in Spree 6.3 with {Spree::Zone}.
3
3
  class ZoneMember < Spree.base_class
4
4
  # No zoneable association: countries and states are reference data in 6.0,
5
5
  # so the type and id columns are plain values resolved against the legacy
@@ -5,11 +5,15 @@ module Spree
5
5
 
6
6
  def call(guest_cart: nil, guest_order: nil, customer: nil, user: nil, override_email: true, guest_only: false)
7
7
  if guest_order
8
- Spree::Deprecation.warn('Calling Spree::Carts::Associate with guest_order: is deprecated and will be removed in Spree 6.1. Pass guest_cart: instead.')
8
+ Spree::Deprecation.warn(
9
+ 'Calling Spree::Carts::Associate with guest_order: is deprecated and will be removed in Spree 6.3. Pass guest_cart: instead.'
10
+ )
9
11
  guest_cart ||= guest_order
10
12
  end
11
13
  if user && customer.nil?
12
- Spree::Deprecation.warn('Calling Spree::Carts::Associate with user: is deprecated and will be removed in Spree 6.1. Pass customer: instead.')
14
+ Spree::Deprecation.warn(
15
+ 'Calling Spree::Carts::Associate with user: is deprecated and will be removed in Spree 6.3. Pass customer: instead.'
16
+ )
13
17
  customer = user
14
18
  end
15
19
  return failure(guest_cart, 'Already assigned to a customer') if guest_only && guest_cart.customer.present? && guest_cart.customer != customer
@@ -11,7 +11,7 @@ module Spree
11
11
 
12
12
  customer = @params.delete(:customer)
13
13
  if @params.key?(:user)
14
- Spree::Deprecation.warn('Passing user: to Spree::Carts::Create is deprecated and will be removed in Spree 6.1. Pass customer: instead.')
14
+ Spree::Deprecation.warn('Passing user: to Spree::Carts::Create is deprecated and will be removed in Spree 6.3. Pass customer: instead.')
15
15
  customer ||= @params.delete(:user)
16
16
  end
17
17
 
@@ -11,7 +11,7 @@ module Spree
11
11
  # @return [Spree::ServiceModule::Result] deletion outcome
12
12
  def call(cart: nil, order: nil)
13
13
  if order
14
- Spree::Deprecation.warn('Calling Spree::Carts::Destroy with order: is deprecated and will be removed in Spree 6.1. Pass cart: instead.')
14
+ Spree::Deprecation.warn('Calling Spree::Carts::Destroy with order: is deprecated and will be removed in Spree 6.3. Pass cart: instead.')
15
15
  cart ||= order
16
16
  end
17
17
  rewrite_input!(remove: [:order], cart: cart)
@@ -5,7 +5,7 @@ module Spree
5
5
 
6
6
  def call(cart: nil, order: nil, variant: nil, quantity: nil, options: nil)
7
7
  if order
8
- Spree::Deprecation.warn('Calling Spree::Carts::RemoveItem with order: is deprecated and will be removed in Spree 6.1. Pass cart: instead.')
8
+ Spree::Deprecation.warn('Calling Spree::Carts::RemoveItem with order: is deprecated and will be removed in Spree 6.3. Pass cart: instead.')
9
9
  cart ||= order
10
10
  end
11
11
  options ||= {}
@@ -3,7 +3,7 @@ module Spree
3
3
  # @deprecated Removing an item is an upsert with quantity zero. Call
4
4
  # Spree::Carts::UpsertItems so the removal passes the same
5
5
  # 'carts.upsert_items.validate' hook every other item mutation does.
6
- # Removed in Spree 6.1.
6
+ # Removed in Spree 6.3.
7
7
  class RemoveLineItem
8
8
  prepend Spree::ServiceModule::Base
9
9
 
@@ -11,7 +11,7 @@ module Spree
11
11
  # the upsert path identifies the row by variant, not by line-item options.
12
12
  def call(cart: nil, order: nil, line_item: nil, options: nil)
13
13
  Spree::Deprecation.warn(
14
- 'Spree::Carts::RemoveLineItem is deprecated and will be removed in Spree 6.1. ' \
14
+ 'Spree::Carts::RemoveLineItem is deprecated and will be removed in Spree 6.3. ' \
15
15
  'Use Spree::Carts::UpsertItems with quantity: 0 instead. Note it removes the ' \
16
16
  'cart\'s line item for the variant, which is this one unless the cart holds ' \
17
17
  'several rows of the same variant.'