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
@@ -22,7 +22,7 @@ module Spree
22
22
  # #payout_account_reference.
23
23
  include Spree::HasExternalReferences
24
24
 
25
- MEMOIZED_METHODS = %w[onboarding_requirements onboarding_progress products_count returns_location].freeze
25
+ MEMOIZED_METHODS = %w[onboarding_requirements onboarding_progress products_count_by_status returns_location].freeze
26
26
 
27
27
  publishes_lifecycle_events
28
28
  publishes_events :approved, :invited, :onboarding_reopened, :onboarding_started, :rejected,
@@ -106,6 +106,36 @@ module Spree
106
106
  billing_address&.owner = self
107
107
  end
108
108
 
109
+ # The address fields a stock location keeps on itself, as the API names
110
+ # them. A location is a place rather than a person, so it has no name or
111
+ # label of its own.
112
+ RETURNS_ADDRESS_FIELDS = %w[company address1 address2 city postal_code country_code state_code state_name
113
+ phone].freeze
114
+
115
+ # The API writes the returns address inline, like the billing address. It
116
+ # is the returns location's own address, so it lands on that location — a
117
+ # new one for a seller who has none — and a received return still restocks
118
+ # somewhere the catalog knows. Saved with the seller, in its transaction.
119
+ def returns_address=(attributes)
120
+ attributes = attributes.to_h.stringify_keys.slice(*RETURNS_ADDRESS_FIELDS)
121
+ attributes['zipcode'] = attributes.delete('postal_code') if attributes.key?('postal_code')
122
+
123
+ # Not built through the association: that would validate and save it a
124
+ # second time, under a generic "stock locations is invalid".
125
+ location = returns_location ||
126
+ Spree::StockLocation.new(active: true, returns_enabled: true, propagate_all_variants: false)
127
+ # A state belongs to its country, so a new country drops the old state
128
+ # unless one comes with it.
129
+ if attributes.key?('country_code') && attributes['country_code'].to_s.upcase != location.country_code.to_s.upcase
130
+ attributes = { 'state_code' => nil, 'state_name' => nil }.merge(attributes)
131
+ end
132
+ location.assign_attributes(attributes)
133
+ @returns_location = @pending_returns_location = location
134
+ end
135
+
136
+ validate :validate_returns_location, if: -> { @pending_returns_location }
137
+ after_save :save_returns_location, if: -> { @pending_returns_location }
138
+
109
139
  # Where this seller keeps stock, and so where their returns land. Released
110
140
  # rather than destroyed for the same reason products are: the operator
111
141
  # decides what becomes of a departed seller's inventory.
@@ -428,14 +458,32 @@ module Spree
428
458
 
429
459
  # @return [Integer] how many products this seller lists
430
460
  def products_count
431
- return @products_count if @products_count
432
-
433
- siblings = lazy_preload_context&.records&.grep(self.class)
434
- return @products_count = products.count if siblings.blank?
461
+ products_count_by_status.values.sum
462
+ end
435
463
 
436
- counts = Spree::Product.where(seller_id: siblings.map(&:id)).group(:seller_id).count
437
- siblings.each { |seller| seller.preloaded_products_count = counts.fetch(seller.id, 0) }
438
- @products_count
464
+ # How many of this seller's products sit in each status, every status
465
+ # present: what the operator reads off a seller to see what is live and
466
+ # what is waiting on them. On a list, one grouped query serves every
467
+ # seller on the page.
468
+ #
469
+ # @return [Hash{String => Integer}]
470
+ def products_count_by_status
471
+ return @products_count_by_status if @products_count_by_status
472
+
473
+ blank = Spree::Product::ALL_STATUSES.index_with(0)
474
+ # An unsaved seller has no id, and `seller_id IS NULL` would count the
475
+ # operator's own catalog.
476
+ return blank if new_record?
477
+
478
+ siblings = (lazy_preload_context&.records&.grep(self.class).presence || [self]).select(&:persisted?)
479
+ counts = Spree::Product.where(seller_id: siblings.map(&:id)).group(:seller_id, :status).count
480
+ by_seller = counts.group_by { |(seller_id, _status), _count| seller_id }
481
+ siblings.each do |seller|
482
+ seller.preloaded_products_count_by_status = blank.merge(
483
+ by_seller.fetch(seller.id, []).to_h { |(_seller_id, status), count| [status, count] }
484
+ )
485
+ end
486
+ @products_count_by_status
439
487
  end
