Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix review findings from the delivery cascade and owner work
Damian Legawiec50daa65ef526
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.jsonindex 6ba9a5418d..d4cae3d831 100644--- a/packages/dashboard/src/locales/ar.json+++ b/packages/dashboard/src/locales/ar.json@@ -530,7 +530,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "هل تريد حذف \"{{name}}\"؟ انقل مناطقها وطرقها إلى مجموعة أخرى أولاً.",+ "message": "حذف \"{{name}}\"؟ سيتم حذف المناطق وطرق التوصيل معها.","title": "حذف مجموعة المصادر"},"edit_description": "أعد تسمية هذه المجموعة أو غيّر المواقع التي تشحن منها.",@@ -557,7 +557,7 @@"create_description": "اجمع الدول أو الولايات أو الرموز البريدية في منطقة تخدمها طرق التوصيل.","create_label": "إنشاء منطقة التوصيل","delete_confirm": {- "message": "حذف \"{{name}}\"؟ لن تطابق طرق التوصيل المستخدمة لها هذه المناطق بعد الآن.",+ "message": "حذف \"{{name}}\"؟ سيتم حذف طرق التوصيل المرتبطة بها معها.","title": "حذف منطقة التوصيل"},"edit_description": "الأعضاء أدناه يستبدلون قائمة أعضاء المنطقة كاملة عند الحفظ.",diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.jsonindex 7246cbf31f..0371eb6dc5 100644--- a/packages/dashboard/src/locales/de.json+++ b/packages/dashboard/src/locales/de.json@@ -530,7 +530,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "\"{{name}}\" löschen? Verschieben Sie zuerst die Zonen und Methoden in eine andere Gruppe.",+ "message": "\"{{name}}\" löschen? Zonen und Versandarten werden mit gelöscht.","title": "Standortgruppe löschen"},"edit_description": "Benennen Sie diese Gruppe um oder ändern Sie, aus welchen Standorten sie versendet.",@@ -557,7 +557,7 @@"create_description": "Gruppiere Länder, Bundesländer oder Postleitzahlen zu einem Liefergebiet.","create_label": "Lieferzone erstellen","delete_confirm": {- "message": "\"{{name}}\" löschen? Versandarten mit dieser Zone treffen diese Gebiete nicht mehr.",+ "message": "\"{{name}}\" löschen? Die zugehörigen Versandarten werden mit gelöscht.","title": "Lieferzone löschen"},"edit_description": "Die folgenden Mitglieder ersetzen beim Speichern die gesamte Liste.",diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.jsonindex fb8265a001..964656600a 100644--- a/packages/dashboard/src/locales/en.json+++ b/packages/dashboard/src/locales/en.json@@ -530,7 +530,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "Delete \"{{name}}\"? Move its zones and methods to another group first.",+ "message": "Delete \"{{name}}\"? Its zones and delivery methods go with it.","title": "Delete origin group"},"edit_description": "Rename this group or change which locations it ships from.",@@ -557,7 +557,7 @@"create_description": "Group countries, states or postal codes into an area served by delivery methods.","create_label": "Create delivery zone","delete_confirm": {- "message": "Delete \"{{name}}\"? Delivery methods using it will stop matching these areas.",+ "message": "Delete \"{{name}}\"? Its delivery methods are deleted with it.","title": "Delete delivery zone"},"edit_description": "Members below replace the zone’s full member list on save.",diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.jsonindex d351fc08a9..95f18f6633 100644--- a/packages/dashboard/src/locales/fr.json+++ b/packages/dashboard/src/locales/fr.json@@ -530,7 +530,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "Supprimer « {{name}} » ? Déplacez d'abord ses zones et méthodes vers un autre groupe.",+ "message": "Supprimer « {{name}} » ? Ses zones et modes de livraison seront supprimés avec lui.","title": "Supprimer le groupe d'origine"},"edit_description": "Renommez ce groupe ou modifiez les emplacements depuis lesquels il expédie.",@@ -557,7 +557,7 @@"create_description": "Regroupez pays, états ou codes postaux en une zone desservie.","create_label": "Créer la zone","delete_confirm": {- "message": "Supprimer « {{name}} » ? Les méthodes utilisant cette zone ne correspondront plus à ces régions.",+ "message": "Supprimer « {{name}} » ? Ses modes de livraison seront supprimés avec elle.","title": "Supprimer la zone"},"edit_description": "Les membres ci-dessous remplacent la liste complète à l’enregistrement.",diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.jsonindex fd47682075..e5ad3c6cf0 100644--- a/packages/dashboard/src/locales/pl.json+++ b/packages/dashboard/src/locales/pl.json@@ -538,7 +538,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "Usunąć „{{name}}”? Najpierw przenieś jej strefy i metody do innej grupy.",+ "message": "Usunąć „{{name}}\"? Strefy i metody dostawy zostaną usunięte razem z nią.","title": "Usuń grupę miejsc wysyłki"},"edit_description": "Zmień nazwę tej grupy lub to, z których lokalizacji wysyła.",@@ -565,7 +565,7 @@"create_description": "Pogrupuj kraje, regiony lub kody pocztowe w obszar obsługiwany przez metody dostawy.","create_label": "Utwórz strefę dostawy","delete_confirm": {- "message": "Usunąć „{{name}}”? Metody dostawy korzystające z tej strefy przestaną pasować do tych obszarów.",+ "message": "Usunąć „{{name}}\"? Powiązane metody dostawy zostaną usunięte razem z nią.","title": "Usuń strefę dostawy"},"edit_description": "Poniżsi członkowie zastąpią przy zapisie pełną listę strefy.",diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.jsonindex 23a2d03db5..131245c9ad 100644--- a/packages/dashboard/src/locales/zh-CN.json+++ b/packages/dashboard/src/locales/zh-CN.json@@ -530,7 +530,7 @@},"delivery_origin_groups": {"delete_confirm": {- "message": "确定删除“{{name}}”?请先将其区域和配送方式移至其他分组。",+ "message": "删除\"{{name}}\"?其区域和配送方式将一并删除。","title": "删除发货地分组"},"edit_description": "重命名该分组,或更改其发货的库存地点。",@@ -557,7 +557,7 @@"create_description": "将国家、省份或邮编组合为配送服务区域。","create_label": "创建配送区域","delete_confirm": {- "message": "删除“{{name}}”?使用该区域的配送方式将不再匹配这些地区。",+ "message": "删除\"{{name}}\"?其配送方式将一并删除。","title": "删除配送区域"},"edit_description": "保存时下方成员将替换该区域的全部成员。",diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/$profileId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/$profileId/index.tsxindex 0889a962e9..a148420cdd 100644--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/$profileId/index.tsx+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-profiles/$profileId/index.tsx@@ -621,8 +621,8 @@ function OriginGroupSection({confirmLabel: t('admin.actions.delete'),})if (!ok) return- // A group still holding zones or methods is refused with a 422 the- // mutation surfaces as a toast, which is the message the merchant needs.+ // Deleting cascades to the group's zones and methods — the confirm says+ // so. Only the profile's last group is refused (422, surfaced as a toast).await deleteMutation.mutateAsync(group.id).catch(() => undefined)}diff --git a/spree/api/app/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller.rbindex 8d3402ffc4..a4bb55e496 100644--- a/spree/api/app/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller.rb@@ -5,8 +5,8 @@ module Spreemodule DeliveryProfiles# Origin groups of one delivery profile. `stock_location_ids`# replaces the group's full membership; empty means every store- # location. The last group cannot be deleted, nor can one that- # still holds zones or methods.+ # location. Deleting a group cascades to its zones and methods;+ # only the profile's last group refuses to go.class OriginGroupsController < ResourceControllerscoped_resource :settingsdiff --git a/spree/api/spec/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller_spec.rbnew file mode 100644index 0000000000..ceeb24f8a0--- /dev/null+++ b/spree/api/spec/controllers/spree/api/v3/admin/delivery_profiles/origin_groups_controller_spec.rb@@ -0,0 +1,41 @@+require 'spec_helper'++RSpec.describe Spree::Api::V3::Admin::DeliveryProfiles::OriginGroupsController, type: :controller do+ render_views++ include_context 'API v3 Admin authenticated'++ before { request.headers.merge!(headers) }++ let(:profile) { create(:delivery_profile, store: store) }++ describe 'DELETE #destroy' do+ let!(:group) { create(:delivery_origin_group, delivery_profile: profile, name: 'EU') }+ let!(:sibling) { create(:delivery_origin_group, delivery_profile: profile, name: 'US') }++ # The confirm dialog says the group's zones and methods go with it.+ it 'deletes an occupied group and everything it holds' do+ zone = create(:delivery_zone, store: store, delivery_profile: profile, delivery_origin_group: group)+ method = create(:delivery_method, store: store, delivery_profile: profile, delivery_origin_group: group)++ delete :destroy, params: { delivery_profile_id: profile.prefixed_id, id: group.prefixed_id }, as: :json++ expect(response).to have_http_status(:no_content)+ expect(Spree::DeliveryOriginGroup.exists?(group.id)).to be(false)+ expect(Spree::DeliveryZone.exists?(zone.id)).to be(false)+ expect(Spree::DeliveryMethod.exists?(method.id)).to be(false)+ end++ # Delivery has to live somewhere: the profile's last group stays.+ it 'refuses the last group of a profile' do+ # The profile factory seeds a default group of its own — clear every+ # sibling so `group` is genuinely the last one standing.+ profile.delivery_origin_groups.where.not(id: group.id).destroy_all++ delete :destroy, params: { delivery_profile_id: profile.prefixed_id, id: group.prefixed_id }, as: :json++ expect(response).to have_http_status(:unprocessable_entity)+ expect(Spree::DeliveryOriginGroup.exists?(group.id)).to be(true)+ end+ end+enddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/delivery_zones_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/delivery_zones_controller_spec.rbindex 791c5abdac..f7f2492cb1 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/delivery_zones_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/delivery_zones_controller_spec.rb@@ -85,6 +85,20 @@ RSpec.describe Spree::Api::V3::Admin::DeliveryZonesController, type: :controllerexpect(response).to have_http_status(:no_content)expect(Spree::DeliveryZone.exists?(zone.id)).to be(false)end++ # The confirm dialog promises the methods go with the zone — hold the API+ # to it, since a nullify regression would silently widen them to worldwide.+ it 'deletes the zone methods with it' do+ method = create(:delivery_method, store: store, delivery_zone: zone,+ delivery_profile: zone.delivery_profile,+ delivery_origin_group: zone.delivery_origin_group)++ delete :destroy, params: { id: zone.prefixed_id }, as: :json++ expect(response).to have_http_status(:no_content)+ expect(Spree::DeliveryMethod.exists?(method.id)).to be(false)+ expect(Spree::DeliveryMethod.with_deleted.find(method.id).delivery_zone_id).to eq(zone.id)+ endend# The edit form replaces the full member set on save, so a GET that omitsdiff --git a/spree/core/app/models/spree/delivery_method_rules/channel_rule.rb b/spree/core/app/models/spree/delivery_method_rules/channel_rule.rbindex f304086733..79ce8d991f 100644--- a/spree/core/app/models/spree/delivery_method_rules/channel_rule.rb+++ b/spree/core/app/models/spree/delivery_method_rules/channel_rule.rb@@ -30,7 +30,7 @@ module Spree# other rules' fail-open convention for half-configured rows.return true if preferred_channel_ids.empty?- channel = package.order&.channel+ channel = package.owner&.channelreturn false if channel.nil?# Compare as strings to support both integer and UUID primary keysdiff --git a/spree/core/app/models/spree/stock/package.rb b/spree/core/app/models/spree/stock/package.rbindex 9444e0f6c5..0a78c0f350 100644--- a/spree/core/app/models/spree/stock/package.rb+++ b/spree/core/app/models/spree/stock/package.rb@@ -73,7 +73,7 @@ module Spree# so the tare applies everywhere without any of them knowing about it.def weightcontents_weight = contents.sum(&:weight)- tare = order&.store&.preferred_default_package_weight.to_f+ tare = owner&.store&.preferred_default_package_weight.to_fcontents_weight + tareend@@ -86,7 +86,7 @@ module Spree## @return [Hash{Symbol => Float}, nil]def dimensions- store = order&.store+ store = owner&.storereturn if store.nil?length = store.preferred_default_package_length.to_f@@ -121,10 +121,8 @@ module Spreequantity.zero?end- # Pre-completion packages belong to a cart, where #order walks to nil —- # the line items carry the purchase currency either way.def currency- order&.currency ||+ owner&.currency ||contents.filter_map { |item| item.try(:inventory_unit)&.line_item&.currency }.first ||Spree::Current.currencyenddiff --git a/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb b/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rbindex f81028eedc..bcc8c6c76a 100644--- a/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb+++ b/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb@@ -340,6 +340,29 @@ describe '6.0 data migration tasks' doendend+ describe 'spree:repair_cart_fulfillment_item_orders' do+ it 'detaches cart-phase items from orders they never belonged to' do+ stranger = create(:order, store: store)+ cart = create(:cart, store: store)+ create(:line_item, cart: cart, order: nil)+ fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))+ fulfillment.fulfillment_items.update_all(order_id: stranger.id)++ run_task('spree:repair_cart_fulfillment_item_orders')++ expect(fulfillment.fulfillment_items.reload.pluck(:order_id)).to all(be_nil)+ end++ it 'leaves order-owned items alone' do+ order = create(:order_ready_to_ship, store: store)+ item_orders = order.fulfillments.flat_map { |f| f.fulfillment_items.pluck(:order_id) }++ run_task('spree:repair_cart_fulfillment_item_orders')++ expect(order.fulfillments.flat_map { |f| f.fulfillment_items.reload.pluck(:order_id) }).to eq(item_orders)+ end+ end+describe 'spree:migrate_fulfillment_statuses' dolet(:order) { create(:order_ready_to_ship, store: store) }diff --git a/spree/core/spec/models/spree/delivery_method_rule_spec.rb b/spree/core/spec/models/spree/delivery_method_rule_spec.rbindex a25dc45869..39721afb15 100644--- a/spree/core/spec/models/spree/delivery_method_rule_spec.rb+++ b/spree/core/spec/models/spree/delivery_method_rule_spec.rb@@ -65,6 +65,20 @@ describe Spree::DeliveryMethodRule, type: :model doexpect(rule.eligible?(channel_package)).to be(false)end+ # During checkout the package belongs to a Cart — reading the channel+ # through package.order returned nil and hid every channel-restricted+ # method from the very customers it was meant for.+ it 'matches a cart-owned package by the cart channel' do+ rule = described_class.new(delivery_method: delivery_method)+ rule.preferred_channel_ids = [channel.id]++ cart = create(:cart, store: store, channel: channel)+ line_item = create(:line_item, cart: cart, order: nil)+ fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))++ expect(rule.eligible?(fulfillment.to_package)).to be(true)+ end+it 'hides a channel-restricted method from carts with no channel' dorule = described_class.new(delivery_method: delivery_method)rule.preferred_channel_ids = [channel.id]diff --git a/spree/core/spec/models/spree/delivery_zone_spec.rb b/spree/core/spec/models/spree/delivery_zone_spec.rbindex 785a7bb7f2..aa7bc40196 100644--- a/spree/core/spec/models/spree/delivery_zone_spec.rb+++ b/spree/core/spec/models/spree/delivery_zone_spec.rb@@ -7,20 +7,28 @@ describe Spree::DeliveryZone, type: :model dolet(:store) { @default_store }let(:zone) { create(:delivery_zone, store: store) }+ # DeliveryMethod is paranoid, so `exists?` alone would pass even under+ # the old nullify behaviour once anything soft-deleted the row — assert+ # the actual mechanism: the method is soft-deleted, zone link intact.it 'takes its delivery methods with it' domethod = create(:delivery_method, store: store, delivery_zone: zone,delivery_origin_group: zone.delivery_origin_group)- expect { zone.destroy }.to change { Spree::DeliveryMethod.exists?(method.id) }.from(true).to(false)+ zone.destroy++ destroyed = Spree::DeliveryMethod.with_deleted.find(method.id)+ expect(destroyed.deleted_at).to be_present+ expect(destroyed.delivery_zone_id).to eq(zone.id)end- it 'never leaves a method quoting worldwide' do+ it 'never leaves a live method quoting worldwide' domethod = create(:delivery_method, store: store, delivery_zone: zone,delivery_origin_group: zone.delivery_origin_group)zone.destroy- expect(Spree::DeliveryMethod.where(id: method.id, delivery_zone_id: nil)).to be_empty+ expect(Spree::DeliveryMethod.exists?(method.id)).to be(false)+ expect(Spree::DeliveryMethod.with_deleted.find(method.id).delivery_zone_id).not_to be_nilendenddiff --git a/spree/core/spec/models/spree/stock/package_spec.rb b/spree/core/spec/models/spree/stock/package_spec.rbindex b28c7d2547..0308690440 100644--- a/spree/core/spec/models/spree/stock/package_spec.rb+++ b/spree/core/spec/models/spree/stock/package_spec.rb@@ -37,6 +37,20 @@ module Spreeexpect(fulfillment.to_package.owner).to eq(cart)end+ # The same failure shape as the provider bug: weight, dimensions and+ # currency read the owner's store, and a cart-owned package must not+ # lose them just because no order exists yet.+ it 'applies the store tare to a cart-owned package' do+ @default_store.update!(preferred_default_package_weight: 2.5)+ cart = create(:cart, store: @default_store)+ line_item = create(:line_item, cart: cart, order: nil, variant: variant)+ fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))++ expect(fulfillment.to_package.weight).to eq(27.5)+ ensure+ @default_store.update!(preferred_default_package_weight: 0)+ end+it 'falls back to the units for a package with no fulfillment' dopackage = Package.new(stock_location)package.add build_inventory_unitdiff --git a/spree/providers/easypost/lib/spree_easypost/engine.rb b/spree/providers/easypost/lib/spree_easypost/engine.rbindex 344d45b4e6..ca1e14740f 100644--- a/spree/providers/easypost/lib/spree_easypost/engine.rb+++ b/spree/providers/easypost/lib/spree_easypost/engine.rb@@ -20,7 +20,7 @@ module SpreeEasyPostinitializer 'spree_easypost.http_logging' donext unless Rails.env.development? || ENV['SPREE_EASYPOST_HTTP_LOG'].present?- EasyPost::Hooks.subscribe(:response, :spree_rails_logger, lambda { |context|+ logger_hook = lambda do |context|duration_ms = ((context.response_timestamp - context.request_timestamp) * 1000).roundline = "[EasyPost] #{context.method.to_s.upcase} #{context.path} -> #{context.http_status} (#{duration_ms}ms)"@@ -29,7 +29,13 @@ module SpreeEasyPostelseRails.logger.info(line)end- })+ rescue StandardError => e+ # The SDK invokes hooks inline in the request path with no rescue of+ # its own — a logging hiccup must never take checkout down with it.+ Rails.logger.warn("[EasyPost] logging hook failed: #{e.class}: #{e.message}")+ end++ EasyPost::Hooks.subscribe(:response, :spree_rails_logger, logger_hook)endconfig.after_initialize dodiff --git a/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb b/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rbindex 6fe3228ff7..a4c9091e4a 100644--- a/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb+++ b/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb@@ -105,20 +105,27 @@ RSpec.describe SpreeEasyPost::DeliveryRateProvider do# (whose nil address then killed rating inside the provider's rescue).it 'quotes for a cart-owned package against the cart ship address' docart = create(:cart, store: store, ship_address: create(:address))- line_item = create(:line_item, cart: cart, order: nil)+ create(:line_item, cart: cart, order: nil)fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))- fulfillment.set_up_inventory('on_hand', line_item.variant, cart, line_item)++ sent_to_address = nil+ allow(shipment_service).to receive(:create) do |params|+ sent_to_address = params[:to_address]+ easypost_shipment+ endestimates = provider.estimates(fulfillment.to_package)expect(estimates.size).to eq(2)+ # The destination must be the CART's address — the regression had it+ # reading a stranger order's (nil) address instead.+ expect(sent_to_address[:zip]).to eq(cart.ship_address.zipcode)endit 'declines to quote when the owner has no ship address yet' docart = create(:cart, store: store, ship_address: nil)- line_item = create(:line_item, cart: cart, order: nil)+ create(:line_item, cart: cart, order: nil)fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))- fulfillment.set_up_inventory('on_hand', line_item.variant, cart, line_item)expect(provider.estimates(fulfillment.to_package)).to eq([])end