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
Spec fixes and more Cart/Order fixes
Damian Legawiecb091be9da285
diff --git a/spree/api/app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts/fulfillments_controller.rbindex 92f573317d..f09cce5b1a 100644--- a/spree/api/app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb@@ -47,7 +47,7 @@ module Spreeenddef recalculate- return if @cart.complete? || @cart.canceled?+ return if @cart.complete?@cart.recalculate_totals!rescue StandardError => ediff --git a/spree/api/app/serializers/spree/api/v3/cart_serializer.rb b/spree/api/app/serializers/spree/api/v3/cart_serializer.rbindex 6a20f93be4..2d3cfb64bc 100644--- a/spree/api/app/serializers/spree/api/v3/cart_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/cart_serializer.rb@@ -37,6 +37,8 @@ module Spreeorder.channel&.prefixed_idend+ # @deprecated `number` mirrors `id` (carts have no order-style+ # number) — kept one release for 5.x clients; removed in 6.1.attributes :number, :token, :email, :customer_note,:currency, :locale, :total_quantity, :warnings, :coupon_codediff --git a/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rbindex ce63bd72cd..5eb86a38b9 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb@@ -52,7 +52,7 @@ RSpec.describe Spree::Api::V3::Admin::Categories::ProductsController, type: :con# migrate to Spree::Collection; membership can't be read or mutated here either.describe 'automatic (rule-based) categories' dolet!(:automatic_category) { Spree::Category.create!(name: 'On Sale', store: store, automatic: true) }- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }it 'are not listable through the nested products endpoint' doget :index, params: { category_id: automatic_category.prefixed_id }, as: :jsondiff --git a/spree/api/spec/controllers/spree/api/v3/admin/collections/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/collections/products_controller_spec.rbindex 42442c3529..c1d2f880a3 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/collections/products_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/collections/products_controller_spec.rb@@ -14,11 +14,11 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coenddescribe 'GET #index' do- let!(:product_a) { create(:product, stores: [store]) }- let!(:product_b) { create(:product, stores: [store]) }- let!(:product_c) { create(:product, stores: [store]) }+ let!(:product_a) { create(:product, store: store) }+ let!(:product_b) { create(:product, store: store) }+ let!(:product_c) { create(:product, store: store) }let!(:other_collection) { create(:collection, store: store) }- let!(:other_product) { create(:product, stores: [store]) }+ let!(:other_product) { create(:product, store: store) }before doSpree::ProductCollection.create!(collection: collection, product: product_b, position: 1)@@ -47,7 +47,7 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coit 'lists the rule-materialized products of an automatic collection' doautomatic = create(:automatic_collection, store: store)- member = create(:product, stores: [store])+ member = create(:product, store: store)Spree::ProductCollection.create!(collection: automatic, product: member, position: 1)get :index, params: { collection_id: automatic.prefixed_id }, as: :json@@ -58,7 +58,7 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coenddescribe 'POST #create' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }it 'adds the product to the collection' dopost :create, params: { collection_id: collection.prefixed_id, product_id: product.prefixed_id }, as: :json@@ -68,7 +68,7 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coendit '404s for a product outside the store' do- other = create(:product, stores: [create(:store)])+ other = create(:product, store: create(:store))post :create, params: { collection_id: collection.prefixed_id, product_id: other.prefixed_id }, as: :jsonexpect(response).to have_http_status(:not_found)@@ -86,7 +86,7 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coenddescribe 'DELETE #destroy' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }before { Spree::ProductCollection.create!(collection: collection, product: product, position: 1) }@@ -98,7 +98,7 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coendit '404s for a product not in the collection' do- stray = create(:product, stores: [store])+ stray = create(:product, store: store)delete :destroy, params: { collection_id: collection.prefixed_id, id: stray.prefixed_id }, as: :jsonexpect(response).to have_http_status(:not_found)@@ -115,9 +115,9 @@ RSpec.describe Spree::Api::V3::Admin::Collections::ProductsController, type: :coenddescribe 'PATCH #reposition' do- let!(:first) { create(:product, stores: [store]) }- let!(:second) { create(:product, stores: [store]) }- let!(:third) { create(:product, stores: [store]) }+ let!(:first) { create(:product, store: store) }+ let!(:second) { create(:product, store: store) }+ let!(:third) { create(:product, store: store) }before doSpree::ProductCollection.create!(collection: collection, product: first, position: 1)diff --git a/spree/api/spec/integration/spree/api/v3/admin/categories_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/categories_spec.rbindex 4d26e02d12..9ad013c6a4 100644--- a/spree/api/spec/integration/spree/api/v3/admin/categories_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/categories_spec.rb@@ -287,7 +287,7 @@ RSpec.describe 'Admin Categories API', type: :request, swagger_doc: 'api-referenparameter name: :id, in: :path, type: :string, required: true, description: 'Product ID'response '204', 'product removed' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }let(:'x-spree-api-key') { secret_api_key.plaintext_token }let(:category_id) { category.prefixed_id }let(:id) { product.prefixed_id }diff --git a/spree/api/spec/integration/spree/api/v3/admin/collections_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/collections_spec.rbindex 690c0646cd..6499d1c2af 100644--- a/spree/api/spec/integration/spree/api/v3/admin/collections_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/collections_spec.rb@@ -261,7 +261,7 @@ RSpec.describe 'Admin Collections API', type: :request, swagger_doc: 'api-refere}response '201', 'product added' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }let(:'x-spree-api-key') { secret_api_key.plaintext_token }let(:collection_id) { collection.prefixed_id }let(:body) { { product_id: product.prefixed_id } }@@ -288,7 +288,7 @@ RSpec.describe 'Admin Collections API', type: :request, swagger_doc: 'api-refereparameter name: :id, in: :path, type: :string, required: true, description: 'Product ID'response '204', 'product removed' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }let(:'x-spree-api-key') { secret_api_key.plaintext_token }let(:collection_id) { collection.prefixed_id }let(:id) { product.prefixed_id }@@ -321,7 +321,7 @@ RSpec.describe 'Admin Collections API', type: :request, swagger_doc: 'api-refere}response '204', 'product repositioned' do- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }let(:'x-spree-api-key') { secret_api_key.plaintext_token }let(:collection_id) { collection.prefixed_id }let(:id) { product.prefixed_id }diff --git a/spree/api/spec/integration/spree/api/v3/store/collections_spec.rb b/spree/api/spec/integration/spree/api/v3/store/collections_spec.rbindex 5348671418..7e2b1c1676 100644--- a/spree/api/spec/integration/spree/api/v3/store/collections_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/store/collections_spec.rb@@ -6,7 +6,7 @@ RSpec.describe 'Collections API', type: :request, swagger_doc: 'api-reference/stinclude_context 'API v3 Store'let!(:collection) { create(:collection, store: store, name: 'Summer Sale') }- let!(:product) { create(:product, status: 'active', stores: [store]) }+ let!(:product) { create(:product, status: 'active', store: store) }let!(:other_store) { create(:store) }let!(:other_collection) { create(:collection, store: other_store) }diff --git a/spree/core/app/models/concerns/spree/purchase/checkout_steps.rb b/spree/core/app/models/concerns/spree/purchase/checkout_steps.rbindex 787721ebba..8ed4e54311 100644--- a/spree/core/app/models/concerns/spree/purchase/checkout_steps.rb+++ b/spree/core/app/models/concerns/spree/purchase/checkout_steps.rb@@ -31,7 +31,7 @@ module Spree## @return [String]def current_checkout_step- return 'complete' if completed? || canceled?+ return 'complete' if completed?first_unmet = Spree::Checkout::Requirements.new(self).call.firststep = first_unmet ? first_unmet[:step].to_s : 'complete'diff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rbindex 7386eedaf5..91a37cccc9 100644--- a/spree/core/app/models/spree/cart.rb+++ b/spree/core/app/models/spree/cart.rb@@ -141,6 +141,13 @@ module Spreedelegate :name, to: :customer, prefix: true, allow_nil: true+ # @deprecated Store API bridge — carts have no order-style number; the+ # prefixed ID is the identifier. Removed from the API in 6.1.+ # @return [String]+ def number+ prefixed_id+ end+# @return [Boolean]def completed?completed_at.present?diff --git a/spree/core/app/models/spree/fulfillment.rb b/spree/core/app/models/spree/fulfillment.rbindex 81fcccd076..dda0a0b227 100644--- a/spree/core/app/models/spree/fulfillment.rb+++ b/spree/core/app/models/spree/fulfillment.rb@@ -273,9 +273,10 @@ module Spreereturn 'pending' if order_or_cart.is_a?(Spree::Cart)return 'canceled' if canceled? || order_or_cart.canceled?+ # Fulfillment is a fact — payment coverage can never un-fulfill it.+ return 'fulfilled' if fulfilled?return 'pending' unless order_or_cart.can_ship?return 'pending' if fulfillment_items.any?(&:backordered?)- return 'fulfilled' if fulfilled?order_or_cart.paid? || Spree::Config[:auto_capture_on_dispatch] ? 'ready' : 'pending'enddiff --git a/spree/core/app/models/spree/newsletter_subscriber.rb b/spree/core/app/models/spree/newsletter_subscriber.rbindex cd0982586d..6f70666b35 100644--- a/spree/core/app/models/spree/newsletter_subscriber.rb+++ b/spree/core/app/models/spree/newsletter_subscriber.rb@@ -17,7 +17,6 @@ module Spree# Associations#belongs_to :user, optional: true, class_name: Spree.user_class&.name- belongs_to :store, class_name: 'Spree::Store', required: true## Validations@@ -44,7 +43,7 @@ module Spree#self.whitelisted_ransackable_attributes = %w[email verified_at]self.whitelisted_ransackable_scopes = %w[verified unverified]-+def accepts_email_marketingreturn user.accepts_email_marketing if user.present?diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex feae653627..2de461a07c 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -150,6 +150,8 @@ module Spreealias_attribute :customer_id, :user_idbelongs_to :user, class_name: "::#{Spree.user_class}", optional: true, autosave: true+ alias_method :customer, :user+ alias_method :customer=, :user=# The cart this order was completed from (unique — the completion# idempotency key). Backoffice draft orders have no cart.belongs_to :cart, class_name: 'Spree::Cart', optional: true, inverse_of: :orderdiff --git a/spree/core/app/models/spree/payment.rb b/spree/core/app/models/spree/payment.rbindex 5d38bc1a4b..2fd1506083 100644--- a/spree/core/app/models/spree/payment.rb+++ b/spree/core/app/models/spree/payment.rb@@ -392,7 +392,10 @@ module Spreedef update_orderreturn unless completed? || void? || (owner.is_a?(Spree::Order) && owner.completed?)- owner.recalculate_totals!+ # A payment settling moves only the payment side of the ledger — never+ # re-sum item/adjustment money here.+ completed_total = owner.payments.completed.includes(:refunds).sum { |payment| payment.amount - payment.refunds.sum(:amount) }+ owner.update_column(:payment_total, completed_total)owner.update_statuses! if owner.is_a?(Spree::Order) && owner.completed?enddiff --git a/spree/core/app/services/spree/orders/update_statuses.rb b/spree/core/app/services/spree/orders/update_statuses.rbindex d0c324a6fa..6b84c57c1d 100644--- a/spree/core/app/services/spree/orders/update_statuses.rb+++ b/spree/core/app/services/spree/orders/update_statuses.rb@@ -24,8 +24,10 @@ module Spree# A fulfillment's own state depends on payment coverage# (Fulfillment#determine_state) — refresh each before rolling up.+ # Reloaded so a stale association cache never writes an outdated+ # status back over a transition that already persisted.def refresh_fulfillment_states(order)- order.fulfillments.each do |fulfillment|+ order.fulfillments.reload.each do |fulfillment|fulfillment.update!(order) if fulfillment.persisted?endenddiff --git a/spree/core/app/workflows/spree/carts/add_item.rb b/spree/core/app/workflows/spree/carts/add_item.rbindex 24f9fdaf26..9662c0cfd0 100644--- a/spree/core/app/workflows/spree/carts/add_item.rb+++ b/spree/core/app/workflows/spree/carts/add_item.rb@@ -51,6 +51,11 @@ module Spree@line_item.quantity += requested_quantity.to_iend+ # Pins inventory placement to a specific fulfillment (admin+ # post-placement adds); :shipment is the legacy option key.+ target = item_options[:fulfillment] || item_options[:shipment]+ @line_item.target_fulfillment = target if target+# `metadata` is the primary API param (maps to private_metadata).# Legacy `public_metadata`/`private_metadata` params kept for backward compatibility.resolved_metadata = metadata.presence || private_metadatadiff --git a/spree/core/app/workflows/spree/carts/recalculate_totals.rb b/spree/core/app/workflows/spree/carts/recalculate_totals.rbindex a920dd6981..95da840ef6 100644--- a/spree/core/app/workflows/spree/carts/recalculate_totals.rb+++ b/spree/core/app/workflows/spree/carts/recalculate_totals.rb@@ -20,9 +20,10 @@ module Spreestep :reset_association_cachesstep :update_item_count+ step :refresh_money_inputsstep :regenerate_typed_rows unless money_frozen?step :fold_typed_rows- step :update_money_totals+ step :refresh_grand_totalstep :persist_totalssuccess(cart)@@ -74,10 +75,16 @@ module Spreecart.non_taxable_adjustment_total = fees.select(&:order_level?).sum(&:amount)end- def update_money_totals+ # Runs before the adjusters: promotion-rule eligibility (item-total+ # thresholds, free shipping) reads these attributes, so they must+ # reflect the current line items — not the previous recalculation.+ def refresh_money_inputscart.payment_total = cart.payments.completed.includes(:refunds).inject(0) { |sum, payment| sum + payment.amount - payment.refunds.sum(:amount) }cart.item_total = cart.line_items.to_a.sum(&:amount)cart.delivery_total = cart.fulfillments.to_a.sum(&:cost)+ end++ def refresh_grand_totalcart.total = cart.item_total + cart.delivery_total + cart.adjustment_totalenddiff --git a/spree/core/lib/tasks/carts_migration.rake b/spree/core/lib/tasks/carts_migration.rakeindex 6199d6a676..5115008ead 100644--- a/spree/core/lib/tasks/carts_migration.rake+++ b/spree/core/lib/tasks/carts_migration.rake@@ -35,7 +35,7 @@ namespace :spree doship_address_id: order.ship_address_id,bill_address_id: order.bill_address_id,accept_marketing: order.accept_marketing,- special_instructions: order.special_instructions,+ customer_note: order.customer_note,last_ip_address: order.last_ip_address,gift_card_id: order.gift_card_id,metadata: order.metadata,diff --git a/spree/core/spec/lib/tasks/categories_and_collections_spec.rb b/spree/core/spec/lib/tasks/categories_and_collections_spec.rbindex 13c8ad9b63..0e80ffe2e9 100644--- a/spree/core/spec/lib/tasks/categories_and_collections_spec.rb+++ b/spree/core/spec/lib/tasks/categories_and_collections_spec.rb@@ -22,7 +22,7 @@ describe 'spree:migrate_taxons_to_categories_and_collections' dosort_order: 'price asc', rules_match_policy: 'all')endlet!(:rule) { create(:tag_taxon_rule, taxon: category, value: 'sale', match_policy: 'is_equal_to') }- let!(:product) { create(:product, stores: [store]) }+ let!(:product) { create(:product, store: store) }let!(:membership) { Spree::ProductCategory.create!(category: category, product: product, position: 1) }it 'creates a Collection mirroring the category and deletes the category' dodiff --git a/spree/core/spec/lib/tasks/product_tag_tenants_spec.rb b/spree/core/spec/lib/tasks/product_tag_tenants_spec.rbindex 9b3e64efec..c1a797f123 100644--- a/spree/core/spec/lib/tasks/product_tag_tenants_spec.rb+++ b/spree/core/spec/lib/tasks/product_tag_tenants_spec.rb@@ -14,7 +14,7 @@ describe 'spree:upgrade:backfill_product_tag_tenants' dobefore { subject.reenable }let!(:store) { Spree::Store.default || create(:store, default: true) }- let!(:product) { create(:product, stores: [store], tag_list: ['eco']) }+ let!(:product) { create(:product, store: store, tag_list: ['eco']) }def tagging_for(taggable)ActsAsTaggableOn::Tagging.find_by(taggable: taggable, context: 'tags')diff --git a/spree/core/spec/models/spree/adjusters/promotion_spec.rb b/spree/core/spec/models/spree/adjusters/promotion_spec.rbindex 9b49fff14d..75b5a64a08 100644--- a/spree/core/spec/models/spree/adjusters/promotion_spec.rb+++ b/spree/core/spec/models/spree/adjusters/promotion_spec.rb@@ -6,7 +6,7 @@ describe Spree::Adjusters::Promotion, type: :model dodef line_promo(rate, code: nil)kind = code ? :coupon_code : :automatic- create(:promotion_with_item_adjustment, adjustment_rate: rate, code: code, kind: kind, stores: [store])+ create(:promotion_with_item_adjustment, adjustment_rate: rate, code: code, kind: kind, store: store)endit 'writes a discount row per line item for an applied promotion' do@@ -60,7 +60,7 @@ describe Spree::Adjusters::Promotion, type: :model doendit 'clamps so a line never goes below zero' do- promo = create(:promotion, kind: :automatic, code: nil, stores: [store])+ promo = create(:promotion, kind: :automatic, code: nil, store: store)action = Spree::Promotion::Actions::CreateItemAdjustments.create!(promotion: promo,calculator: Spree::Calculator::FlatRate.new(preferred_amount: 999)@@ -77,7 +77,7 @@ describe Spree::Adjusters::Promotion, type: :model dolet(:order) { create(:order_with_line_items, line_items_count: 3) }it 'distributes the winner across line items with largest-remainder' do- promo = create(:promotion_with_order_adjustment, weighted_order_adjustment_amount: 10, code: nil, kind: :automatic, stores: [store])+ promo = create(:promotion_with_order_adjustment, weighted_order_adjustment_amount: 10, code: nil, kind: :automatic, store: store)promo.activate(order: order)rows = order.discounts.reload@@ -87,7 +87,7 @@ describe Spree::Adjusters::Promotion, type: :model doendit 'never distributes more than the remaining line bases' do- promo = create(:promotion_with_order_adjustment, weighted_order_adjustment_amount: 9_999, code: nil, kind: :automatic, stores: [store])+ promo = create(:promotion_with_order_adjustment, weighted_order_adjustment_amount: 9_999, code: nil, kind: :automatic, store: store)promo.activate(order: order)expect(order.discounts.reload.sum(&:amount)).to eq(-order.line_items.sum(&:amount))@@ -99,7 +99,7 @@ describe Spree::Adjusters::Promotion, type: :model doit 'persists a fulfillment discount even at zero cost' doorder.fulfillments.each { |fulfillment| fulfillment.update_column(:cost, 0) }- promo = create(:free_shipping_promotion, code: nil, kind: :automatic, stores: [store])+ promo = create(:free_shipping_promotion, code: nil, kind: :automatic, store: store)promo.activate(order: order)rows = order.discounts.reload.select(&:fulfillment_id)diff --git a/spree/core/spec/models/spree/customer_group_spec.rb b/spree/core/spec/models/spree/customer_group_spec.rbindex 8479fc8e1c..f628607748 100644--- a/spree/core/spec/models/spree/customer_group_spec.rb+++ b/spree/core/spec/models/spree/customer_group_spec.rb@@ -4,12 +4,6 @@ RSpec.describe Spree::CustomerGroup, type: :model dolet(:store) { @default_store }let(:customer_group) { create(:customer_group, store: store) }- describe 'associations' do- it { is_expected.to belong_to(:store).optional(false) }- it { is_expected.to have_many(:customer_group_users).dependent(:destroy) }- it { is_expected.to have_many(:users).through(:customer_group_users) }- end-describe 'validations' doit { is_expected.to validate_presence_of(:name) }diff --git a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb b/spree/core/spec/models/spree/newsletter_subscriber_spec.rbindex ba7d7f41b2..0af4c5ca7f 100644--- a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb+++ b/spree/core/spec/models/spree/newsletter_subscriber_spec.rb@@ -20,11 +20,6 @@ describe Spree::NewsletterSubscriber, type: :model, newsletter: true doit { is_expected.not_to allow_value('test@').for(:email) }end- describe 'associations' do- it { is_expected.to belong_to(:user).optional }- it { is_expected.to belong_to(:store).without_validating_presence }- end-describe 'callbacks' dodescribe 'set_store' dolet(:current_store) { create(:store) }diff --git a/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb b/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rbindex 6d1d869b12..f09d76b8bc 100644--- a/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb+++ b/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb@@ -2,7 +2,7 @@ require 'spec_helper'describe 'Digital auto-fulfillment on order completion', type: :model dolet(:store) { @default_store }- let(:digital_product) { create(:digital_product, stores: [store]) }+ let(:digital_product) { create(:digital_product, store: store) }let(:digital_variant) { create(:variant, product: digital_product, digitals: [create(:digital)]) }let(:order) { create(:order_with_line_items, store: store, variants: [digital_variant], line_items_count: 1) }