440
488
 
441
489
  # Where this seller stands against the marketplace's checklist
@@ -483,12 +531,47 @@ module Spree
483
531
 
484
532
  protected
485
533
 
486
- def preloaded_products_count=(count)
487
- @products_count = count
534
+ def preloaded_products_count_by_status=(counts)
535
+ @products_count_by_status = counts
488
536
  end
489
537
 
490
538
  private
491
539
 
540
+ # Reported under the names the client sent, so a 422 lands on the field.
541
+ def validate_returns_location
542
+ location = @pending_returns_location
543
+ # Filled in here rather than in the writer: on create, the name and the
544
+ # store may be assigned after the address. The id rather than the
545
+ # record, which would add the location to `stock_locations` and have it
546
+ # validated a second time.
547
+ location.seller_id = id
548
+ location.store ||= store
549
+ location.name ||= name
550
+ return if location.valid?
551
+
552
+ # Before the seller has an id, uniqueness compares against the
553
+ # operator's own locations; the save after the seller re-checks it.
554
+ location.errors.delete(:name, :taken) if new_record?
555
+ return if location.errors.empty?
556
+
557
+ location.errors.each do |error|
558
+ field = error.attribute == :zipcode ? :postal_code : error.attribute
559
+ errors.import(error, attribute: :"returns_address.#{field}")
560
+ end
561
+ end
562
+
563
+ def save_returns_location
564
+ location = @pending_returns_location
565
+ @pending_returns_location = nil
566
+ location.seller_id = id
567
+ return unless location.new_record? || location.changed?
568
+
569
+ location.save!
570
+ # A new location is not in a list loaded before it existed, and the
571
+ # returns location is read from that list once the memo clears.
572
+ stock_locations.reset
573
+ end
574
+
492
575
  # The same choice as the query in {#returns_location}, made over the
493
576
  # preloaded locations.
494
577
  def returns_location_from_loaded
@@ -10,16 +10,35 @@ module Spree
10
10
  preference :require_about, :boolean, default: true
11
11
  preference :require_logo, :boolean, default: true
12
12
  preference :require_cover_photo, :boolean, default: false
13
- preference :require_contact_email, :boolean, default: true
13
+ preference :require_contact_email, :boolean, default: false
14
14
 
15
15
  def met_by_seller?(seller)
16
- return false if seller.name.blank?
17
- return false if preferred_require_about && seller.about.blank?
18
- return false if preferred_require_logo && !seller.logo.attached?
19
- return false if preferred_require_cover_photo && !seller.cover_photo.attached?
20
- return false if preferred_require_contact_email && seller.contact_email.blank?
16
+ missing_fields(seller).empty?
17
+ end
18
+
19
+ # The checklist line only says "complete your profile", so the seller
20
+ # is told which ticked fields are still empty — the contact email in
21
+ # particular lives on a different settings page than the rest, so when
22
+ # it is the only gap the state says so and a panel can link there.
23
+ def blocker(seller)
24
+ missing = missing_fields(seller)
25
+ return nil if missing.empty? || latest_submission(seller)&.waived?
26
+
27
+ fields = missing.map { |field| I18n.t("spree.seller_requirement_types.complete_profile.fields.#{field}") }
28
+ state = missing == [:contact_email] ? 'contact_email_missing' : 'incomplete'
29
+ { state: state, message: I18n.t('spree.seller_requirement_types.complete_profile.missing', fields: fields.to_sentence) }
30
+ end
31
+
32
+ private
21
33
 
