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
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  # Constant alias for the misspelled legacy Spree::FulfilmentChanger,
3
- # renamed to Spree::FulfillmentChanger in 6.0. Remove in 6.1.
3
+ # renamed to Spree::FulfillmentChanger in 6.0. Remove in 6.3.
4
4
  FulfilmentChanger = FulfillmentChanger
5
5
  end
@@ -64,10 +64,10 @@ module Spree
64
64
  #
65
65
  # Ransack
66
66
  #
67
- ransack_alias :state, :status # @deprecated filter alias — removed in 6.1
67
+ ransack_alias :state, :status # @deprecated filter alias — removed in 6.5
68
68
  self.whitelisted_ransackable_attributes = %w[code customer_id status state gift_card_batch_id created_by_id currency expires_at]
69
69
  search_by :code
70
- # `users` is the pre-6.0 name for `customers` — removed in 6.1.
70
+ # `users` is the pre-6.0 name for `customers` — removed in 6.3.
71
71
  self.whitelisted_ransackable_associations = %w[customers users orders batch]
72
72
  self.whitelisted_ransackable_scopes = %w[active expired redeemed partially_redeemed]
73
73
  self.ransackable_scope_types = %w[active expired redeemed partially_redeemed].index_with('boolean')
@@ -189,36 +189,36 @@ module Spree
189
189
  end.to_s
190
190
  end
191
191
 
192
- # @deprecated use +display_status+ — removed in 6.1
192
+ # @deprecated use +display_status+ — removed in 6.3
193
193
  def display_state
194
- Spree::Deprecation.warn('Spree::GiftCard#display_state is deprecated and will be removed in Spree 6.1. Use #display_status instead.')
194
+ Spree::Deprecation.warn('Spree::GiftCard#display_state is deprecated and will be removed in Spree 6.3. Use #display_status instead.')
195
195
  display_status
196
196
  end
197
197
 
198
- # @deprecated read +status+ — removed in 6.1
198
+ # @deprecated read +status+ — removed in 6.3
199
199
  def state
200
- Spree::Deprecation.warn('Spree::GiftCard#state is deprecated and will be removed in Spree 6.1. Use #status instead.')
200
+ Spree::Deprecation.warn('Spree::GiftCard#state is deprecated and will be removed in Spree 6.3. Use #status instead.')
201
201
  status
202
202
  end
203
203
 
204
- # @deprecated write +status+ — removed in 6.1
204
+ # @deprecated write +status+ — removed in 6.3
205
205
  def state=(value)
206
- Spree::Deprecation.warn('Spree::GiftCard#state= is deprecated and will be removed in Spree 6.1. Use #status= instead.')
206
+ Spree::Deprecation.warn('Spree::GiftCard#state= is deprecated and will be removed in Spree 6.3. Use #status= instead.')
207
207
  self.status = value
208
208
  end
209
209
 
210
- # @deprecated Call Spree.gift_card_redeem_workflow — removed in 6.1.
210
+ # @deprecated Call Spree.gift_card_redeem_workflow — removed in 6.3.
211
211
  # The workflow decides full versus partial redemption from the balance,
212
212
  # so both old verbs land on it.
213
213
  def redeem!
214
- Spree::Deprecation.warn('Spree::GiftCard#redeem! is deprecated and will be removed in Spree 6.1. Call Spree.gift_card_redeem_workflow instead.')
214
+ Spree::Deprecation.warn('Spree::GiftCard#redeem! is deprecated and will be removed in Spree 6.3. Call Spree.gift_card_redeem_workflow instead.')
215
215
  run_gift_card_workflow(Spree.gift_card_redeem_workflow)
216
216
  end
217
217
  alias partial_redeem! redeem!
218
218
 
219
- # @deprecated Call Spree.gift_card_cancel_workflow — removed in 6.1.
219
+ # @deprecated Call Spree.gift_card_cancel_workflow — removed in 6.3.
220
220
  def cancel!
221
- Spree::Deprecation.warn('Spree::GiftCard#cancel! is deprecated and will be removed in Spree 6.1. Call Spree.gift_card_cancel_workflow instead.')
221
+ Spree::Deprecation.warn('Spree::GiftCard#cancel! is deprecated and will be removed in Spree 6.3. Call Spree.gift_card_cancel_workflow instead.')
222
222
  run_gift_card_workflow(Spree.gift_card_cancel_workflow)
223
223
  end
224
224
 
