spree_core 6.0.1 → 6.0.3
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.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/app/jobs/spree/addresses/geocode_address_job.rb +6 -3
- data/app/jobs/spree/variants/remove_line_item_job.rb +5 -0
- data/app/models/concerns/spree/admin_user_methods.rb +23 -0
- data/app/models/concerns/spree/preference_schema.rb +5 -0
- data/app/models/concerns/spree/typed_associations.rb +53 -20
- data/app/models/concerns/spree/user_roles.rb +9 -4
- data/app/models/spree/address.rb +2 -2
- data/app/models/spree/collection.rb +7 -2
- data/app/models/spree/order.rb +4 -2
- data/app/models/spree/order_promotion.rb +3 -1
- data/app/models/spree/payment.rb +16 -1
- data/app/models/spree/payment_method/store_credit.rb +3 -1
- data/app/models/spree/payment_method.rb +14 -1
- data/app/models/spree/payment_source.rb +3 -1
- data/app/models/spree/product.rb +15 -5
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +1 -1
- data/app/models/spree/promotion.rb +11 -3
- data/app/models/spree/promotion_handler/cart.rb +7 -1
- data/app/models/spree/promotion_handler/coupon.rb +1 -29
- data/app/models/spree/refresh_token.rb +26 -0
- data/app/models/spree/variant.rb +1 -1
- data/app/services/spree/newsletter/subscribe.rb +1 -1
- data/app/services/spree/orders/create_from_cart.rb +6 -2
- data/app/services/spree/promotions/detach_from_owner.rb +72 -0
- data/app/services/spree/stock_reservations/reserve.rb +6 -2
- data/app/tools/spree/agent_tools/create_export.rb +3 -1
- data/app/tools/spree/agent_tools/create_import.rb +1 -0
- data/app/tools/spree/agent_tools/create_media.rb +2 -1
- data/app/tools/spree/agent_tools/create_resource.rb +12 -4
- data/app/tools/spree/agent_tools/delete_resource.rb +12 -4
- data/app/tools/spree/agent_tools/describe_resource.rb +69 -6
- data/app/tools/spree/agent_tools/get_resource.rb +7 -4
- data/app/tools/spree/agent_tools/resource_write.rb +15 -2
- data/app/tools/spree/agent_tools/search_resources.rb +10 -11
- data/app/tools/spree/agent_tools/update_resource.rb +6 -6
- data/app/tools/spree/agent_tools/upload_file.rb +1 -0
- data/app/workflows/spree/carts/complete.rb +4 -1
- data/app/workflows/spree/carts/merge.rb +25 -4
- data/app/workflows/spree/carts/recalculate.rb +5 -1
- data/app/workflows/spree/orders/complete.rb +39 -14
- data/app/workflows/spree/products/activate.rb +7 -2
- data/app/workflows/spree/products/archive.rb +7 -2
- data/app/workflows/spree/products/draft.rb +7 -2
- data/app/workflows/spree/products/status_transition.rb +24 -0
- data/config/locales/en.yml +3 -0
- data/db/migrate/20260809150001_promote_shipping_categories_to_delivery_profiles.rb +15 -6
- data/db/migrate/20261030100001_scope_payment_sources_profile_id_uniqueness_to_payment_method.rb +38 -0
- data/db/migrate/20261031000001_add_last_active_at_to_spree_admin_users.rb +7 -0
- data/db/migrate/20261031100001_delete_orphaned_spree_option_value_variants.rb +10 -0
- data/lib/generators/spree/api_resource/api_resource_generator.rb +35 -3
- data/lib/generators/spree/api_resource/templates/admin_controller.rb.tt +9 -4
- data/lib/generators/spree/api_resource/templates/admin_integration_spec.rb.tt +74 -0
- data/lib/generators/spree/api_resource/templates/store_controller.rb.tt +11 -6
- data/lib/generators/spree/dummy/dummy_generator.rb +0 -1
- data/lib/generators/spree/dummy/templates/rails/database.yml +6 -9
- data/lib/generators/spree/dummy/templates/rails/test.rb +9 -5
- data/lib/generators/spree/dummy_model/templates/migration.rb.tt +1 -1
- data/lib/spree/agent_tool.rb +105 -1
- data/lib/spree/agent_tools/default_catalog.rb +16 -21
- data/lib/spree/agent_tools/legacy_tools.rb +212 -0
- data/lib/spree/agent_tools/operation_catalog.rb +206 -0
- data/lib/spree/agent_tools/operation_tool.rb +189 -0
- data/lib/spree/agent_tools/registry.rb +65 -31
- data/lib/spree/agent_tools/resource_map.rb +128 -5
- data/lib/spree/agent_tools.rb +3 -3
- data/lib/spree/core/dependencies_helper.rb +96 -40
- data/lib/spree/core/engine.rb +2 -1
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/core.rb +19 -5
- data/lib/spree/testing_support/common_rake.rb +3 -2
- data/lib/spree/testing_support/extension_rake.rb +12 -0
- data/lib/spree/testing_support/lifecycle_events.rb +1 -3
- data/lib/spree/upgrades/5_6_to_6_0/manifest.yml +36 -1
- data/lib/tasks/delivery_migration.rake +17 -1
- data/lib/tasks/dependencies.rake +2 -2
- data/lib/tasks/remove_orphan_order_promotions.rake +20 -0
- metadata +19 -69
- data/lib/generators/spree/authentication/dummy/dummy_generator.rb +0 -54
- data/lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt +0 -52
- data/lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt +0 -33
- data/lib/spree/agent_tools/workflow_endpoints.rb +0 -88
- data/lib/spree/agent_tools/workflow_schema.rb +0 -279
- data/lib/spree/agent_tools/workflow_tool.rb +0 -654
data/lib/spree/core/engine.rb
CHANGED
|
@@ -10,6 +10,7 @@ module Spree
|
|
|
10
10
|
:dependencies,
|
|
11
11
|
:payment_methods,
|
|
12
12
|
:adjusters,
|
|
13
|
+
:cart_copiers,
|
|
13
14
|
:media_viewable_types,
|
|
14
15
|
:default_tax_provider,
|
|
15
16
|
:tax_providers,
|
|
@@ -79,7 +80,7 @@ module Spree
|
|
|
79
80
|
%i[subscribers actor_classes commission_rules delivery_method_rules seller_requirements
|
|
80
81
|
delivery_rate_providers tax_providers pricing_providers inventory_providers
|
|
81
82
|
payout_providers digital_asset_providers delivery_profile_types pickup_point_providers
|
|
82
|
-
maintenance_tasks].each do |registry|
|
|
83
|
+
maintenance_tasks cart_copiers].each do |registry|
|
|
83
84
|
app.config.spree[registry] = []
|
|
84
85
|
end
|
|
85
86
|
app.config.spree.line_item_comparison_hooks = Set.new
|
data/lib/spree/core/version.rb
CHANGED
data/lib/spree/core.rb
CHANGED
|
@@ -39,8 +39,6 @@ require 'ransack'
|
|
|
39
39
|
require 'active_storage_validations'
|
|
40
40
|
require 'wannabe_bool'
|
|
41
41
|
require 'geocoder'
|
|
42
|
-
|
|
43
|
-
require 'safely_block'
|
|
44
42
|
require 'ar_lazy_preload'
|
|
45
43
|
require 'sqids'
|
|
46
44
|
|
|
@@ -125,7 +123,6 @@ module Spree
|
|
|
125
123
|
collections: :default,
|
|
126
124
|
stock_location_stock_levels: :default,
|
|
127
125
|
coupon_codes: :default,
|
|
128
|
-
themes: :default,
|
|
129
126
|
addresses: :default,
|
|
130
127
|
gift_cards: :default,
|
|
131
128
|
webhooks: :default,
|
|
@@ -326,6 +323,22 @@ module Spree
|
|
|
326
323
|
# @return [Array<Class>]
|
|
327
324
|
singleton_class.delegate :tax_providers, :tax_providers=, to: :spree_config
|
|
328
325
|
|
|
326
|
+
# Extensions that copy their own cart data onto the order a cart becomes.
|
|
327
|
+
# Each entry is a class with a class-level +call(cart:, order:,
|
|
328
|
+
# line_item_map:)+ (a class, so it is re-resolved when code reloads in
|
|
329
|
+
# development; see {.refresh_provider_registries!}), where the map
|
|
330
|
+
# pairs each cart line item with its copy on the order. Both copies run them
|
|
331
|
+
# — checkout ({Spree::Carts::Complete}) and the draft-order copy
|
|
332
|
+
# ({Spree::Orders::CreateFromCart}) — inside their transaction, once the
|
|
333
|
+
# order's line items exist, so an entry that raises rolls the order back.
|
|
334
|
+
#
|
|
335
|
+
# Append, never assign, so an extension does not drop what another added:
|
|
336
|
+
#
|
|
337
|
+
# Spree.cart_copiers << MyApp::CopyEngravings
|
|
338
|
+
#
|
|
339
|
+
# @return [Array<Class>]
|
|
340
|
+
singleton_class.delegate :cart_copiers, :cart_copiers=, to: :spree_config
|
|
341
|
+
|
|
329
342
|
# Pricing engines a store can be pointed at. Connector gems append their own,
|
|
330
343
|
# so a merchant picks from what is actually installed.
|
|
331
344
|
#
|
|
@@ -403,7 +416,8 @@ module Spree
|
|
|
403
416
|
def self.refresh_provider_registries!
|
|
404
417
|
[Rails.application.config.spree.delivery_rate_providers,
|
|
405
418
|
Rails.application.config.spree.fulfillment_providers,
|
|
406
|
-
Rails.application.config.spree.pickup_point_providers
|
|
419
|
+
Rails.application.config.spree.pickup_point_providers,
|
|
420
|
+
Rails.application.config.spree.cart_copiers].compact.each do |registry|
|
|
407
421
|
registry.map! { |entry| entry.is_a?(Module) && entry.name ? entry.name.constantize : entry }
|
|
408
422
|
end
|
|
409
423
|
end
|
|
@@ -606,7 +620,7 @@ module Spree
|
|
|
606
620
|
def core_dependency?(name)
|
|
607
621
|
return false unless defined?(Spree::Dependencies)
|
|
608
622
|
|
|
609
|
-
Spree::Dependencies.
|
|
623
|
+
Spree::Dependencies.injection_point?(name) ||
|
|
610
624
|
Spree::Dependencies.class::LEGACY_WORKFLOW_KEYS.key?(name) ||
|
|
611
625
|
Spree::Dependencies.class::LEGACY_SERVICE_KEYS.key?(name) ||
|
|
612
626
|
Spree::Dependencies.class::RENAMED_SERVICE_KEYS.key?(name)
|
|
@@ -3,11 +3,12 @@ require 'generators/spree/dummy_model/dummy_model_generator'
|
|
|
3
3
|
|
|
4
4
|
desc 'Generates a dummy app for testing'
|
|
5
5
|
namespace :common do
|
|
6
|
+
# :authentication is ignored (test apps use the gem-owned auth models); it stays
|
|
7
|
+
# so extensions passing positional arguments keep working.
|
|
6
8
|
task :test_app, [:authentication, :user_class, :admin_user_class] do |_t, args|
|
|
7
9
|
# Support both Rake::TaskArguments (via invoke) and Hash (via execute)
|
|
8
10
|
# When using execute with a Hash, args IS the hash directly
|
|
9
11
|
defaults = {
|
|
10
|
-
authentication: 'dummy',
|
|
11
12
|
user_class: 'Spree::Customer',
|
|
12
13
|
admin_user_class: 'Spree::AdminUser',
|
|
13
14
|
}
|
|
@@ -45,7 +46,7 @@ namespace :common do
|
|
|
45
46
|
File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
|
|
46
47
|
bundle_exec = use_root_gemfile ? "bundle exec --gemfile=#{root_gemfile}" : 'bundle exec'
|
|
47
48
|
puts 'Running Spree install generator...'
|
|
48
|
-
system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]}
|
|
49
|
+
system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]}")
|
|
49
50
|
|
|
50
51
|
unless ENV['NO_MIGRATE']
|
|
51
52
|
puts 'Setting up dummy database...'
|
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
require 'spree/testing_support/common_rake'
|
|
2
2
|
|
|
3
|
+
# `rake spree:openapi:generate` writes the extension's openapi/*.yaml from its
|
|
4
|
+
# rswag specs, and `rake spree:sdk:serializer_types` the response types of a
|
|
5
|
+
# package that extends the SDKs (both run by `spree sdk generate`).
|
|
6
|
+
begin
|
|
7
|
+
require 'spree/api/testing_support/openapi_tasks'
|
|
8
|
+
require 'spree/api/sdk_types_task'
|
|
9
|
+
Spree::Api::SdkTypesTask.new
|
|
10
|
+
rescue LoadError
|
|
11
|
+
# An extension without spree_api has no API to document. These files load
|
|
12
|
+
# nothing else, so this is the only thing that can be missing.
|
|
13
|
+
end
|
|
14
|
+
|
|
3
15
|
desc 'Generates a dummy app for testing an extension'
|
|
4
16
|
namespace :extension do
|
|
5
17
|
task :test_app, [:options] do |_t, args|
|
|
@@ -23,9 +23,7 @@ shared_examples_for 'lifecycle events' do |factory: nil, event_prefix: nil|
|
|
|
23
23
|
|
|
24
24
|
# update_attribute, not update!: Spree::Fulfillment#update! shadows the
|
|
25
25
|
# Active Record method with the legacy state-recalculation API.
|
|
26
|
-
|
|
27
|
-
record.update_attribute(:updated_at, Time.current)
|
|
28
|
-
end
|
|
26
|
+
record.update_attribute(:updated_at, 1.minute.from_now)
|
|
29
27
|
end
|
|
30
28
|
|
|
31
29
|
it 'does not publish updated event on a bare touch' do
|
|
@@ -212,7 +212,8 @@ steps:
|
|
|
212
212
|
task: "spree:migrate_shipping_to_delivery"
|
|
213
213
|
notes: |
|
|
214
214
|
Rewrites stored 'Spree::Shipment' class-name strings (state changes,
|
|
215
|
-
stock movements, legacy adjustments)
|
|
215
|
+
stock movements, legacy adjustments) and the calculators' 'Spree::ShippingMethod'
|
|
216
|
+
calculable type (so delivery methods find their calculator), renames the terminal fulfillment
|
|
216
217
|
status 'shipped' -> 'fulfilled', backfills the fulfillment provider on
|
|
217
218
|
delivery methods (DigitalDelivery calculators become the Digital
|
|
218
219
|
provider) and copies the provider-derived type onto existing
|
|
@@ -661,6 +662,40 @@ steps:
|
|
|
661
662
|
hold a secret are skipped, and the legacy tables stay in place as a
|
|
662
663
|
rollback path until they are dropped in 6.1.
|
|
663
664
|
|
|
665
|
+
- id: migrate_paypal_payments
|
|
666
|
+
name: "Give PayPal payments taken before 6.0 the PayPal order id"
|
|
667
|
+
task_class: "SpreePaypalCheckout::MaintenanceTasks::MigratePayments"
|
|
668
|
+
optional: true
|
|
669
|
+
notes: |
|
|
670
|
+
Only runs when spree_paypal_checkout is installed; skipped otherwise.
|
|
671
|
+
|
|
672
|
+
The 0.x gem stored a PayPal payment's capture id as its response code.
|
|
673
|
+
In 6.0 the response code is always the PayPal order id, which is how a
|
|
674
|
+
payment session finds its payment, and the capture id lives in the
|
|
675
|
+
payment's metadata. This step rewrites each older payment to that shape,
|
|
676
|
+
finding its order through the payment session that took it or, for the
|
|
677
|
+
older checkout flow, through spree_paypal_checkout_orders.
|
|
678
|
+
|
|
679
|
+
Run it before dropping spree_paypal_checkout_orders: that table is the
|
|
680
|
+
only link from those older payments to their PayPal order. A payment it
|
|
681
|
+
cannot match is logged by id, counted, and left as it was; refund it in
|
|
682
|
+
PayPal. Supports a dry run, and is idempotent.
|
|
683
|
+
|
|
684
|
+
- id: register_paypal_webhooks
|
|
685
|
+
name: "Register each PayPal payment method's webhook"
|
|
686
|
+
task: "spree:upgrade:register_paypal_webhooks"
|
|
687
|
+
optional: true
|
|
688
|
+
notes: |
|
|
689
|
+
Only runs when spree_paypal_checkout is installed; skipped otherwise.
|
|
690
|
+
|
|
691
|
+
PayPal webhooks register themselves in 6.0 and are always verified with
|
|
692
|
+
the webhook's id. This finds or creates the webhook for each PayPal
|
|
693
|
+
method's URL, replaces the events of one created by hand under the 0.x
|
|
694
|
+
guide, and stores its id. Until it runs, methods created before the
|
|
695
|
+
upgrade reject every webhook delivery.
|
|
696
|
+
|
|
697
|
+
Idempotent.
|
|
698
|
+
|
|
664
699
|
- id: backfill_import_export_tenancy
|
|
665
700
|
name: "Place every import in a store, and a seller where one ran it"
|
|
666
701
|
task: "spree:upgrade:backfill_import_export_tenancy"
|
|
@@ -29,6 +29,11 @@ namespace :spree do
|
|
|
29
29
|
say.call "spree_adjustments.adjustable_type: #{count} rows Spree::Shipment → Spree::Fulfillment"
|
|
30
30
|
end
|
|
31
31
|
|
|
32
|
+
# Calculators are polymorphic on the renamed shipping method; without this
|
|
33
|
+
# DeliveryMethod#calculator finds nothing.
|
|
34
|
+
count = Spree::Calculator.where(calculable_type: 'Spree::ShippingMethod').in_batches(of: batch_size).update_all(calculable_type: 'Spree::DeliveryMethod')
|
|
35
|
+
say.call "spree_calculators.calculable_type: #{count} rows Spree::ShippingMethod → Spree::DeliveryMethod"
|
|
36
|
+
|
|
32
37
|
# The name column distinguishes the machine ('shipment' rows become
|
|
33
38
|
# 'fulfillment'); the recorded states keep their history except the
|
|
34
39
|
# renamed terminal value.
|
|
@@ -171,6 +176,11 @@ namespace :spree do
|
|
|
171
176
|
end
|
|
172
177
|
end
|
|
173
178
|
|
|
179
|
+
# 5.x methods have no store until backfill_delivery_and_stock_store_ids
|
|
180
|
+
# runs (later in the upgrade), and a DeliveryZone requires one. Resolve
|
|
181
|
+
# them to the default store, exactly as that backfill will.
|
|
182
|
+
default_store_id = Spree::Store.default&.id
|
|
183
|
+
|
|
174
184
|
legacy_zones.find_each do |zone|
|
|
175
185
|
if Spree::DeliveryZone.exists?(id: zone.id) && !migrated.value?(zone.id)
|
|
176
186
|
puts "SKIP zone #{zone.id} (#{zone.name}): a DeliveryZone with the same id already exists — resolve manually"
|
|
@@ -178,7 +188,7 @@ namespace :spree do
|
|
|
178
188
|
end
|
|
179
189
|
|
|
180
190
|
methods_by_home = Spree::DeliveryMethod.unscoped.where(delivery_zone_id: zone.id).
|
|
181
|
-
group_by { |method| [method.store_id, method.delivery_profile_id] }
|
|
191
|
+
group_by { |method| [method.store_id || default_store_id, method.delivery_profile_id] }
|
|
182
192
|
|
|
183
193
|
methods_by_home.each do |(store_id, profile_id), methods|
|
|
184
194
|
profile_id ||= Spree::DeliveryProfile.where(store_id: store_id, default: true).pick(:id)
|
|
@@ -208,6 +218,12 @@ namespace :spree do
|
|
|
208
218
|
puts "SKIP unreferenced shipping zone #{zone.id} (#{zone.name}) — no delivery method uses it"
|
|
209
219
|
end
|
|
210
220
|
|
|
221
|
+
zoneless = Spree::DeliveryMethod.unscoped.where(delivery_zone_id: nil).pluck(:id, :name)
|
|
222
|
+
if zoneless.any?
|
|
223
|
+
puts "WARNING: #{zoneless.size} delivery methods have no delivery zone and return no rates at checkout. Assign a zone to each in the admin:"
|
|
224
|
+
zoneless.each { |id, name| puts " - ##{id} #{name}" }
|
|
225
|
+
end
|
|
226
|
+
|
|
211
227
|
puts 'migrate_zones_to_delivery_zones done. Tax-scoped zones stay on Spree::Zone for the tax provider migration.'
|
|
212
228
|
end
|
|
213
229
|
end
|
data/lib/tasks/dependencies.rake
CHANGED
|
@@ -42,7 +42,7 @@ namespace :spree do
|
|
|
42
42
|
puts "\n[#{name}]"
|
|
43
43
|
|
|
44
44
|
# Calculate max width for alignment
|
|
45
|
-
max_name_width = deps.
|
|
45
|
+
max_name_width = deps.injection_points.map(&:length).max
|
|
46
46
|
|
|
47
47
|
deps.current_values.each do |dep|
|
|
48
48
|
status = dep[:overridden] ? ' [OVERRIDDEN]' : ''
|
|
@@ -63,7 +63,7 @@ namespace :spree do
|
|
|
63
63
|
|
|
64
64
|
def validate_dependencies(name, deps)
|
|
65
65
|
errors = []
|
|
66
|
-
deps.
|
|
66
|
+
deps.injection_points.each do |point|
|
|
67
67
|
deps.send("#{point}_class")
|
|
68
68
|
print "\e[32m.\e[0m"
|
|
69
69
|
rescue NameError => e
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
# Deleting a promotion used to leave OrderPromotion rows on open carts pointing
|
|
4
|
+
# at a promotion that no longer exists, which broke loading those carts.
|
|
5
|
+
namespace :spree do
|
|
6
|
+
desc 'Remove order promotions whose promotion no longer exists and recalculate the affected carts'
|
|
7
|
+
task remove_orphan_order_promotions: :environment do
|
|
8
|
+
orphans = Spree::OrderPromotion.where.not(promotion_id: Spree::Promotion.unscoped.select(:id))
|
|
9
|
+
removed = 0
|
|
10
|
+
|
|
11
|
+
orphans.find_each do |order_promotion|
|
|
12
|
+
owner = order_promotion.owner
|
|
13
|
+
order_promotion.destroy
|
|
14
|
+
owner&.recalculate_totals! if owner.is_a?(Spree::Cart)
|
|
15
|
+
removed += 1
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
puts "remove_orphan_order_promotions done. removed: #{removed}"
|
|
19
|
+
end
|
|
20
|
+
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.0.
|
|
4
|
+
version: 6.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2026-
|
|
13
|
+
date: 2026-11-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: i18n-tasks
|
|
@@ -66,14 +66,14 @@ dependencies:
|
|
|
66
66
|
requirements:
|
|
67
67
|
- - "~>"
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version: '
|
|
69
|
+
version: '4.0'
|
|
70
70
|
type: :runtime
|
|
71
71
|
prerelease: false
|
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
73
73
|
requirements:
|
|
74
74
|
- - "~>"
|
|
75
75
|
- !ruby/object:Gem::Version
|
|
76
|
-
version: '
|
|
76
|
+
version: '4.0'
|
|
77
77
|
- !ruby/object:Gem::Dependency
|
|
78
78
|
name: acts-as-taggable-on
|
|
79
79
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -108,20 +108,6 @@ dependencies:
|
|
|
108
108
|
- - ">="
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: 3.3.1
|
|
111
|
-
- !ruby/object:Gem::Dependency
|
|
112
|
-
name: benchmark
|
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
|
114
|
-
requirements:
|
|
115
|
-
- - ">="
|
|
116
|
-
- !ruby/object:Gem::Version
|
|
117
|
-
version: '0'
|
|
118
|
-
type: :runtime
|
|
119
|
-
prerelease: false
|
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
121
|
-
requirements:
|
|
122
|
-
- - ">="
|
|
123
|
-
- !ruby/object:Gem::Version
|
|
124
|
-
version: '0'
|
|
125
111
|
- !ruby/object:Gem::Dependency
|
|
126
112
|
name: cancancan
|
|
127
113
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -198,26 +184,6 @@ dependencies:
|
|
|
198
184
|
- - ">="
|
|
199
185
|
- !ruby/object:Gem::Version
|
|
200
186
|
version: '0'
|
|
201
|
-
- !ruby/object:Gem::Dependency
|
|
202
|
-
name: highline
|
|
203
|
-
requirement: !ruby/object:Gem::Requirement
|
|
204
|
-
requirements:
|
|
205
|
-
- - ">="
|
|
206
|
-
- !ruby/object:Gem::Version
|
|
207
|
-
version: '2'
|
|
208
|
-
- - "<"
|
|
209
|
-
- !ruby/object:Gem::Version
|
|
210
|
-
version: '4'
|
|
211
|
-
type: :runtime
|
|
212
|
-
prerelease: false
|
|
213
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
214
|
-
requirements:
|
|
215
|
-
- - ">="
|
|
216
|
-
- !ruby/object:Gem::Version
|
|
217
|
-
version: '2'
|
|
218
|
-
- - "<"
|
|
219
|
-
- !ruby/object:Gem::Version
|
|
220
|
-
version: '4'
|
|
221
187
|
- !ruby/object:Gem::Dependency
|
|
222
188
|
name: json
|
|
223
189
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -443,7 +409,7 @@ dependencies:
|
|
|
443
409
|
- !ruby/object:Gem::Version
|
|
444
410
|
version: '1.5'
|
|
445
411
|
- !ruby/object:Gem::Dependency
|
|
446
|
-
name:
|
|
412
|
+
name: stringex
|
|
447
413
|
requirement: !ruby/object:Gem::Requirement
|
|
448
414
|
requirements:
|
|
449
415
|
- - ">="
|
|
@@ -457,7 +423,7 @@ dependencies:
|
|
|
457
423
|
- !ruby/object:Gem::Version
|
|
458
424
|
version: '0'
|
|
459
425
|
- !ruby/object:Gem::Dependency
|
|
460
|
-
name:
|
|
426
|
+
name: ostruct
|
|
461
427
|
requirement: !ruby/object:Gem::Requirement
|
|
462
428
|
requirements:
|
|
463
429
|
- - ">="
|
|
@@ -608,26 +574,6 @@ dependencies:
|
|
|
608
574
|
- - ">="
|
|
609
575
|
- !ruby/object:Gem::Version
|
|
610
576
|
version: '0'
|
|
611
|
-
- !ruby/object:Gem::Dependency
|
|
612
|
-
name: safely_block
|
|
613
|
-
requirement: !ruby/object:Gem::Requirement
|
|
614
|
-
requirements:
|
|
615
|
-
- - ">="
|
|
616
|
-
- !ruby/object:Gem::Version
|
|
617
|
-
version: '0.4'
|
|
618
|
-
- - "<"
|
|
619
|
-
- !ruby/object:Gem::Version
|
|
620
|
-
version: '2.0'
|
|
621
|
-
type: :runtime
|
|
622
|
-
prerelease: false
|
|
623
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
624
|
-
requirements:
|
|
625
|
-
- - ">="
|
|
626
|
-
- !ruby/object:Gem::Version
|
|
627
|
-
version: '0.4'
|
|
628
|
-
- - "<"
|
|
629
|
-
- !ruby/object:Gem::Version
|
|
630
|
-
version: '2.0'
|
|
631
577
|
- !ruby/object:Gem::Dependency
|
|
632
578
|
name: phonelib
|
|
633
579
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1436,6 +1382,7 @@ files:
|
|
|
1436
1382
|
- app/services/spree/products/duplicator.rb
|
|
1437
1383
|
- app/services/spree/products/for_context.rb
|
|
1438
1384
|
- app/services/spree/products/select_buy_box.rb
|
|
1385
|
+
- app/services/spree/promotions/detach_from_owner.rb
|
|
1439
1386
|
- app/services/spree/purchases/amount_due_at_checkout.rb
|
|
1440
1387
|
- app/services/spree/returns/eligibility_validator.rb
|
|
1441
1388
|
- app/services/spree/sample_data/helper.rb
|
|
@@ -1617,6 +1564,7 @@ files:
|
|
|
1617
1564
|
- app/workflows/spree/products/nested_attributes.rb
|
|
1618
1565
|
- app/workflows/spree/products/propose.rb
|
|
1619
1566
|
- app/workflows/spree/products/reject.rb
|
|
1567
|
+
- app/workflows/spree/products/status_transition.rb
|
|
1620
1568
|
- app/workflows/spree/products/update.rb
|
|
1621
1569
|
- app/workflows/spree/purchase_orders/cancel.rb
|
|
1622
1570
|
- app/workflows/spree/purchase_orders/close.rb
|
|
@@ -2029,6 +1977,9 @@ files:
|
|
|
2029
1977
|
- db/migrate/20261022000001_store_credit_actor_polymorphic.rb
|
|
2030
1978
|
- db/migrate/20261023100001_add_deactivated_at_to_spree_admin_users.rb
|
|
2031
1979
|
- db/migrate/20261029100001_add_lockout_columns_to_spree_admin_users.rb
|
|
1980
|
+
- db/migrate/20261030100001_scope_payment_sources_profile_id_uniqueness_to_payment_method.rb
|
|
1981
|
+
- db/migrate/20261031000001_add_last_active_at_to_spree_admin_users.rb
|
|
1982
|
+
- db/migrate/20261031100001_delete_orphaned_spree_option_value_variants.rb
|
|
2032
1983
|
- db/sample_data/channels.rb
|
|
2033
1984
|
- db/sample_data/collections.rb
|
|
2034
1985
|
- db/sample_data/custom_field_definitions.rb
|
|
@@ -2051,6 +2002,7 @@ files:
|
|
|
2051
2002
|
- lib/generators/spree/api_resource/api_resource_generator.rb
|
|
2052
2003
|
- lib/generators/spree/api_resource/templates/admin_controller.rb.tt
|
|
2053
2004
|
- lib/generators/spree/api_resource/templates/admin_controller_spec.rb.tt
|
|
2005
|
+
- lib/generators/spree/api_resource/templates/admin_integration_spec.rb.tt
|
|
2054
2006
|
- lib/generators/spree/api_resource/templates/admin_serializer.rb.tt
|
|
2055
2007
|
- lib/generators/spree/api_resource/templates/factory.rb.tt
|
|
2056
2008
|
- lib/generators/spree/api_resource/templates/permissions.en.yml.tt
|
|
@@ -2058,9 +2010,6 @@ files:
|
|
|
2058
2010
|
- lib/generators/spree/api_resource/templates/store_controller.rb.tt
|
|
2059
2011
|
- lib/generators/spree/api_resource/templates/store_controller_spec.rb.tt
|
|
2060
2012
|
- lib/generators/spree/api_resource/templates/store_serializer.rb.tt
|
|
2061
|
-
- lib/generators/spree/authentication/dummy/dummy_generator.rb
|
|
2062
|
-
- lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt
|
|
2063
|
-
- lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt
|
|
2064
2013
|
- lib/generators/spree/controller_decorator/controller_decorator_generator.rb
|
|
2065
2014
|
- lib/generators/spree/controller_decorator/templates/controller_decorator.rb.tt
|
|
2066
2015
|
- lib/generators/spree/dummy/dummy_generator.rb
|
|
@@ -2086,13 +2035,13 @@ files:
|
|
|
2086
2035
|
- lib/spree/agent_tools/api_dispatch.rb
|
|
2087
2036
|
- lib/spree/agent_tools/context.rb
|
|
2088
2037
|
- lib/spree/agent_tools/default_catalog.rb
|
|
2038
|
+
- lib/spree/agent_tools/legacy_tools.rb
|
|
2089
2039
|
- lib/spree/agent_tools/membership_map.rb
|
|
2040
|
+
- lib/spree/agent_tools/operation_catalog.rb
|
|
2041
|
+
- lib/spree/agent_tools/operation_tool.rb
|
|
2090
2042
|
- lib/spree/agent_tools/record_summary.rb
|
|
2091
2043
|
- lib/spree/agent_tools/registry.rb
|
|
2092
2044
|
- lib/spree/agent_tools/resource_map.rb
|
|
2093
|
-
- lib/spree/agent_tools/workflow_endpoints.rb
|
|
2094
|
-
- lib/spree/agent_tools/workflow_schema.rb
|
|
2095
|
-
- lib/spree/agent_tools/workflow_tool.rb
|
|
2096
2045
|
- lib/spree/category_permalink_deduplicator.rb
|
|
2097
2046
|
- lib/spree/checkout/default_requirements.rb
|
|
2098
2047
|
- lib/spree/checkout/registry.rb
|
|
@@ -2363,6 +2312,7 @@ files:
|
|
|
2363
2312
|
- lib/tasks/products.rake
|
|
2364
2313
|
- lib/tasks/publications.rake
|
|
2365
2314
|
- lib/tasks/remove_master_variant.rake
|
|
2315
|
+
- lib/tasks/remove_orphan_order_promotions.rake
|
|
2366
2316
|
- lib/tasks/rich_text.rake
|
|
2367
2317
|
- lib/tasks/sample_data.rake
|
|
2368
2318
|
- lib/tasks/search.rake
|
|
@@ -2400,9 +2350,9 @@ licenses:
|
|
|
2400
2350
|
- BSD-3-Clause
|
|
2401
2351
|
metadata:
|
|
2402
2352
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
|
2403
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.
|
|
2404
|
-
documentation_uri: https://
|
|
2405
|
-
source_code_uri: https://github.com/spree/spree/tree/v6.0.
|
|
2353
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.3
|
|
2354
|
+
documentation_uri: https://spreecommerce.org/docs/
|
|
2355
|
+
source_code_uri: https://github.com/spree/spree/tree/v6.0.3
|
|
2406
2356
|
post_install_message:
|
|
2407
2357
|
rdoc_options: []
|
|
2408
2358
|
require_paths:
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
require 'rails/generators'
|
|
2
|
-
|
|
3
|
-
module Spree
|
|
4
|
-
module Authentication
|
|
5
|
-
class DummyGenerator < Rails::Generators::Base
|
|
6
|
-
desc 'Set up a Spree installation with dummy authentication for testing. Creates a separate spree_admin_users table.'
|
|
7
|
-
|
|
8
|
-
def self.source_paths
|
|
9
|
-
paths = superclass.source_paths
|
|
10
|
-
paths << File.expand_path('templates', __dir__)
|
|
11
|
-
paths.flatten
|
|
12
|
-
end
|
|
13
|
-
|
|
14
|
-
def create_authentication_helpers
|
|
15
|
-
template 'authentication_helpers.rb.tt', 'lib/spree/authentication_helpers.rb'
|
|
16
|
-
end
|
|
17
|
-
|
|
18
|
-
def configure_authentication_helpers
|
|
19
|
-
file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
|
|
20
|
-
send(file_action, 'config/initializers/spree.rb') do
|
|
21
|
-
<<~RUBY
|
|
22
|
-
|
|
23
|
-
Rails.application.config.to_prepare do
|
|
24
|
-
require_dependency 'spree/authentication_helpers'
|
|
25
|
-
end
|
|
26
|
-
RUBY
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def create_admin_users_migration
|
|
31
|
-
# Use a fixed early timestamp (20210913) to ensure this migration runs BEFORE
|
|
32
|
-
# any Spree core migrations that reference spree_admin_users table.
|
|
33
|
-
# The earliest such migration is 20250122113708_add_first_and_last_name_to_spree_admin_class.rb
|
|
34
|
-
# We use a timestamp before the main Spree migration (20210914000000_spree_four_three.rb)
|
|
35
|
-
migration_file = File.join('db', 'migrate', '20210913000000_create_spree_admin_users.rb')
|
|
36
|
-
|
|
37
|
-
# Skip if migration already exists
|
|
38
|
-
return if File.exist?(migration_file) || migration_exists?('create_spree_admin_users')
|
|
39
|
-
|
|
40
|
-
template 'create_spree_admin_users.rb.tt', migration_file
|
|
41
|
-
end
|
|
42
|
-
|
|
43
|
-
private
|
|
44
|
-
|
|
45
|
-
def migration_exists?(name)
|
|
46
|
-
Dir.glob(File.join('db', 'migrate', "*_#{name}.rb")).any?
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
def migration_version
|
|
50
|
-
"[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
|
|
51
|
-
end
|
|
52
|
-
end
|
|
53
|
-
end
|
|
54
|
-
end
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
# Dummy authentication helpers for testing purposes.
|
|
2
|
-
# These provide stub implementations that don't require actual routes.
|
|
3
|
-
module Spree
|
|
4
|
-
module AuthenticationHelpers
|
|
5
|
-
def self.included(receiver)
|
|
6
|
-
receiver.helper_method(
|
|
7
|
-
:spree_current_user,
|
|
8
|
-
:spree_login_path,
|
|
9
|
-
:spree_signup_path,
|
|
10
|
-
:spree_logout_path,
|
|
11
|
-
:spree_forgot_password_path,
|
|
12
|
-
:spree_edit_password_path,
|
|
13
|
-
:spree_admin_login_path,
|
|
14
|
-
:spree_admin_logout_path
|
|
15
|
-
)
|
|
16
|
-
end
|
|
17
|
-
|
|
18
|
-
def spree_current_user
|
|
19
|
-
@spree_current_user
|
|
20
|
-
end
|
|
21
|
-
|
|
22
|
-
def spree_login_path(_opts = {})
|
|
23
|
-
'/login'
|
|
24
|
-
end
|
|
25
|
-
|
|
26
|
-
def spree_signup_path(_opts = {})
|
|
27
|
-
'/signup'
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def spree_logout_path(_opts = {})
|
|
31
|
-
'/logout'
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
def spree_forgot_password_path(_opts = {})
|
|
35
|
-
'/forgot_password'
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
def spree_edit_password_path(_opts = {})
|
|
39
|
-
'/edit_password'
|
|
40
|
-
end
|
|
41
|
-
|
|
42
|
-
def spree_admin_login_path(_opts = {})
|
|
43
|
-
'/admin/login'
|
|
44
|
-
end
|
|
45
|
-
|
|
46
|
-
def spree_admin_logout_path(_opts = {})
|
|
47
|
-
'/admin/logout'
|
|
48
|
-
end
|
|
49
|
-
end
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
class CreateSpreeAdminUsers < ActiveRecord::Migration<%= migration_version %>
|
|
2
|
-
def change
|
|
3
|
-
create_table :spree_admin_users do |t|
|
|
4
|
-
t.string :encrypted_password, limit: 128
|
|
5
|
-
t.string :password_digest
|
|
6
|
-
t.string :email
|
|
7
|
-
t.string :remember_token
|
|
8
|
-
t.string :persistence_token
|
|
9
|
-
t.string :reset_password_token
|
|
10
|
-
t.string :perishable_token
|
|
11
|
-
t.integer :sign_in_count, default: 0, null: false
|
|
12
|
-
t.integer :failed_attempts, default: 0, null: false
|
|
13
|
-
t.datetime :last_request_at
|
|
14
|
-
t.datetime :current_sign_in_at
|
|
15
|
-
t.datetime :last_sign_in_at
|
|
16
|
-
t.string :current_sign_in_ip
|
|
17
|
-
t.string :last_sign_in_ip
|
|
18
|
-
t.string :login
|
|
19
|
-
t.string :authentication_token
|
|
20
|
-
t.string :unlock_token
|
|
21
|
-
t.datetime :locked_at
|
|
22
|
-
t.datetime :remember_created_at
|
|
23
|
-
t.datetime :reset_password_sent_at
|
|
24
|
-
t.string :first_name
|
|
25
|
-
t.string :last_name
|
|
26
|
-
t.string :selected_locale
|
|
27
|
-
|
|
28
|
-
t.timestamps
|
|
29
|
-
end
|
|
30
|
-
|
|
31
|
-
add_index :spree_admin_users, :email, unique: true
|
|
32
|
-
end
|
|
33
|
-
end
|