22
- true
34
+ def missing_fields(seller)
35
+ [
36
+ (:name if seller.name.blank?),
37
+ (:about if preferred_require_about && seller.about.blank?),
38
+ (:logo if preferred_require_logo && !seller.logo.attached?),
39
+ (:cover_photo if preferred_require_cover_photo && !seller.cover_photo.attached?),
40
+ (:contact_email if preferred_require_contact_email && seller.contact_email.blank?)
41
+ ].compact
23
42
  end
24
43
  end
25
44
  end
@@ -1,5 +1,8 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::Shipment, renamed to
3
- # Spree::Fulfillment in 6.0. Remove in 6.1.
3
+ # Spree::Fulfillment in 6.0. The warning fires when this
4
+ # file loads. Removed in 6.3.
4
5
  Shipment = Fulfillment
6
+
7
+ Spree::Deprecation.warn('Spree::Shipment is deprecated and will be removed in Spree 6.3. Use Spree::Fulfillment instead.')
5
8
  end
@@ -1,5 +1,8 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::ShippingMethod, renamed to
3
- # Spree::DeliveryMethod in 6.0. Remove in 6.1.
3
+ # Spree::DeliveryMethod in 6.0. The warning fires when this
4
+ # file loads. Removed in 6.3.
4
5
  ShippingMethod = DeliveryMethod
6
+
7
+ Spree::Deprecation.warn('Spree::ShippingMethod is deprecated and will be removed in Spree 6.3. Use Spree::DeliveryMethod instead.')
5
8
  end
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::ShippingRate, renamed to
3
- # Spree::DeliveryRate in 6.0. Remove in 6.1.
3
+ # Spree::DeliveryRate in 6.0. Remove in 6.3.
4
4
  ShippingRate = DeliveryRate
5
5
  end
@@ -15,9 +15,9 @@ module Spree
15
15
  end
16
16
  end
17
17
 
18
- # @deprecated Use {#fulfillments}; removed in 6.1.
18
+ # @deprecated Use {#fulfillments}; removed in 6.3.
19
19
  def shipments
20
- Spree::Deprecation.warn('Spree::Stock::Coordinator#shipments is deprecated and will be removed in Spree 6.1. Use #fulfillments instead.')
20
+ Spree::Deprecation.warn('Spree::Stock::Coordinator#shipments is deprecated and will be removed in Spree 6.3. Use #fulfillments instead.')
21
21
  fulfillments
22
22
  end
23
23
 
@@ -32,9 +32,9 @@ module Spree
32
32
  delivery_methods(package, audience).any?
33
33
  end
34
34
 
35
- # @deprecated Use {#delivery_rates}; removed in 6.1.
35
+ # @deprecated Use {#delivery_rates}; removed in 6.3.
36
36
  def shipping_rates(package, audience = DeliveryMethod::STOREFRONT)
37
- Spree::Deprecation.warn('Spree::Stock::Estimator#shipping_rates is deprecated and will be removed in Spree 6.1. Use #delivery_rates instead.')
37
+ Spree::Deprecation.warn('Spree::Stock::Estimator#shipping_rates is deprecated and will be removed in Spree 6.3. Use #delivery_rates instead.')
38
38
  delivery_rates(package, audience)
39
39
  end
40
40
 
@@ -141,7 +141,7 @@ module Spree
141
141
  # their own rules.
142
142
  #
143
143
  # Dispatches through the legacy +shipping_methods+ name so overrides
144
- # written against it keep running until 6.1 — without this, a host
144
+ # written against it keep running until 6.3 — without this, a host
145
145
  # override would be silently skipped and checkout could quote rates
146
146
  # the host meant to filter out.
147
147
  def delivery_methods(package, audience)
@@ -150,11 +150,13 @@ module Spree
150
150
  filter_delivery_methods(package, audience)
151
151
  end
152
152
 
153
- # @deprecated Call or override {#delivery_methods}; removed in 6.1.
153
+ # @deprecated Call or override {#delivery_methods}; removed in 6.3.
154
154
  # Only reached when a caller uses the old name directly — the override