@@ -157,41 +157,49 @@ module Spree
157
157
  nil
158
158
  end
159
159
 
160
- # @deprecated Call the Spree::Imports workflows — removed in 6.1.
160
+ # @deprecated Call the Spree::Imports workflows — removed in 6.3.
161
161
  def start_mapping!
162
- Spree::Deprecation.warn('Spree::Import#start_mapping! is deprecated and will be removed in Spree 6.1. Call Spree.import_start_mapping_workflow instead.')
162
+ Spree::Deprecation.warn(
163
+ 'Spree::Import#start_mapping! is deprecated and will be removed in Spree 6.3. Call Spree.import_start_mapping_workflow instead.'
164
+ )
163
165
  run_pipeline_workflow(Spree.import_start_mapping_workflow)
164
166
  end
165
167
 
166
- # @deprecated Call Spree.import_complete_mapping_workflow — removed in 6.1.
168
+ # @deprecated Call Spree.import_complete_mapping_workflow — removed in 6.3.
167
169
  def complete_mapping!
168
- Spree::Deprecation.warn('Spree::Import#complete_mapping! is deprecated and will be removed in Spree 6.1. Call Spree.import_complete_mapping_workflow instead.')
170
+ Spree::Deprecation.warn(
171
+ 'Spree::Import#complete_mapping! is deprecated and will be removed in Spree 6.3. Call Spree.import_complete_mapping_workflow instead.'
172
+ )
169
173
  run_pipeline_workflow(Spree.import_complete_mapping_workflow)
170
174
  end
171
175
 
172
- # @deprecated Call Spree.import_start_processing_workflow — removed in 6.1.
176
+ # @deprecated Call Spree.import_start_processing_workflow — removed in 6.3.
173
177
  def start_processing!
174
- Spree::Deprecation.warn('Spree::Import#start_processing! is deprecated and will be removed in Spree 6.1. Call Spree.import_start_processing_workflow instead.')
178
+ Spree::Deprecation.warn(
179
+ 'Spree::Import#start_processing! is deprecated and will be removed in Spree 6.3. Call Spree.import_start_processing_workflow instead.'
180
+ )
175
181
  run_pipeline_workflow(Spree.import_start_processing_workflow)
176
182
  end
177
183
 
178
- # @deprecated Call Spree.import_complete_workflow — removed in 6.1.
184
+ # @deprecated Call Spree.import_complete_workflow — removed in 6.3.
179
185
  def complete!
180
- Spree::Deprecation.warn('Spree::Import#complete! is deprecated and will be removed in Spree 6.1. Call Spree.import_complete_workflow instead.')
186
+ Spree::Deprecation.warn('Spree::Import#complete! is deprecated and will be removed in Spree 6.3. Call Spree.import_complete_workflow instead.')
181
187
  run_pipeline_workflow(Spree.import_complete_workflow)
182
188
  end
183
189
 
184
- # @deprecated Set the status — removed in 6.1. Failure was never a step of
190
+ # @deprecated Set the status — removed in 6.3. Failure was never a step of
185
191
  # its own; the controller records the parse error directly.
186
192
  def fail!
187
- Spree::Deprecation.warn('Spree::Import#fail! is deprecated and will be removed in Spree 6.1. Write the status instead.')
193
+ Spree::Deprecation.warn('Spree::Import#fail! is deprecated and will be removed in Spree 6.3. Write the status instead.')
188
194
  update!(status: 'failed')
189
195
  end
190
196
 
191
- # @deprecated Call Spree.import_retry_failed_rows_workflow — removed in 6.1.
197
+ # @deprecated Call Spree.import_retry_failed_rows_workflow — removed in 6.3.
192
198
  # Returns false when there is nothing to retry, as the guarded event did.
193
199
  def retry_failed_rows
194
- Spree::Deprecation.warn('Spree::Import#retry_failed_rows is deprecated and will be removed in Spree 6.1. Call Spree.import_retry_failed_rows_workflow instead.')
200
+ Spree::Deprecation.warn(
201
+ 'Spree::Import#retry_failed_rows is deprecated and will be removed in Spree 6.3. Call Spree.import_retry_failed_rows_workflow instead.'
202
+ )
195
203
  Spree.import_retry_failed_rows_workflow.call(import: self).success?
196
204
  end
197
205
 
@@ -363,7 +371,7 @@ module Spree
363
371
 
364
372
  # Who ran this import — the seller when one did, otherwise the store.
