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
Validate payment_status against the vocabulary its writer produces
Damian Legawiec375683a4daa3
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex 4e917315d3..cb660445f8 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -8,6 +8,10 @@ module Spree# 5.4-to-5.5 backfill rake can read it; AR ignores it everywhere else.self.ignored_columns += ['channel']+ # What Orders::UpdateStatuses derives — the only writer of the column.+ PAYMENT_STATUSES = %w(none authorized partially_paid paid partially_refunded refunded overcharged voided).freeze+ # @deprecated legacy machine vocabulary; rows carrying it stay valid until+ # the status migration rewrites them. Removed in 6.1.PAYMENT_STATES = %w(balance_due credit_owed failed paid void)FULFILLMENT_STATUSES = %w(backorder canceled partial unfulfilled fulfilled delivered pending ready shipped)# @deprecated legacy name — remove in 6.1 together with the 'shipped' value@@ -222,7 +226,7 @@ module Spree# Shared money/quantity validations live in Spree::Purchase::Validations;# only order-specific rules stay here.validates :email, presence: true, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email- validates :payment_status, inclusion: { in: PAYMENT_STATES, allow_blank: true }+ validates :payment_status, inclusion: { in: PAYMENT_STATUSES | PAYMENT_STATES, allow_blank: true }validates :fulfillment_status, inclusion: { in: FULFILLMENT_STATUSES, allow_blank: true }# @deprecated Both warn and run the full recalculation; usediff --git a/spree/core/app/services/spree/orders/update_statuses.rb b/spree/core/app/services/spree/orders/update_statuses.rbindex 5c6974db2a..9e65f5ef5c 100644--- a/spree/core/app/services/spree/orders/update_statuses.rb+++ b/spree/core/app/services/spree/orders/update_statuses.rb@@ -8,7 +8,7 @@ module Spreeclass UpdateStatusesprepend Spree::ServiceModule::Base- PAYMENT_STATUSES = %w[none authorized partially_paid paid partially_refunded refunded overcharged voided].freeze+ PAYMENT_STATUSES = Spree::Order::PAYMENT_STATUSESdef call(order:)order.update_columns(diff --git a/spree/core/app/subscribers/spree/order_status_subscriber.rb b/spree/core/app/subscribers/spree/order_status_subscriber.rbindex 80bb693dc2..d35d7838de 100644--- a/spree/core/app/subscribers/spree/order_status_subscriber.rb+++ b/spree/core/app/subscribers/spree/order_status_subscriber.rb@@ -7,7 +7,7 @@ module Spree# records are skipped — carts have no status columns.class OrderStatusSubscriber < Spree::Subscribersubscribes_to 'payment.created', 'payment.updated', 'payment.deleted',- 'payment.completed', 'payment.voided',+ 'payment.completed', 'payment.captured', 'payment.voided','refund.created', 'refund.updated','fulfillment.created', 'fulfillment.updated', 'fulfillment.deleted','return.received', 'return.refunded', 'return.canceled',diff --git a/spree/core/spec/workflows/spree/orders/complete_spec.rb b/spree/core/spec/workflows/spree/orders/complete_spec.rbindex c43c3e0718..a90ce6392a 100644--- a/spree/core/spec/workflows/spree/orders/complete_spec.rb+++ b/spree/core/spec/workflows/spree/orders/complete_spec.rb@@ -7,6 +7,19 @@ module Spreeafter { Spree::Config.set track_inventory_levels: true }+ # Regression: the rollup writes its vocabulary (none/authorized/...) via+ # update_columns, so the model's validation must accept it — otherwise the+ # first derived value poisons the order and completion 422s forever.+ it 'completes an order whose rollup already wrote a derived payment status' do+ draft = create(:order_ready_to_ship, store: store)+ draft.update_columns(status: 'draft', completed_at: nil, payment_status: 'authorized')++ result = described_class.call(order: draft, payment_pending: true)++ expect(result).to be_success+ expect(draft.reload.status).to eq('placed')+ end+it 'is idempotent — an already placed order halts successfully with no side effects' doorder.update_columns(completed_at: Time.current, status: 'placed')