155
155
  # dispatch above goes straight to the override's own definition.
156
156
  def shipping_methods(package, audience)
157
- Spree::Deprecation.warn('Spree::Stock::Estimator#shipping_methods is deprecated and will be removed in Spree 6.1. Use #delivery_methods instead.')
157
+ Spree::Deprecation.warn(
158
+ 'Spree::Stock::Estimator#shipping_methods is deprecated and will be removed in Spree 6.3. Use #delivery_methods instead.'
159
+ )
158
160
  filter_delivery_methods(package, audience)
159
161
  end
160
162
 
@@ -30,15 +30,15 @@ module Spree
30
30
  @owner || order
31
31
  end
32
32
 
33
- # @deprecated Use {#delivery_rates}; removed in 6.1.
33
+ # @deprecated Use {#delivery_rates}; removed in 6.3.
34
34
  def shipping_rates
35
- Spree::Deprecation.warn('Spree::Stock::Package#shipping_rates is deprecated and will be removed in Spree 6.1. Use #delivery_rates instead.')
35
+ Spree::Deprecation.warn('Spree::Stock::Package#shipping_rates is deprecated and will be removed in Spree 6.3. Use #delivery_rates instead.')
36
36
  delivery_rates
37
37
  end
38
38
 
39
- # @deprecated Use {#delivery_rates=}; removed in 6.1.
39
+ # @deprecated Use {#delivery_rates=}; removed in 6.3.
40
40
  def shipping_rates=(rates)
41
- Spree::Deprecation.warn('Spree::Stock::Package#shipping_rates= is deprecated and will be removed in Spree 6.1. Use #delivery_rates= instead.')
41
+ Spree::Deprecation.warn('Spree::Stock::Package#shipping_rates= is deprecated and will be removed in Spree 6.3. Use #delivery_rates= instead.')
42
42
  self.delivery_rates = rates
43
43
  end
44
44
 
@@ -154,9 +154,11 @@ module Spree
154
154
  profile.delivery_methods
155
155
  end
156
156
 
157
- # @deprecated Use {#eligible_delivery_methods}; removed in 6.1.
157
+ # @deprecated Use {#eligible_delivery_methods}; removed in 6.3.
158
158
  def shipping_methods
159
- Spree::Deprecation.warn('Spree::Stock::Package#shipping_methods is deprecated and will be removed in Spree 6.1. Use #eligible_delivery_methods instead.')
159
+ Spree::Deprecation.warn(
160
+ 'Spree::Stock::Package#shipping_methods is deprecated and will be removed in Spree 6.3. Use #eligible_delivery_methods instead.'
161
+ )
160
162
  eligible_delivery_methods.to_a
161
163
  end
162
164
 
@@ -179,9 +181,9 @@ module Spree
179
181
  )
180
182
  end
181
183
 
182
- # @deprecated Use {#to_fulfillment}; removed in 6.1.
184
+ # @deprecated Use {#to_fulfillment}; removed in 6.3.
183
185
  def to_shipment
184
- Spree::Deprecation.warn('Spree::Stock::Package#to_shipment is deprecated and will be removed in Spree 6.1. Use #to_fulfillment instead.')
186
+ Spree::Deprecation.warn('Spree::Stock::Package#to_shipment is deprecated and will be removed in Spree 6.3. Use #to_fulfillment instead.')
185
187
  to_fulfillment
186
188
  end
187
189
 
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::StockItem, renamed to
3
- # Spree::StockLevel in 6.0. Remove in 6.1.
3
+ # Spree::StockLevel in 6.0. Remove in 6.3.
4
4
  StockItem = StockLevel
5
5
  end
@@ -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
@@ -70,10 +70,39 @@ module Spree
70
70
  scope :with_incoming, -> { where(arel_table[:incoming_count].gt(0)) }
71
71
  scope :with_reserved, -> { where(arel_table[:reserved_count].gt(0)) }
72
72
 