365
373
  #
366
- # @deprecated Read `seller` and `store` — removed in 6.1. Kept because the
374
+ # @deprecated Read `seller` and `store` — removed in 6.3. Kept because the
367
375
  # polymorphic `owner` shipped in 5.6 and the v3 serializer still emits
368
376
  # `owner_type`/`owner_id` from it.
369
377
  # @return [Spree::Seller, Spree::Store]
@@ -371,9 +379,9 @@ module Spree
371
379
  seller || store
372
380
  end
373
381
 
374
- # @deprecated Assign `seller:` or `store:` — removed in 6.1.
382
+ # @deprecated Assign `seller:` or `store:` — removed in 6.3.
375
383
  def owner=(record)
376
- Spree::Deprecation.warn('Spree::Import#owner= is deprecated and will be removed in Spree 6.1. Assign seller: or store: instead.')
384
+ Spree::Deprecation.warn('Spree::Import#owner= is deprecated and will be removed in Spree 6.3. Assign seller: or store: instead.')
377
385
 
378
386
  case record
379
387
  when Spree::Seller
@@ -80,24 +80,24 @@ module Spree
80
80
  data_json[mapping.file_column]
81
81
  end
82
82
 
83
- # @deprecated Write the status — removed in 6.1. A row's lifecycle belongs
83
+ # @deprecated Write the status — removed in 6.3. A row's lifecycle belongs
84
84
  # to +process!+, which is the only thing that should move it.
85
85
  def start_processing!
86
- Spree::Deprecation.warn('Spree::ImportRow#start_processing! is deprecated and will be removed in Spree 6.1. Use #process! instead.')
86
+ Spree::Deprecation.warn('Spree::ImportRow#start_processing! is deprecated and will be removed in Spree 6.3. Use #process! instead.')
87
87
  update!(status: 'processing')
88
88
  end
89
89
 
90
- # @deprecated Write the status — removed in 6.1.
90
+ # @deprecated Write the status — removed in 6.3.
91
91
  def complete!
92
- Spree::Deprecation.warn('Spree::ImportRow#complete! is deprecated and will be removed in Spree 6.1. Use #process! instead.')
92
+ Spree::Deprecation.warn('Spree::ImportRow#complete! is deprecated and will be removed in Spree 6.3. Use #process! instead.')
93
93
  update!(status: 'completed')
94
94
  publish_event('import_row.completed')
95
95
  true
96
96
  end
97
97
 
98
- # @deprecated Write the status — removed in 6.1.
98
+ # @deprecated Write the status — removed in 6.3.
99
99
  def fail!
100
- Spree::Deprecation.warn('Spree::ImportRow#fail! is deprecated and will be removed in Spree 6.1. Use #process! instead.')
100
+ Spree::Deprecation.warn('Spree::ImportRow#fail! is deprecated and will be removed in Spree 6.3. Use #process! instead.')
101
101
  update!(status: 'failed')
102
102
  publish_event('import_row.failed')
103
103
  true
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  # Constant alias for the legacy Spree::InventoryUnit, renamed to
3
- # Spree::FulfillmentItem in 6.0. Remove in 6.1.
3
+ # Spree::FulfillmentItem in 6.0. Remove in 6.3.
4
4
  InventoryUnit = FulfillmentItem
5
5
  end
@@ -76,15 +76,19 @@ module Spree
76
76
  expires_at < Time.current
77
77
  end
78
78
 
79
- # @deprecated Call Spree.invitation_accept_workflow — removed in 6.1.
79
+ # @deprecated Call Spree.invitation_accept_workflow — removed in 6.3.
80
80
  def accept
81
- Spree::Deprecation.warn('Spree::Invitation#accept is deprecated and will be removed in Spree 6.1. Call Spree.invitation_accept_workflow instead.')
81
+ Spree::Deprecation.warn(
82
+ 'Spree::Invitation#accept is deprecated and will be removed in Spree 6.3. Call Spree.invitation_accept_workflow instead.'
83
+ )
82
84
  Spree.invitation_accept_workflow.call(invitation: self).success?
83
85
  end
84
86
 
85
- # @deprecated Call Spree.invitation_accept_workflow — removed in 6.1.
87
+ # @deprecated Call Spree.invitation_accept_workflow — removed in 6.3.
86
88
  def accept!