73
+ # The same two questions asked of a variant rather than one shelf: every
74
+ # level of a variant whose stock, summed over all active locations, has run
75
+ # out or is running low. A variant with plenty in one warehouse is not out
76
+ # of stock because another location holds none of it. Untracked variants
77
+ # have no count to run out of, so they never match; a backorderable one
78
+ # still does, since selling on backorder is when restocking matters most.
79
+ scope :out_of_stock_overall, -> { where(variant_id: variant_ids_by_total_purchasable { |total| total.lteq(0) }) }
80
+ scope :low_stock_overall, lambda { |threshold = nil|
81
+ ceiling = threshold || Spree::Current.store&.preferred_low_stock_threshold || 0
82
+ where(variant_id: variant_ids_by_total_purchasable { |total| total.gt(0).and(total.lteq(ceiling)) })
83
+ }
84
+
73
85
  # What the Inventory page's stock-status filter can ask for. Each names a
74
86
  # scope above; `STOCK_STATUS_SCOPES` is the allowlist that keeps a request
75
87
  # from naming any other method.
76
- STOCK_STATUS_SCOPES = %w[in_stock low_stock out_of_stock with_incoming with_reserved].freeze
88
+ STOCK_STATUS_SCOPES = %w[in_stock low_stock out_of_stock low_stock_overall out_of_stock_overall
89
+ with_incoming with_reserved].freeze
90
+
91
+ # Ids of tracked variants whose purchasable units across
92
+ # every active location satisfy the condition the block builds. Unscoped,
93
+ # so the sum covers all locations even when the caller has narrowed the
94
+ # list to one.
95
+ #
96
+ # @yieldparam total [Arel::Nodes::Node] the summed purchasable units
97
+ # @return [ActiveRecord::Relation] a `variant_id` subquery
98
+ def self.variant_ids_by_total_purchasable
99
+ levels = unscoped.where(deleted_at: nil)
100
+ levels.joins(:stock_location).merge(Spree::StockLocation.active).
101
+ joins(:variant).where(spree_variants: { track_inventory: true, deleted_at: nil }).
102
+ group(:variant_id).
103
+ having(yield(Arel::Nodes::Sum.new([purchasable_arel]))).
104
+ select(:variant_id)
105
+ end
77
106
 
78
107
  # Rows in any of the named states — "out of stock, or with units on the
79
108
  # way" is one question a merchant asks, not two filters they combine.
@@ -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
@@ -58,6 +58,7 @@ module Spree
58
58
  validates :quantity, numericality: { greater_than: 0 }, allow_nil: true,
59
59
  if: -> { allocated? || released? || shipped? }
60
60
  validates :reason, presence: true, if: :adjusted?
61
+ validates :reason, length: { maximum: 255 }, allow_blank: true
61
62
 
62
63
  scope :recent, -> { order(created_at: :desc) }
63
64
  KINDS.each do |movement_kind|
@@ -75,7 +76,7 @@ module Spree
75
76
  delegate :variant, :variant_id, to: :stock_level, allow_nil: true
76
77
  delegate :product, to: :variant
77
78
 
78
- # `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
79
80
  # it: Ransack resolves attribute aliases, and dropping the old filter would
80
81
  # hand a client still sending it the whole collection rather than an error.
81
82
  self.whitelisted_ransackable_attributes = %w[quantity kind reason created_at stock_level_id
@@ -138,15 +139,15 @@ module Spree
138
139
  Spree::Money.new(unit_cost, currency: purchase_order&.currency)
139
140
  end
140
141
 
141
- # @deprecated Use {#stock_level}; removed in 6.1.
142
+ # @deprecated Use {#stock_level}; removed in 6.3.
142
143
  def stock_item
143
- 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.')
144
145
  stock_level
145
146
  end
146
147
 
147
- # @deprecated Use {#stock_level=}; removed in 6.1.
148
+ # @deprecated Use {#stock_level=}; removed in 6.3.
148
149
  def stock_item=(record)
149
- 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.')
150
151
  self.stock_level = record
151
152
  end
152
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