87
- Spree::Deprecation.warn('Spree::Invitation#accept! is deprecated and will be removed in Spree 6.1. Call Spree.invitation_accept_workflow instead.')
89
+ Spree::Deprecation.warn(
90
+ 'Spree::Invitation#accept! is deprecated and will be removed in Spree 6.3. Call Spree.invitation_accept_workflow instead.'
91
+ )
88
92
  result = Spree.invitation_accept_workflow.call(invitation: self)
89
93
 
90
94
  if result.failure?
@@ -106,15 +106,15 @@ module Spree
106
106
  # (admin add-to-this-fulfillment flows).
107
107
  attr_accessor :target_fulfillment
108
108
 
109
- # @deprecated Use {#target_fulfillment}; removed in 6.1.
109
+ # @deprecated Use {#target_fulfillment}; removed in 6.3.
110
110
  def target_shipment
111
- Spree::Deprecation.warn('Spree::LineItem#target_shipment is deprecated and will be removed in Spree 6.1. Use #target_fulfillment instead.')
111
+ Spree::Deprecation.warn('Spree::LineItem#target_shipment is deprecated and will be removed in Spree 6.3. Use #target_fulfillment instead.')
112
112
  target_fulfillment
113
113
  end
114
114
 
115
- # @deprecated Use {#target_fulfillment=}; removed in 6.1.
115
+ # @deprecated Use {#target_fulfillment=}; removed in 6.3.
116
116
  def target_shipment=(value)
117
- Spree::Deprecation.warn('Spree::LineItem#target_shipment= is deprecated and will be removed in Spree 6.1. Use #target_fulfillment= instead.')
117
+ Spree::Deprecation.warn('Spree::LineItem#target_shipment= is deprecated and will be removed in Spree 6.3. Use #target_fulfillment= instead.')
118
118
  self.target_fulfillment = value
119
119
  end
120
120
 
@@ -347,15 +347,17 @@ module Spree
347
347
  end
348
348
  end
349
349
 
350
- # @deprecated Use {#delivery_cost}; removed in 6.1.
350
+ # @deprecated Use {#delivery_cost}; removed in 6.3.
351
351
  def shipping_cost
352
- Spree::Deprecation.warn('Spree::LineItem#shipping_cost is deprecated and will be removed in Spree 6.1. Use #delivery_cost instead.')
352
+ Spree::Deprecation.warn('Spree::LineItem#shipping_cost is deprecated and will be removed in Spree 6.3. Use #delivery_cost instead.')
353
353
  delivery_cost
354
354
  end
355
355
 
356
- # @deprecated Use {#display_delivery_cost}; removed in 6.1.
356
+ # @deprecated Use {#display_delivery_cost}; removed in 6.3.
357
357
  def display_shipping_cost
358
- Spree::Deprecation.warn('Spree::LineItem#display_shipping_cost is deprecated and will be removed in Spree 6.1. Use #display_delivery_cost instead.')
358
+ Spree::Deprecation.warn(
359
+ 'Spree::LineItem#display_shipping_cost is deprecated and will be removed in Spree 6.3. Use #display_delivery_cost instead.'
360
+ )
359
361
  display_delivery_cost
360
362
  end
361
363
 
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  # Merchandising media for commerce entities — product photography, variant
3
3
  # shots, product video. Renamed from Spree::Asset in 6.0; Spree::Asset stays
4
- # readable as a deprecated alias for one release.
4
+ # readable as a deprecated alias until 6.3.
5
5
  class Media < Spree.base_class
6
6
  has_prefix_id :media
7
7
 
@@ -181,7 +181,7 @@ module Spree
181
181
  default_scope { includes(attachment_attachment: :blob, poster_attachment: :blob) }
182
182
 
183
183
  # `type` is a vestige of the old Spree::Image/Spree::Video STI —
184
- # media_type is the discriminator now. The column drops in 6.1.
184
+ # media_type is the discriminator now. The column drops in 6.3.
185
185
  self.inheritance_column = nil
186
186
 
187
187
  store_accessor :metadata, :session_uploaded_assets_uuid
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Spree
4
4
  # Deprecation alias for Spree::CustomField, renamed from Spree::Metafield in
5
- # 6.0. Retained for one release; removed in 6.1.
5
+ # 6.0. Retained until 6.3.
6
6
  #
7
7
  # A plain constant alias rather than a DeprecatedConstantProxy: the proxy
8
8
  # would warn on first reference and name the calling site, but it fails
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Spree
4
4
  # Deprecation alias for Spree::CustomFieldDefinition, renamed from
5
- # Spree::MetafieldDefinition in 6.0. Retained for one release; removed in 6.1.
5
+ # Spree::MetafieldDefinition in 6.0. Retained until 6.3.
6
6
  # A plain constant alias for the same reason as {Spree::Metafield}.
7
7
  #
8
8
  # Note the columns renamed alongside the class: `name` is now `label`,
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Spree
4
4
  # Deprecation bridge for the 6.0 custom-fields rename. Serves the two roles
5
- # the old `Spree::Metafields` name had, and is removed in 6.1:
5
+ # the old `Spree::Metafields` name had, and is removed in 6.3:
6
6
  #
7
7
  # 1. The concern — `include Spree::Metafields` still works and gives a model
8
8
  # the full custom-fields surface via {Spree::HasCustomFields}.
@@ -22,7 +22,7 @@ module Spree
22
22
 
23
23
  included do
24
24
  Spree::Deprecation.warn(
25
- "include Spree::Metafields is deprecated and will be removed in Spree 6.1. " \
25
+ 'include Spree::Metafields is deprecated and will be removed in Spree 6.3. ' \
26
26
  "Use include Spree::HasCustomFields instead (#{name})."
27
27
  )
28
28
 
@@ -23,6 +23,32 @@ module Spree
23
23
  :option_values
24
24
  end
25
25
 
26
+ # The option names and values a write asks for that the store does not
27
+ # offer, matched as `Variant#set_option_value` matches them. A seller
28
+ # builds variants from these and never adds to them.
29
+ #
30
+ # @param store [Spree::Store]
31
+ # @param pairs [Array<Array(String, String)>] option type names and value names
32
+ # @return [Array<Hash>] one `{ name:, value:, option_type: }` per unknown pair;
33
+ # `option_type` is nil when the type itself is unknown
34
+ def self.unknown_options(store, pairs)
35
+ pairs = pairs.map { |name, value| [name.to_s, value.to_s] }.uniq { |name, value| [name.parameterize, value.parameterize] }
36
+ return [] if pairs.empty?
37
+
38
+ option_types = for_store(store).where(name: pairs.map { |name, _| name.parameterize }.uniq).index_by(&:name)
39
+ # Only the values named, not every value of each type: Size can carry hundreds.
40
+ known_values = Spree::OptionValue.where(option_type_id: option_types.values.map(&:id),
41
+ name: pairs.map { |_, value| value.parameterize }.uniq).
42
+ pluck(:option_type_id, :name).to_set
43
+
44
+ pairs.filter_map do |name, value|
45
+ option_type = option_types[name.parameterize]
46
+ next if option_type && known_values.include?([option_type.id, value.parameterize])
47
+
48
+ { name: name, value: value, option_type: option_type }
49
+ end
50
+ end
51
+
26
52
  #
27
53
  # Magic methods
28
54
  #
@@ -76,14 +76,14 @@ module Spree
76
76
  delegate :name, :label, to: :option_type, prefix: true, allow_nil: true
77
77
 
78
78
  # @deprecated The delegated name follows the renamed column since 6.0;
79
- # removed in 6.1.
79
+ # removed in 6.3.
80
80
  alias option_type_presentation option_type_label
81
81
 
82
82
  # Using map here instead of pluck, as these values are translatable via Mobility gem
83
83
  # @deprecated Legacy Tom Select helper for the removed Rails admin. No replacement.
84
84
  # @return [Array<Hash>]
85
85
  def self.to_tom_select_json
86
- Spree::Deprecation.warn('Spree::OptionValue.to_tom_select_json is deprecated and will be removed in Spree 6.1.')
86
+ Spree::Deprecation.warn('Spree::OptionValue.to_tom_select_json is deprecated and will be removed in Spree 6.3.')
87
87
 
88
88
  all.map do |ov|
89
89
  {
@@ -97,7 +97,7 @@ module Spree
97
97
  # @deprecated No replacement, build the label in the presentation layer instead.
98
98
  # @return [String]
99
99
  def display_presentation
100
- Spree::Deprecation.warn('Spree::OptionValue#display_presentation is deprecated and will be removed in Spree 6.1.')
100
+ Spree::Deprecation.warn('Spree::OptionValue#display_presentation is deprecated and will be removed in Spree 6.3.')
101
101
 
102
102
  @display_presentation ||= "#{option_type.label}: #{label}"
103
103
  end