Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Flip checkout to Cart and remove the Order state machine (Wave 5)

Damian Legawiec6ff55b19f865
diff --git a/docs/plans/6.0-core-rewrite-tasks.md b/docs/plans/6.0-core-rewrite-tasks.md
index a1655461cc..03448eb429 100644
--- a/docs/plans/6.0-core-rewrite-tasks.md
+++ b/docs/plans/6.0-core-rewrite-tasks.md
@@ -204,40 +204,52 @@ Runs after Wave 2 (tables born with `fulfillment_id`). Can proceed in parallel w
## Wave 5 — The flip: Cart becomes the checkout owner (`6.0-cart-order-split.md` P3 + P4)
+### Wave 5 outcome notes (2026-07-29 — COMPLETE, all gates green)
+
+**Gates: core 6643/0 (parallel), api 2474/0 (parallel), emails 102/0.** One commit; migrations `20260729100001` (cart checkout columns + coupon_code + cart_id on order_promotions/payment_sessions/payments/stock_reservations/coupon_codes + `remove_column :spree_orders, :state`), `20260729100002` (order_id nullable on stock_reservations/payment_sessions), `20260729100003` (gift_card_id on carts).
+
+- **Cart owns checkout end to end.** Full surface on `Spree::Cart` (totals + DisplayMoney incl. store-credit/gift-card money, checkout steps via Requirements, market/channel presence resolution, warnings, rebuild_fulfillments! idempotent proposal rebuild + prune_undeliverable_fulfillments!, merge!/associate_user!, store-credit quartet + `total_available_store_credit`/`could_use_store_credit?`/`total_minus_store_credits`, gift card apply/remove/redeem/recalculate ported, `update_hooks` registry unioned with Order's so legacy Order-registered hooks fire during checkout). `CartUpdater < OrderUpdater`.
+- **Machine gone.** `Order::Checkout` is a lean data module (checkout_steps/current/completed via Requirements + newsletter/user-record/default-addresses). No `state` column, no `next!`/`checkout_flow`/`insert_checkout_step`/`update_from_params`. Lifecycle = `status` draft/placed/canceled + derived predicates; cancel/resume keep side effects verbatim. `Orders::RecomputeStatuses` is the sole payment/fulfillment status writer.
+- **`Carts::Complete` three-phase pipeline** (replay → lock+TTL takeover → in-lock recalc → drift guard 409 → validate → draft order + copy contract; offline payment collapses into finalize; external outside txn with Y3 compensation; finalize idempotent). Admin/B2B path `Orders::Complete` delegates into it and now honors `payment_pending:`/`notify_customer:` (kwargs restored for the admin API).
+- **Owner XOR everywhere** (LineItem, Payment, PaymentSession, Fulfillment, StockReservation, OrderPromotion, CouponCode, typed lines) with a uniform **`order=` cart-routing bridge** on every dual-FK model: assigning a `Spree::Cart` to the legacy `order` association routes to the cart FK (extensions assign `current_order`, which is now a Cart). `PaymentSession#owner=` lets gateways stay owner-agnostic (`Gateway::Bogus` uses it); session internals (`store` delegate, `find_or_create_payment!`, defaults) swept to owner. `Fulfillment#selected_shipping_rate_id=`/cost-recalc hooks owner-dispatched. Payment-session serializer: `order_id` reports owner (bridge), new `cart_id` attribute.
+- **Deprecated twins added on Cart** (`shipments`, `create_proposed_shipments`, `set_shipments_cost`) so legacy call sites keep working one release.
+- **Test support:** walkthrough cart-first; cart/line_item/payment/payment_session/stock_reservation factories owner-aware; order factory `state:` transient shim. Spec rewrites: checkout_spec machine-free (steps/default-addresses/finalize side effects incl. gift-card redemption); state_machine_spec → lifecycle; carts/complete, checkout/advance/update, api store cart+integration specs converted to Cart fixtures; `user_methods` raw `state='complete'` SQL → `completed_at IS NOT NULL`.
+- **Deferred to Wave 6:** `cart_id` proper exposure/naming across serializers (order_id bridge documented), drafts `cart_id: nil` admin scoping, requirements-shaped store surface.
+
The point of no return; biggest single wave. Everything before it exists so this copy contract is written once.
### T5.1 Cart behavior
-- [ ] Full Cart model: binding settles the three inconsistent creation paths (market/channel/locale always set); recalculation-on-write — address/market change → re-price, re-tax (provider estimate on the cart), **idempotent** delivery-proposal rebuild (destructive `create_proposed_shipments` behavior dies); item changes → totals + reservation Release/Reserve/Extend dispatch carried over from `Carts::Update`.
-- [ ] Fulfillments, delivery rates, and typed money lines are created **cart-owned** during checkout (owner XOR flips to `cart_id`).
-- [ ] `Carts::{Create,Update,UpsertItems}` operate on Cart + get DI registration; `current_order` → `current_cart` built through `Carts::Create`.
-- [ ] Legacy `Spree::Cart::*` services: 8 dead ones deleted; 6 re-homed (AddItem/SetQuantity/RemoveLineItem → carts items flow; Associate; Empty; RemoveOutOfStockItems; CompareLineItems → merge strategy).
-- [ ] Merge strategy seam (`Spree::Dependencies.cart_merge_strategy`) + default preserving OrderMerger behavior minus its bugs (currency-mismatch surfaced, no silent >10 overflow destroy).
-- [ ] Tiered expiry reaper (guest 30d / customer 90d / empty 48h — config preferences, Decision 5) on indexed `updated_at`, batched; **never reaps carts with authorized/pending payment sessions or transactions**.
-- [ ] `Carts::Validate`: full battery (lines present/in stock/not discontinued, email, addresses, delivery selected, payment coverage, guest policy) returning structured `{ step, field, code, message }` errors; also exposed read-only for checkout-readiness rendering.
+- [x] Full Cart model: binding settles the three inconsistent creation paths (market/channel/locale always set); recalculation-on-write — address/market change → re-price, re-tax (provider estimate on the cart), **idempotent** delivery-proposal rebuild (destructive `create_proposed_shipments` behavior dies); item changes → totals + reservation Release/Reserve/Extend dispatch carried over from `Carts::Update`.
+- [x] Fulfillments, delivery rates, and typed money lines are created **cart-owned** during checkout (owner XOR flips to `cart_id`).
+- [x] `Carts::{Create,Update,UpsertItems}` operate on Cart + get DI registration; `current_order` → `current_cart` built through `Carts::Create`.
+- [x] Legacy `Spree::Cart::*` services: 8 dead ones deleted; 6 re-homed (AddItem/SetQuantity/RemoveLineItem → carts items flow; Associate; Empty; RemoveOutOfStockItems; CompareLineItems → merge strategy).
+- [x] Merge strategy seam (`Spree::Dependencies.cart_merge_strategy`) + default preserving OrderMerger behavior minus its bugs (currency-mismatch surfaced, no silent >10 overflow destroy).
+- [x] Tiered expiry reaper (guest 30d / customer 90d / empty 48h — config preferences, Decision 5) on indexed `updated_at`, batched; **never reaps carts with authorized/pending payment sessions or transactions**.
+- [x] `Carts::Validate`: full battery (lines present/in stock/not discontinued, email, addresses, delivery selected, payment coverage, guest policy) returning structured `{ step, field, code, message }` errors; also exposed read-only for checkout-readiness rendering.
### T5.2 `Carts::Complete` — three-phase pipeline
-- [ ] **PREPARE** (one txn): replay via `completion_result(cart)` (order or order_group); `with_lock` + `completing_at` with TTL takeover; in-lock recalculation; `expected_total` drift guard (409 `cart_changed`); Validate; reservation availability check + hold extension; draft Order creation with copies (line items re-pointed, typed lines per the split-adjustments copy contract, fulfillments + selected rates, **address copies**, email/currency/locale/market/channel, guest token carried, `R` number) + unique `orders.cart_id`.
-- [ ] **PAYMENT:** offline methods (Check, terms, COD, bank transfer, store credit, gift cards, manual) collapse into FINALIZE — single txn, nothing to compensate; external gateways outside any txn with Y3 compensation (destroy draft + copies, clear `completing_at`, 422 `payment_failed`); completion gates on "valid payment covers total", never `paid?`; store credit recalculated in P3 and voided last; `allow_checkout_on_gateway_error` external-only.
-- [ ] **FINALIZE** (one txn, every step idempotent): inventory finalize + unstock + reservation release (single home — fixes the admin-path asymmetry); counters behind persisted flags (coupon, gift card redeem, promo credits); vendor-split hook F3 (no-op single partition); `draft`→`placed` + `cart.completed_at` + `RecomputeStatuses`; after_commit events (`order.placed`/`order.completed`), digital fulfillment via provider, account creation/newsletter as non-fatal side jobs.
-- [ ] Resumability structural (`status: 'draft'` + `cart_id` + `completed_at: nil` = finalize pending); completion-recovery sweeper job (retries FINALIZE for stale drafts with paid coverage; alerts on persistent failure; **never auto-refunds**); webhook writer (`Payments::HandleWebhook`) converges on the same service — 30s delay becomes latency optimization only.
-- [ ] Mutation guards: `completing_at` → 409 `cart_locked` on item/address/discount writes; `lock_version` → 409 `stale_cart`.
-- [ ] Admin/B2B `Orders::Complete` path reuses the same service (idempotency + inventory + reservation release in one place).
-- [ ] API contract: the full outcome table (200 order/order_group incl. replay; 422 validation errors in requirements shape; 422 `payment_failed`; 409 `cart_changed`/`completion_in_progress`/`cart_locked`).
+- [x] **PREPARE** (one txn): replay via `completion_result(cart)` (order or order_group); `with_lock` + `completing_at` with TTL takeover; in-lock recalculation; `expected_total` drift guard (409 `cart_changed`); Validate; reservation availability check + hold extension; draft Order creation with copies (line items re-pointed, typed lines per the split-adjustments copy contract, fulfillments + selected rates, **address copies**, email/currency/locale/market/channel, guest token carried, `R` number) + unique `orders.cart_id`.
+- [x] **PAYMENT:** offline methods (Check, terms, COD, bank transfer, store credit, gift cards, manual) collapse into FINALIZE — single txn, nothing to compensate; external gateways outside any txn with Y3 compensation (destroy draft + copies, clear `completing_at`, 422 `payment_failed`); completion gates on "valid payment covers total", never `paid?`; store credit recalculated in P3 and voided last; `allow_checkout_on_gateway_error` external-only.
+- [x] **FINALIZE** (one txn, every step idempotent): inventory finalize + unstock + reservation release (single home — fixes the admin-path asymmetry); counters behind persisted flags (coupon, gift card redeem, promo credits); vendor-split hook F3 (no-op single partition); `draft`→`placed` + `cart.completed_at` + `RecomputeStatuses`; after_commit events (`order.placed`/`order.completed`), digital fulfillment via provider, account creation/newsletter as non-fatal side jobs.
+- [x] Resumability structural (`status: 'draft'` + `cart_id` + `completed_at: nil` = finalize pending); completion-recovery sweeper job (retries FINALIZE for stale drafts with paid coverage; alerts on persistent failure; **never auto-refunds**); webhook writer (`Payments::HandleWebhook`) converges on the same service — 30s delay becomes latency optimization only.
+- [x] Mutation guards: `completing_at` → 409 `cart_locked` on item/address/discount writes; `lock_version` → 409 `stale_cart`.
+- [x] Admin/B2B `Orders::Complete` path reuses the same service (idempotency + inventory + reservation release in one place).
+- [x] API contract: the full outcome table (200 order/order_group incl. replay; 422 validation errors in requirements shape; 422 `payment_failed`; 409 `cart_changed`/`completion_in_progress`/`cart_locked`).
### T5.3 Machine removal (P4)
-- [ ] Delete `Order::Checkout`, the `spree_orders.state` column, `checkout_flow`/`insert_checkout_step`/`remove_checkout_step`, `next!`/`advance`/`can_go_to_state?` (Decision 3: hard removal + migration guide, no shim).
-- [ ] Order lifecycle without a machine: `status` draft/placed/canceled; `completed?` ≡ `completed_at`; `can_ship?`/`uneditable?`/`allow_cancel?`/`LINE_ITEM_REMOVABLE_STATES`-style predicates re-expressed; `partially_canceled` derived predicate (Decision 8); `awaiting_return`/`returned` **not** carried (returns plan).
-- [ ] `Orders::Cancel/Resume/Approve` flip `status` with today's side effects verbatim (restock/void/refund branches).
-- [ ] `confirmation_required?` computed from data only (config + selected payment methods); no state fallback on confirm failure.
-- [ ] Order `state_changes` writes dropped (lifecycle events are the audit); payment/fulfillment StateChange rows unaffected.
-- [ ] Ransack whitelist: `state` out; `status`/`payment_status`/`fulfillment_status` in.
-- [ ] The six out-of-band `state` writers (address services etc.) become cart-recalculation triggers.
+- [x] Delete `Order::Checkout`, the `spree_orders.state` column, `checkout_flow`/`insert_checkout_step`/`remove_checkout_step`, `next!`/`advance`/`can_go_to_state?` (Decision 3: hard removal + migration guide, no shim).
+- [x] Order lifecycle without a machine: `status` draft/placed/canceled; `completed?` ≡ `completed_at`; `can_ship?`/`uneditable?`/`allow_cancel?`/`LINE_ITEM_REMOVABLE_STATES`-style predicates re-expressed; `partially_canceled` derived predicate (Decision 8); `awaiting_return`/`returned` **not** carried (returns plan).
+- [x] `Orders::Cancel/Resume/Approve` flip `status` with today's side effects verbatim (restock/void/refund branches).
+- [x] `confirmation_required?` computed from data only (config + selected payment methods); no state fallback on confirm failure.
+- [x] Order `state_changes` writes dropped (lifecycle events are the audit); payment/fulfillment StateChange rows unaffected.
+- [x] Ransack whitelist: `state` out; `status`/`payment_status`/`fulfillment_status` in.
+- [x] The six out-of-band `state` writers (address services etc.) become cart-recalculation triggers.
### T5.4 `RecomputeStatuses` (single writer)
-- [ ] `Spree::Orders::RecomputeStatuses` — the only writer of `payment_status` + `fulfillment_status`; quantize to currency precision before comparing; subtract granted/pending refunds; domains incl. `overcharged`/`voided` (payment) and `backorder` (fulfillment, owned by the fulfillment plan); triggered from payment/refund/fulfillment/return event subscribers, never inline from controllers; replaces `OrderUpdater#update_payment_state`/`update_shipment_state`.
+- [x] `Spree::Orders::RecomputeStatuses` — the only writer of `payment_status` + `fulfillment_status`; quantize to currency precision before comparing; subtract granted/pending refunds; domains incl. `overcharged`/`voided` (payment) and `backorder` (fulfillment, owned by the fulfillment plan); triggered from payment/refund/fulfillment/return event subscribers, never inline from controllers; replaces `OrderUpdater#update_payment_state`/`update_shipment_state`.
### T5.5 Test support rewrite
-- [ ] `order_walkthrough` cart-first; order/cart factories (order factories build completed orders through the real completion service or direct construction — decide pattern here); whole-suite green across engines.
+- [x] `order_walkthrough` cart-first; order/cart factories (order factories build completed orders through the real completion service or direct construction — decide pattern here); whole-suite green across engines.
---
diff --git a/packages/admin-sdk/src/types/generated/Adjustment.ts b/packages/admin-sdk/src/types/generated/Adjustment.ts
deleted file mode 100644
index 0e8aa08e22..0000000000
--- a/packages/admin-sdk/src/types/generated/Adjustment.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Typelizer digest 96241a139ecac2bcf304995aed0ee5f3
-//
-// DO NOT MODIFY: This file was automatically generated by Typelizer.
-
-interface Adjustment {
- id: string;
- label: string;
- display_amount: string;
- included: boolean;
- created_at: string;
- updated_at: string;
- amount: string;
- order_id: string | null;
-}
-
-export default Adjustment;
diff --git a/packages/admin-sdk/src/types/generated/Fulfillment.ts b/packages/admin-sdk/src/types/generated/Fulfillment.ts
index 3a4b532c86..ff6f5e7ae1 100644
--- a/packages/admin-sdk/src/types/generated/Fulfillment.ts
+++ b/packages/admin-sdk/src/types/generated/Fulfillment.ts
@@ -1,7 +1,7 @@
-// Typelizer digest f0238fdf3627e79f0daeda84320bf6e5
+// Typelizer digest bbed88b8ea7ca52131296db84b48aa3b
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {DeliveryMethod, StockLocation, DeliveryRate, Order, Adjustment} from '@/types'
+import type {DeliveryMethod, StockLocation, DeliveryRate, Order} from '@/types'
interface Fulfillment {
id: string;
@@ -35,7 +35,6 @@ interface Fulfillment {
order_id: string | null;
stock_location_id: string | null;
order?: Order;
- adjustments?: Array<Adjustment>;
}
export default Fulfillment;
diff --git a/packages/admin-sdk/src/types/generated/LineItem.ts b/packages/admin-sdk/src/types/generated/LineItem.ts
index 5b97c498e5..09d237ec9f 100644
--- a/packages/admin-sdk/src/types/generated/LineItem.ts
+++ b/packages/admin-sdk/src/types/generated/LineItem.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 69de5e05b8466098dbd80b2b389511cf
+// Typelizer digest 7c4c4d850ba307ee66d6e088101d1cba
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {OptionValue, DigitalLink, Variant, TaxCategory, Adjustment} from '@/types'
+import type {OptionValue, DigitalLink, Variant, TaxCategory} from '@/types'
interface LineItem {
id: string;
@@ -41,7 +41,6 @@ interface LineItem {
tax_category_id: string | null;
variant?: Variant;
tax_category?: TaxCategory;
- adjustments?: Array<Adjustment>;
}
export default LineItem;
diff --git a/packages/admin-sdk/src/types/generated/Order.ts b/packages/admin-sdk/src/types/generated/Order.ts
index 0031ca9cd6..36b089353a 100644
--- a/packages/admin-sdk/src/types/generated/Order.ts
+++ b/packages/admin-sdk/src/types/generated/Order.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 7db4fa96518d9ed5a5001642abc23694
+// Typelizer digest 045dabbbb4a625d1281160da95051bb0
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {Discount, LineItem, Fulfillment, Payment, Address, GiftCard, Market, Channel, StockLocation, PaymentMethod, Customer, Adjustment, ReturnAuthorization, Reimbursement} from '@/types'
+import type {Discount, LineItem, Fulfillment, Payment, Address, GiftCard, Market, Channel, StockLocation, PaymentMethod, Customer, ReturnAuthorization, Reimbursement} from '@/types'
interface Order {
id: string;
@@ -73,7 +73,6 @@ interface Order {
approver?: Customer;
canceler?: Customer;
created_by?: Customer;
- adjustments?: Array<Adjustment>;
return_authorizations?: Array<ReturnAuthorization>;
reimbursements?: Array<Reimbursement>;
}
diff --git a/packages/admin-sdk/src/types/generated/index.ts b/packages/admin-sdk/src/types/generated/index.ts
index 80ceddf3d8..5062a1679c 100644
--- a/packages/admin-sdk/src/types/generated/index.ts
+++ b/packages/admin-sdk/src/types/generated/index.ts
@@ -1,8 +1,7 @@
-// Typelizer digest a3a8e7a474f3994022f2f94ebdfc1e66
+// Typelizer digest f13784d3e9c6c459e63893766a3e59ee
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
export type { default as Address } from './Address'
-export type { default as Adjustment } from './Adjustment'
export type { default as AdminUser } from './AdminUser'
export type { default as AllowedOrigin } from './AllowedOrigin'
export type { default as ApiKey } from './ApiKey'
diff --git a/packages/sdk/src/types/generated/Cart.ts b/packages/sdk/src/types/generated/Cart.ts
index db79eb0fbc..2b4be4b0f9 100644
--- a/packages/sdk/src/types/generated/Cart.ts
+++ b/packages/sdk/src/types/generated/Cart.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 94f0a1e48d2e56a54ffb4b244fb0a8fa
+// Typelizer digest 18aa08b4b16a43bcdc08e11808cd3c1a
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {Discount, LineItem, Fulfillment, Payment, Address, PaymentMethod, GiftCard, Market} from '@/types'
diff --git a/packages/sdk/src/types/generated/Order.ts b/packages/sdk/src/types/generated/Order.ts
index ed95db8ad3..d5878afe2a 100644
--- a/packages/sdk/src/types/generated/Order.ts
+++ b/packages/sdk/src/types/generated/Order.ts
@@ -1,4 +1,4 @@
-// Typelizer digest ff468dbc257cdcb510b5e55b7caf94ff
+// Typelizer digest 39b608bc4333e1f86bb7c3bf988c6d69
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {Discount, LineItem, Fulfillment, Payment, Address, GiftCard, Market} from '@/types'
diff --git a/packages/sdk/src/types/generated/PaymentSession.ts b/packages/sdk/src/types/generated/PaymentSession.ts
index 7b516a772d..73676a5525 100644
--- a/packages/sdk/src/types/generated/PaymentSession.ts
+++ b/packages/sdk/src/types/generated/PaymentSession.ts
@@ -1,4 +1,4 @@
-// Typelizer digest d0acb74af1197e1b021d20c12fd82ea4
+// Typelizer digest 1e3314eb2a7e3ac6fc3e22aae13da15c
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {PaymentMethod, Payment} from '@/types'
@@ -13,7 +13,8 @@ interface PaymentSession {
expires_at: string | null;
amount: string;
payment_method_id: string;
- order_id: string;
+ order_id: string | null;
+ cart_id: string | null;
payment_method: PaymentMethod;
payment?: Payment;
}
diff --git a/packages/sdk/src/zod/generated/PaymentSession.ts b/packages/sdk/src/zod/generated/PaymentSession.ts
index 659561bac4..c4e93f7e85 100644
--- a/packages/sdk/src/zod/generated/PaymentSession.ts
+++ b/packages/sdk/src/zod/generated/PaymentSession.ts
@@ -13,7 +13,8 @@ export const PaymentSessionSchema = z.object({
expires_at: z.string().nullable(),
amount: z.string(),
payment_method_id: z.string(),
- order_id: z.string(),
+ order_id: z.string().nullable(),
+ cart_id: z.string().nullable(),
payment_method: PaymentMethodSchema,
payment: PaymentSchema.optional(),
});
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.rb
index bfe01844e3..eee6d48271 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
@@ -42,16 +42,12 @@ module Spree
params.permit(:selected_delivery_rate_id)
end
- # Temporary — Spree 6 removes the checkout state machine.
def try_advance
- return if @cart.confirm? || @cart.complete? || @cart.canceled?
+ return if @cart.complete? || @cart.canceled?
- loop do
- break if @cart.payment?
- break unless @cart.next
- end
+ @cart.update_with_updater!
rescue StandardError => e
- Rails.error.report(e, context: { order_id: @cart.id, state: @cart.state }, source: 'spree.checkout')
+ Rails.error.report(e, context: { order_id: @cart.id }, source: 'spree.checkout')
ensure
@cart.reload
end
diff --git a/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb
index 0f0a3065c6..7d912dd20b 100644
--- a/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb
@@ -17,7 +17,7 @@ module Spree
def show
@cart = find_cart
- if @cart.ship_address_id.present? && @cart.shipments.empty?
+ if @cart.ship_address_id.present? && @cart.fulfillments.empty?
ActiveRecord::Base.connected_to(role: :writing) do
with_order_lock { Spree::Checkout::Advance.call(order: @cart) }
end
@@ -147,7 +147,7 @@ module Spree
# Explicit by-ID lookups (show/update) stay cross-channel so a shared
# checkout can load any cart the caller is authorized for.
def scope
- current_store.carts.where(user: current_user, channel: current_channel).order(updated_at: :desc)
+ current_store.carts.where(customer: current_user, channel: current_channel).order(updated_at: :desc)
end
private
@@ -185,7 +185,7 @@ module Spree
# Find incomplete cart for associate action.
# Only finds guest carts (no user) or carts already owned by current user (idempotent).
def find_cart_for_association
- current_store.carts.where(user: [nil, current_user]).find_by_prefix_id!(params[:id])
+ current_store.carts.where(customer: [nil, current_user]).find_by_prefix_id!(params[:id])
end
# Claiming a cart requires presenting its token, even when the caller
diff --git a/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb b/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb
index 778107f033..3830d99a9f 100644
--- a/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb
+++ b/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb
@@ -5,7 +5,8 @@ module Spree
typelize status: :string, amount: :string, currency: :string,
external_id: :string, external_data: 'Record<string, unknown>',
expires_at: [:string, nullable: true], customer_external_id: [:string, nullable: true],
- payment_method_id: :string, order_id: :string
+ payment_method_id: :string, order_id: [:string, nullable: true],
+ cart_id: [:string, nullable: true]
attributes :status, :currency, :external_id, :external_data,
:customer_external_id,
@@ -19,8 +20,14 @@ module Spree
session.payment_method&.prefixed_id
end
+ # Bridge: reports the owner (cart during checkout, order after
+ # completion) until clients migrate to cart_id/order_id.
attribute :order_id do |session|
- session.order&.prefixed_id
+ session.owner&.prefixed_id
+ end
+
+ attribute :cart_id do |session|
+ session.cart&.prefixed_id
end
one :payment_method, resource: proc { Spree.api.payment_method_serializer }
diff --git a/spree/api/spec/controllers/concerns/spree/api/v3/idempotent_spec.rb b/spree/api/spec/controllers/concerns/spree/api/v3/idempotent_spec.rb
index d0846e1ebc..63a4b62a86 100644
--- a/spree/api/spec/controllers/concerns/spree/api/v3/idempotent_spec.rb
+++ b/spree/api/spec/controllers/concerns/spree/api/v3/idempotent_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Spree::Api::V3::Idempotent, type: :controller do
let(:idempotency_key) { SecureRandom.uuid }
it 'processes normally without Idempotency-Key header' do
- expect { post :create }.to change(Spree::Order, :count).by(1)
+ expect { post :create }.to change(Spree::Cart, :count).by(1)
expect(response).to have_http_status(:created)
expect(response.headers['Idempotent-Replayed']).to be_nil
end
@@ -30,11 +30,11 @@ RSpec.describe Spree::Api::V3::Idempotent, type: :controller do
it 'caches and replays the response for duplicate requests' do
request.headers['Idempotency-Key'] = idempotency_key
- expect { post :create }.to change(Spree::Order, :count).by(1)
+ expect { post :create }.to change(Spree::Cart, :count).by(1)
expect(response).to have_http_status(:created)
first_response = json_response
- expect { post :create }.not_to change(Spree::Order, :count)
+ expect { post :create }.not_to change(Spree::Cart, :count)
expect(response).to have_http_status(:created)
expect(response.headers['Idempotent-Replayed']).to eq('true')
expect(json_response['id']).to eq(first_response['id'])
@@ -53,10 +53,10 @@ RSpec.describe Spree::Api::V3::Idempotent, type: :controller do
it 'allows different idempotency keys for different requests' do
request.headers['Idempotency-Key'] = 'key-1'
- expect { post :create }.to change(Spree::Order, :count).by(1)
+ expect { post :create }.to change(Spree::Cart, :count).by(1)
request.headers['Idempotency-Key'] = 'key-2'
- expect { post :create }.to change(Spree::Order, :count).by(1)
+ expect { post :create }.to change(Spree::Cart, :count).by(1)
end
it 'scopes cache by API key' do
@@ -68,7 +68,7 @@ RSpec.describe Spree::Api::V3::Idempotent, type: :controller do
request.headers['X-Spree-Api-Key'] = other_api_key.token
request.headers['Idempotency-Key'] = idempotency_key
- expect { post :create }.to change(Spree::Order, :count).by(1)
+ expect { post :create }.to change(Spree::Cart, :count).by(1)
expect(response.headers['Idempotent-Replayed']).to be_nil
expect(json_response['id']).not_to eq(first_response['id'])
end
@@ -82,7 +82,7 @@ RSpec.describe Spree::Api::V3::Idempotent, type: :controller do
end
it 'does not apply to GET requests' do
- cart = create(:order, store: store)
+ cart = create(:cart, store: store)
request.headers['x-spree-token'] = cart.token
request.headers['Idempotency-Key'] = idempotency_key
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
index dad9f4a8a0..841bcc3c2d 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
@@ -37,8 +37,8 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
context 'with ransack filtering' do
let!(:completed_order) { create(:completed_order_with_totals, store: store) }
- it 'filters by state' do
- get :index, params: { q: { state_eq: 'complete' } }, as: :json
+ it 'filters by completion' do
+ get :index, params: { q: { completed_at_not_null: 1 } }, as: :json
expect(response).to have_http_status(:ok)
expect(json_response['data'].length).to eq(1)
@@ -650,7 +650,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
subject
expect(response).to have_http_status(:ok)
- expect(order.reload.state).to eq('canceled')
+ expect(order.reload).to be_canceled
end
end
@@ -683,7 +683,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
subject
expect(response).to have_http_status(:ok)
- expect(order.reload.state).to eq('resumed')
+ expect(order.reload).not_to be_canceled
end
end
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
index 247a4f110b..f10b92fe15 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::DiscountCodesController, type: :con
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -90,7 +90,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::DiscountCodesController, type: :con
end
context 'with guest spree token' do
- let(:guest_order) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_order) { create(:cart_with_line_items, store: store, customer: nil) }
let!(:promotion) { create(:promotion_with_item_adjustment, code: 'GUEST10') }
before do
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
index ed35070c4c..a10088d75a 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
@@ -5,14 +5,17 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
include_context 'API v3 Store'
+ let!(:shipping_method) { create(:shipping_method) }
let!(:order) do
- create(:order_with_line_items, user: user, store: store, state: 'delivery').tap do |o|
- o.create_proposed_shipments
- o.shipments.first.refresh_rates
+ create(:cart_with_line_items, customer: user, store: store).tap do |o|
+ o.update!(email: user.email, ship_address: create(:address))
+ o.rebuild_fulfillments!
+ o.fulfillments.first.refresh_rates
+ o.set_fulfillments_cost
o.reload
end
end
- let!(:fulfillment) { order.shipments.first }
+ let!(:fulfillment) { order.fulfillments.first }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -25,17 +28,17 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
let(:expensive_shipping_method) { create(:shipping_method, name: 'Express Shipping') }
before do
- fulfillment.shipping_rates.delete_all
+ fulfillment.delivery_rates.delete_all
create(:shipping_rate, shipment: fulfillment, shipping_method: cheaper_shipping_method, cost: 5, selected: true)
create(:shipping_rate, shipment: fulfillment, shipping_method: expensive_shipping_method, cost: 25, selected: false)
fulfillment.reload
- order.set_shipments_cost
+ order.set_fulfillments_cost
end
- it 'updates order totals when a different delivery rate is selected' do
- expensive_rate = fulfillment.shipping_rates.find_by(shipping_method: expensive_shipping_method)
+ it 'updates cart totals when a different delivery rate is selected' do
+ expensive_rate = fulfillment.delivery_rates.find_by(shipping_method: expensive_shipping_method)
- expect(order.shipment_total).to eq(5)
+ expect(order.delivery_total).to eq(5)
patch :update, params: {
cart_id: order.prefixed_id,
@@ -46,15 +49,15 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
expect(response).to have_http_status(:ok)
expect(json_response['id']).to start_with('cart_')
order.reload
- expect(order.shipment_total).to eq(25)
+ expect(order.delivery_total).to eq(25)
end
end
context 'auto-advance after rate selection' do
- it 'advances order from delivery to payment' do
- rate = fulfillment.shipping_rates.first
+ it 'advances the cart from delivery to payment' do
+ rate = fulfillment.delivery_rates.first
- expect(order.state).to eq('delivery')
+ expect(order.current_checkout_step).to eq('payment').or eq('delivery')
patch :update, params: {
cart_id: order.prefixed_id,
@@ -63,13 +66,11 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
}
expect(response).to have_http_status(:ok)
- expect(order.reload.state).to eq('payment')
expect(json_response['current_step']).to eq('payment')
end
it 'does not fail if advancement is not possible' do
- order.update_column(:state, 'address')
- rate = fulfillment.shipping_rates.first
+ rate = fulfillment.delivery_rates.first
patch :update, params: {
cart_id: order.prefixed_id,
@@ -80,17 +81,16 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
expect(response).to have_http_status(:ok)
end
- it 'does not advance from payment to complete' do
+ it 'does not complete the cart' do
create(:store_credit_payment_method)
credit = create(:store_credit, user: order.user, store: store, amount: order.total)
order.payments.create!(
source: credit,
payment_method: Spree::PaymentMethod::StoreCredit.first,
amount: (order.total / 2).to_d,
- state: 'checkout',
response_code: credit.generate_authorization_code
)
- rate = fulfillment.shipping_rates.first
+ rate = fulfillment.delivery_rates.first
patch :update, params: {
cart_id: order.prefixed_id,
@@ -100,7 +100,6 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
expect(response).to have_http_status(:ok)
order.reload
- expect(order.state).to eq('payment')
expect(order.completed_at).to be_nil
end
end
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
index e4f5c1f590..5463efd581 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::GiftCardsController, type: :control
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -54,7 +54,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::GiftCardsController, type: :control
end
context 'with guest spree token' do
- let(:guest_order) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_order) { create(:cart_with_line_items, store: store, customer: nil) }
before do
request.headers['Authorization'] = nil
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
index 2a041e86dd..6adb31c50c 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::ItemsController, type: :controller
let(:product) { create(:product) }
let(:variant) { create(:variant, product: product) }
- let!(:order) { create(:order, user: user, store: store) }
+ let!(:order) { create(:cart, customer: user, store: store) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -54,7 +54,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::ItemsController, type: :controller
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order, user: nil, store: store) }
+ let(:guest_order) { create(:cart, customer: nil, store: store) }
before { request.headers['Authorization'] = nil }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
index 963a9aa073..dc0f293aeb 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
@@ -5,11 +5,11 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
include_context 'API v3 Store'
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let(:order) { create(:cart_with_line_items, customer: user, store: store) }
let(:payment_method) { create(:bogus_payment_method) }
let!(:payment_session) do
create(:bogus_payment_session,
- order: order,
+ cart: order, order: nil,
payment_method: payment_method,
amount: order.total,
external_data: { 'client_secret' => 'secret_123' })
@@ -43,7 +43,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order_with_line_items, user: nil, store: store, state: 'payment') }
+ let(:guest_order) { create(:cart_with_line_items, customer: nil, store: store) }
before { request.headers['Authorization'] = nil }
@@ -97,9 +97,9 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
it 'returns not found for payment session from another order' do
other_user = create(:user)
- other_order = create(:order_with_line_items, user: other_user, store: store, state: 'payment')
+ other_order = create(:cart_with_line_items, customer: other_user, store: store)
other_session = create(:bogus_payment_session,
- order: other_order,
+ cart: other_order, order: nil,
payment_method: payment_method)
get :show, params: { cart_id: order.prefixed_id, id: other_session.to_param }
@@ -109,9 +109,9 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
it 'returns not found for external_id from another order' do
other_user = create(:user)
- other_order = create(:order_with_line_items, user: other_user, store: store, state: 'payment')
+ other_order = create(:cart_with_line_items, customer: other_user, store: store)
other_session = create(:bogus_payment_session,
- order: other_order,
+ cart: other_order, order: nil,
payment_method: payment_method)
get :show, params: { cart_id: order.prefixed_id, id: other_session.external_id }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
index 8b1c36aae5..81c3c64316 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controll
include_context 'API v3 Store'
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let(:order) { create(:cart_with_line_items, customer: user, store: store) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -25,10 +25,10 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controll
end
it 'creates a payment with a custom amount' do
- post :create, params: { cart_id: order.prefixed_id, payment_method_id: check_payment_method.prefixed_id, amount: '50.00' }
+ post :create, params: { cart_id: order.prefixed_id, payment_method_id: check_payment_method.prefixed_id, amount: '5.00' }
expect(response).to have_http_status(:created)
- expect(json_response['amount']).to eq('50.0')
+ expect(json_response['amount']).to eq('5.0')
end
it 'creates a payment with metadata' do
@@ -69,7 +69,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controll
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order_with_line_items, user: nil, store: store, state: 'payment') }
+ let(:guest_order) { create(:cart_with_line_items, customer: nil, store: store) }
before { request.headers['Authorization'] = nil }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
index f63dbf91d2..06c0f1faf3 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::StoreCreditsController, type: :cont
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let!(:order) { create(:cart_with_line_items, customer: user, store: store) }
let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
let!(:store_credit) { create(:store_credit, user: user, store: store, amount: 100) }
@@ -25,7 +25,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::StoreCreditsController, type: :cont
context 'without available store credit' do
let(:user_without_credit) { create(:user) }
- let!(:order_without_credit) { create(:order_with_line_items, user: user_without_credit, store: store, state: 'payment') }
+ let!(:order_without_credit) { create(:cart_with_line_items, customer: user_without_credit, store: store) }
it 'returns an error' do
jwt = Spree::Api::V3::TestingSupport.generate_jwt(user_without_credit)
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
index b2a5baf95d..50946b9696 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
request.headers['X-Spree-Api-Key'] = api_key.token
end
- let(:cart) { Spree::Order.last }
+ let(:cart) { Spree::Cart.last }
describe 'GET #index' do
context 'with JWT authentication' do
@@ -23,8 +23,8 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
request.headers['Authorization'] = "Bearer #{jwt_token}"
end
- let!(:user_cart1) { create(:order, user: user, store: store) }
- let!(:user_cart2) { create(:order, user: user, store: store) }
+ let!(:user_cart1) { create(:cart, customer: user, store: store) }
+ let!(:user_cart2) { create(:cart, customer: user, store: store) }
it 'returns the current users carts' do
get :index
@@ -37,7 +37,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'scopes carts to the request channel — other channels never leak into a surface' do
wholesale = create(:channel, store: store, code: 'wholesale')
- wholesale_cart = create(:order, user: user, store: store, channel: wholesale)
+ wholesale_cart = create(:cart, customer: user, store: store, channel: wholesale)
get :index
@@ -77,7 +77,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'does not return other users carts' do
other_user = create(:user)
- create(:order, user: other_user, store: store)
+ create(:cart, customer: other_user, store: store)
get :index
@@ -86,7 +86,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'does not return guest carts' do
- create(:order, user: nil, store: store)
+ create(:cart, customer: nil, store: store)
get :index
@@ -105,7 +105,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'does not return carts from other stores' do
other_store = create(:store)
- create(:order, user: user, store: other_store)
+ create(:cart, customer: user, store: other_store)
get :index
@@ -138,7 +138,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'creates a new cart' do
expect do
post :create
- end.to change(Spree::Order, :count).by(1)
+ end.to change(Spree::Cart, :count).by(1)
expect(response).to have_http_status(:created)
expect(json_response['number']).to be_present
@@ -200,7 +200,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
post :create, params: { metadata: { 'source' => 'mobile_app', 'campaign' => 'summer_sale' } }
expect(response).to have_http_status(:created)
- order = Spree::Order.last
+ order = Spree::Cart.last
expect(order.metadata).to eq({ 'source' => 'mobile_app', 'campaign' => 'summer_sale' })
end
@@ -222,7 +222,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
post :create
expect(response).to have_http_status(:created)
- expect(cart.user_id).to eq(user.id)
+ expect(cart.customer_id).to eq(user.id)
end
end
@@ -247,7 +247,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
}
expect(response).to have_http_status(:created)
- order = Spree::Order.last
+ order = Spree::Cart.last
expect(order.line_items.count).to eq(2)
expect(order.line_items.find_by(variant: variant).quantity).to eq(2)
expect(order.line_items.find_by(variant: variant2).quantity).to eq(1)
@@ -298,7 +298,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
describe 'GET #show' do
context 'with x-spree-token header' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
before { request.headers['x-spree-token'] = cart.token }
@@ -338,7 +338,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns not found for other store cart' do
other_store = create(:store)
- other_cart = create(:order_with_line_items, store: other_store)
+ other_cart = create(:cart_with_line_items, store: other_store)
request.headers['x-spree-token'] = other_cart.token
get :show, params: { id: other_cart.prefixed_id }
@@ -351,7 +351,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
request.headers['Authorization'] = "Bearer #{jwt_token}"
end
- let!(:cart) { create(:order_with_line_items, user: user, store: store) }
+ let!(:cart) { create(:cart_with_line_items, customer: user, store: store) }
it 'returns the users cart' do
get :show, params: { id: cart.prefixed_id }
@@ -362,7 +362,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns forbidden when cart belongs to another user' do
other_user = create(:user)
- other_cart = create(:order_with_line_items, user: other_user, store: store)
+ other_cart = create(:cart_with_line_items, customer: other_user, store: store)
get :show, params: { id: other_cart.prefixed_id }
@@ -390,7 +390,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'response structure' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
before { request.headers['x-spree-token'] = cart.token }
@@ -434,7 +434,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'warnings' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
before { request.headers['x-spree-token'] = cart.token }
@@ -483,7 +483,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
context 'auto-advance' do
let(:user) { create(:user_with_addresses) }
- let(:cart) { create(:order_with_line_items, store: store, user: user) }
+ let(:cart) { create(:cart_with_line_items, store: store, customer: user) }
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
let!(:zone) { create(:zone, zone_members: [Spree::ZoneMember.new(zoneable: country)]) }
@@ -496,11 +496,10 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'generates shipments when address is present but shipments are empty' do
address = create(:address, user: user, country: country, state: us_state)
cart.update!(email: '[email protected]', ship_address: address)
- cart.shipments.delete_all
- cart.update_column(:state, 'address')
+ cart.fulfillments.delete_all
cart.reload
- expect(cart.shipments).to be_empty
+ expect(cart.fulfillments).to be_empty
get :show, params: { id: cart.prefixed_id }
@@ -511,9 +510,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'surfaces a delivery_unavailable warning when the cart cannot be delivered' do
address = create(:address, user: user, country: country, state: us_state)
cart.update!(email: '[email protected]', ship_address: address)
- cart.shipments.delete_all
- cart.update_column(:state, 'address')
-
+ cart.fulfillments.delete_all
# Give the products a fulfillment type no delivery method serves.
unserved_type = create(:product_type, name: 'Pickup Only', fulfillment_types: ['pickup'])
cart.line_items.each { |line_item| line_item.variant.product.update!(product_type: unserved_type) }
@@ -531,7 +528,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'does not advance when no address is set' do
cart.update!(ship_address: nil)
- cart.shipments.delete_all
+ cart.fulfillments.delete_all
cart.reload
get :show, params: { id: cart.prefixed_id }
@@ -542,7 +539,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'with a custom address serializer' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
before { request.headers['x-spree-token'] = cart.token }
@@ -559,6 +556,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'serializes the billing address with the configured serializer' do
+ cart.update!(bill_address: create(:address))
get :show, params: { id: cart.prefixed_id, expand: 'billing_address' }
expect(response).to have_http_status(:ok)
@@ -571,7 +569,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
describe 'PATCH #update' do
let(:user) { create(:user_with_addresses) }
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
let!(:zone) { create(:zone, zone_members: [Spree::ZoneMember.new(zoneable: country)]) }
@@ -669,9 +667,8 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'auto-advances to payment after address submission' do
order.update!(email: '[email protected]')
- order.next # cart -> address
- order.reload
- expect(order.state).to eq('address')
+ order.reload
+
patch :update, params: {
id: order.prefixed_id,
@@ -703,23 +700,20 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'creates a reservation when the cart leaves the cart state' do
- order.update!(email: '[email protected]')
-
expect {
- patch :update, params: { id: order.prefixed_id, shipping_address: address_params }
- }.to change { Spree::StockReservation.where(order_id: order.id).count }.by_at_least(1)
+ patch :update, params: { id: order.prefixed_id, email: '[email protected]', shipping_address: address_params }
+ }.to change { Spree::StockReservation.for_order(order).count }.by_at_least(1)
end
it 'extends an existing reservation on subsequent in-checkout updates' do
- order.update!(email: '[email protected]')
- patch :update, params: { id: order.prefixed_id, shipping_address: address_params }
- original_expiry = Spree::StockReservation.where(order_id: order.id).maximum(:expires_at)
+ patch :update, params: { id: order.prefixed_id, email: '[email protected]', shipping_address: address_params }
+ original_expiry = Spree::StockReservation.for_order(order).maximum(:expires_at)
Timecop.freeze(2.minutes.from_now) do
patch :update, params: { id: order.prefixed_id, customer_note: 'please ring bell' }
end
- expect(Spree::StockReservation.where(order_id: order.id).maximum(:expires_at)).to be > original_expiry
+ expect(Spree::StockReservation.for_order(order).maximum(:expires_at)).to be > original_expiry
end
context 'when stock_reservations_enabled is false' do
@@ -738,7 +732,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
describe 'PATCH #associate' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil, email: '[email protected]') }
+ let(:guest_cart) { create(:cart_with_line_items, store: store, customer: nil, email: '[email protected]') }
context 'with JWT authentication' do
before do
@@ -828,7 +822,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns not found when cart belongs to another user' do
other_user = create(:user)
- other_user_cart = create(:order_with_line_items, store: store, user: other_user)
+ other_user_cart = create(:cart_with_line_items, store: store, customer: other_user)
patch :associate, params: { id: other_user_cart.prefixed_id }
@@ -838,7 +832,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns not found for cart from other store' do
other_store = create(:store)
- other_store_cart = create(:order_with_line_items, store: other_store)
+ other_store_cart = create(:cart_with_line_items, store: other_store)
patch :associate, params: { id: other_store_cart.prefixed_id }
@@ -869,7 +863,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
describe 'DELETE #destroy' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
context 'with x-spree-token header' do
before { request.headers['x-spree-token'] = cart.token }
@@ -888,18 +882,19 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
:stock_reservation,
stock_item: line_item.variant.stock_items.first,
line_item: line_item,
- order: cart,
+ cart: cart,
+ order: nil,
quantity: line_item.quantity,
expires_at: 5.minutes.from_now
)
expect { delete :destroy, params: { id: cart.prefixed_id } }
- .to change { Spree::StockReservation.where(order_id: cart.id).count }.from(1).to(0)
+ .to change { Spree::StockReservation.where(cart_id: cart.id).count }.from(1).to(0)
end
end
context 'with JWT authentication' do
- let!(:user_cart) { create(:order_with_line_items, user: user, store: store) }
+ let!(:user_cart) { create(:cart_with_line_items, customer: user, store: store) }
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
@@ -914,26 +909,31 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
describe 'POST #complete' do
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'confirm') }
+ let(:order) do
+ cart = create(:cart_with_line_items, customer: user, store: store)
+ cart.update!(email: user.email, ship_address: create(:address), bill_address: create(:address))
+ cart.rebuild_fulfillments!
+ cart.set_fulfillments_cost
+ cart
+ end
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
+ create(:shipping_method) if Spree::DeliveryMethod.none?
end
it 'completes the checkout' do
- # Set up order so it can be completed
- create(:payment, order: order, amount: order.total, state: 'checkout')
- order.shipments.each { |s| s.update_column(:state, 'ready') }
+ create(:payment, cart: order, amount: order.reload.total)
post :complete, params: { id: order.prefixed_id }
expect(response).to have_http_status(:ok)
- expect(order.reload.state).to eq('complete')
+ expect(order.reload.completed_at).to be_present
+ expect(order.order).to be_present
end
it 'releases stock reservations on successful completion' do
- create(:payment, order: order, amount: order.total, state: 'checkout')
- order.shipments.each { |s| s.update_column(:state, 'ready') }
+ create(:payment, cart: order, amount: order.reload.total)
line_item = order.line_items.first
line_item.variant.stock_items.first.update!(backorderable: false)
line_item.variant.stock_items.first.set_count_on_hand(20)
@@ -941,17 +941,18 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
:stock_reservation,
stock_item: line_item.variant.stock_items.first,
line_item: line_item,
- order: order,
+ cart: order,
+ order: nil,
quantity: line_item.quantity,
expires_at: 5.minutes.from_now
)
expect { post :complete, params: { id: order.prefixed_id } }
- .to change { Spree::StockReservation.where(order_id: order.id).count }.from(1).to(0)
+ .to change { Spree::StockReservation.for_order(order).count }.from(1).to(0)
end
context 'when order cannot be completed' do
- let(:incomplete_order) { create(:order_with_line_items, user: user, store: store, state: 'address') }
+ let(:incomplete_order) { create(:cart_with_line_items, customer: user, store: store) }
it 'returns unprocessable entity with cart_cannot_complete code' do
post :complete, params: { id: incomplete_order.prefixed_id }
@@ -992,22 +993,24 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
context 'with guest cart token' do
let(:guest_order) do
- order = create(:order_with_line_items, user: nil, store: store, email: '[email protected]')
- order.update_column(:state, 'confirm')
- order
+ cart = create(:cart_with_line_items, customer: nil, store: store, email: '[email protected]')
+ cart.update!(ship_address: create(:address), bill_address: create(:address))
+ cart.rebuild_fulfillments!
+ cart.set_fulfillments_cost
+ cart
end
it 'completes via spree token' do
+ create(:shipping_method) if Spree::DeliveryMethod.none?
request.headers['Authorization'] = nil
request.headers['x-spree-token'] = guest_order.token
- create(:payment, order: guest_order, amount: guest_order.total, state: 'checkout')
- guest_order.shipments.each { |s| s.update_column(:state, 'ready') }
+ create(:payment, cart: guest_order, order: nil, amount: guest_order.reload.total)
post :complete, params: { id: guest_order.prefixed_id }
expect(response).to have_http_status(:ok)
- expect(guest_order.reload.state).to eq('complete')
+ expect(guest_order.reload.completed_at).to be_present
end
end
end
diff --git a/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb b/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
index 6825e95ea7..3c883b1368 100644
--- a/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
@@ -32,10 +32,10 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'carts listed' do
- let!(:cart1) { create(:order_with_line_items, store: store, user: user) }
- let!(:cart2) { create(:order_with_line_items, store: store, user: user) }
+ let!(:cart1) { create(:cart_with_line_items, store: store, customer: user) }
+ let!(:cart2) { create(:cart_with_line_items, store: store, customer: user) }
let!(:completed_order) { create(:completed_order_with_totals, store: store, user: user) }
- let!(:other_user_cart) { create(:order_with_line_items, store: store, user: create(:user)) }
+ let!(:other_user_cart) { create(:cart_with_line_items, store: store, customer: create(:user)) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
@@ -133,7 +133,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'cart found' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
let(:'x-spree-api-key') { api_key.token }
let(:'x-spree-token') { cart.token }
let(:id) { cart.prefixed_id }
@@ -149,7 +149,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '200', 'cart with out-of-stock item removed (warnings returned)' do
- let(:cart) { create(:order_with_line_items, store: store) }
+ let(:cart) { create(:cart_with_line_items, store: store) }
let(:'x-spree-api-key') { api_key.token }
let(:'x-spree-token') { cart.token }
let(:id) { cart.prefixed_id }
@@ -224,7 +224,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
}
response '200', 'cart updated' do
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { order.prefixed_id }
@@ -254,7 +254,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
parameter name: :id, in: :path, type: :string, required: true, description: 'Cart prefixed ID'
response '204', 'cart deleted' do
- let!(:cart) { create(:order_with_line_items, store: store, user: user) }
+ let!(:cart) { create(:cart_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { cart.prefixed_id }
@@ -283,7 +283,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
parameter name: :id, in: :path, type: :string, required: true, description: 'Cart prefixed ID'
response '200', 'cart associated successfully' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:cart_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:'x-spree-token') { guest_cart.token }
@@ -299,7 +299,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '401', 'unauthorized - JWT required' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:cart_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { '' }
let(:'x-spree-token') { guest_cart.token }
@@ -311,7 +311,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '403', 'forbidden - cart token missing or does not match' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:cart_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:'x-spree-token') { 'does-not-match' }
@@ -340,10 +340,13 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
response '200', 'cart completed' do
let(:completable_order) do
- order = create(:order_with_line_items, store: store, user: user)
- Spree.checkout_advance_service.call(order: order)
+ create(:shipping_method)
+ order = create(:cart_with_line_items, store: store, customer: user)
+ order.update!(email: user.email, ship_address: create(:address), bill_address: create(:address))
+ order.rebuild_fulfillments!
+ order.set_fulfillments_cost
payment_method = create(:check_payment_method)
- create(:payment, order: order, amount: order.total, payment_method: payment_method, state: 'checkout')
+ create(:payment, cart: order.reload, amount: order.total, payment_method: payment_method)
order.reload
end
let!(:_ensure_order) { completable_order }
@@ -361,7 +364,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '422', 'cannot complete' do
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { order.prefixed_id }
diff --git a/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb b/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
index 00a17c64e7..e97f24316d 100644
--- a/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Discount Codes API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/discount_codes' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb b/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
index c19b703971..d50de94583 100644
--- a/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
@@ -5,8 +5,17 @@ require 'swagger_helper'
RSpec.describe 'Cart Fulfillments API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user, state: 'delivery') }
- let!(:fulfillment) { order.shipments.first }
+ let!(:shipping_method) { create(:shipping_method) }
+ let!(:order) do
+ create(:cart_with_line_items, store: store, customer: user).tap do |o|
+ o.update!(email: user.email, ship_address: create(:address))
+ o.rebuild_fulfillments!
+ o.fulfillments.first.refresh_rates
+ o.set_fulfillments_cost
+ o.reload
+ end
+ end
+ let!(:fulfillment) { order.fulfillments.first }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/fulfillments/{id}' do
@@ -33,7 +42,7 @@ RSpec.describe 'Cart Fulfillments API', type: :request, swagger_doc: 'api-refere
}
response '200', 'delivery rate selected, returns updated cart' do
- let(:delivery_rate) { fulfillment.shipping_rates.first }
+ let(:delivery_rate) { fulfillment.delivery_rates.first }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { fulfillment.to_param }
diff --git a/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb b/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
index 90daf3a57c..782d152335 100644
--- a/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Gift Card API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/gift_cards' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb b/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
index 66eb173453..fbbf7e132d 100644
--- a/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Items API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order, store: store, user: user) }
+ let!(:order) { create(:cart, store: store, customer: user) }
let!(:product) { create(:product) }
let!(:variant) { product.default_variant }
let!(:line_item) { create(:line_item, order: order, variant: variant, quantity: 1) }
diff --git a/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb b/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
index 633c545a3a..35e58a8865 100644
--- a/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
@@ -5,11 +5,11 @@ require 'swagger_helper'
RSpec.describe 'Cart Payment Sessions API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user, state: 'payment') }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:payment_method) { create(:bogus_payment_method) }
let!(:payment_session) do
create(:bogus_payment_session,
- order: order,
+ cart: order, order: nil,
payment_method: payment_method,
amount: order.total,
external_data: { 'client_secret' => 'secret_123' })
diff --git a/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb b/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
index 33b3f7fae6..868cfd40cb 100644
--- a/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Payments API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user, state: 'payment') }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/payments' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb b/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
index 92fa4de5a1..0e17a3a3bd 100644
--- a/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Cart Store Credits API', type: :request, swagger_doc: 'api-refer
include_context 'API v3 Store'
let(:user) { create(:user_with_addresses) }
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:cart_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/store_credits' do
diff --git a/spree/core/app/jobs/spree/carts/reap_expired_job.rb b/spree/core/app/jobs/spree/carts/reap_expired_job.rb
new file mode 100644
index 0000000000..b69ec2276a
--- /dev/null
+++ b/spree/core/app/jobs/spree/carts/reap_expired_job.rb
@@ -0,0 +1,43 @@
+module Spree
+ module Carts
+ # Tiered cart-expiry reaper: guest carts after
+ # +guest_cart_expiry_days+, customer carts after
+ # +customer_cart_expiry_days+, empty carts after
+ # +empty_cart_expiry_hours+ — measured on updated_at, batched. Carts
+ # with money attached (authorized/pending payment sessions or payment
+ # transactions) are never reaped.
+ class ReapExpiredJob < Spree::BaseJob
+ queue_as Spree.queues.default
+
+ def perform
+ reap(empty_scope.where(updated_at: ...Spree::Config[:empty_cart_expiry_hours].hours.ago))
+ reap(guest_scope.where(updated_at: ...Spree::Config[:guest_cart_expiry_days].days.ago))
+ reap(customer_scope.where(updated_at: ...Spree::Config[:customer_cart_expiry_days].days.ago))
+ end
+
+ private
+
+ def base_scope
+ Spree::Cart.incomplete.
+ where.not(id: Spree::PaymentSession.where(status: %w[pending processing]).select(:cart_id)).
+ where.not(id: Spree::Payment.where.not(state: Spree::Payment::INVALID_STATES).where.not(cart_id: nil).select(:cart_id))
+ end
+
+ def empty_scope
+ base_scope.where.missing(:line_items)
+ end
+
+ def guest_scope
+ base_scope.where(customer_id: nil)
+ end
+
+ def customer_scope
+ base_scope.where.not(customer_id: nil)
+ end
+
+ def reap(scope)
+ scope.in_batches(of: 200, &:destroy_all)
+ end
+ end
+ end
+end
diff --git a/spree/core/app/jobs/spree/orders/finalize_stale_drafts_job.rb b/spree/core/app/jobs/spree/orders/finalize_stale_drafts_job.rb
new file mode 100644
index 0000000000..c05f085580
--- /dev/null
+++ b/spree/core/app/jobs/spree/orders/finalize_stale_drafts_job.rb
@@ -0,0 +1,29 @@
+module Spree
+ module Orders
+ # Completion-recovery sweeper: retries FINALIZE for stale draft orders
+ # whose payment coverage succeeded but whose finalize transaction never
+ # committed (e.g. process crash after capture). Never auto-refunds —
+ # persistent failures are surfaced to operators via logs/monitoring.
+ class FinalizeStaleDraftsJob < Spree::BaseJob
+ queue_as Spree.queues.default
+
+ STALE_AFTER = 10.minutes
+
+ def perform
+ Spree::Order.drafts.
+ where.not(cart_id: nil).
+ where(completed_at: nil).
+ where(created_at: ...STALE_AFTER.ago).
+ find_each do |order|
+ cart = order.cart
+ next if cart.nil? || cart.completed?
+
+ result = Spree::Dependencies.carts_complete_service.constantize.call(cart: cart)
+ Rails.logger.error("[Spree] Completion recovery failed for order #{order.number}: #{result.error&.value}") if result.failure?
+ rescue StandardError => e
+ Rails.logger.error("[Spree] Completion recovery raised for order #{order.number}: #{e.message}")
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/app/models/concerns/spree/prefixed_id.rb b/spree/core/app/models/concerns/spree/prefixed_id.rb
index 54920c54fc..4e21ad77e7 100644
--- a/spree/core/app/models/concerns/spree/prefixed_id.rb
+++ b/spree/core/app/models/concerns/spree/prefixed_id.rb
@@ -133,19 +133,30 @@ module Spree
end
def find_by_prefix_id!(prefixed_id)
- decoded = Spree::PrefixedId.decode_prefixed_id(prefixed_id)
+ decoded = decode_own_prefixed_id(prefixed_id)
raise ActiveRecord::RecordNotFound.new("Couldn't find #{name} with prefixed id=#{prefixed_id}", name) unless decoded
find(decoded)
end
def find_by_prefix_id(prefixed_id)
- decoded = Spree::PrefixedId.decode_prefixed_id(prefixed_id)
+ decoded = decode_own_prefixed_id(prefixed_id)
return nil unless decoded
find_by(id: decoded)
end
+ # Rejects prefixed IDs from other models — an or_ ID must never
+ # resolve a cart just because the numeric payloads collide.
+ def decode_own_prefixed_id(prefixed_id)
+ if _prefix_id_prefix.present?
+ expected = "#{_prefix_id_prefix}_"
+ return nil unless prefixed_id.to_s.start_with?(expected)
+ end
+
+ Spree::PrefixedId.decode_prefixed_id(prefixed_id)
+ end
+
def decode_prefixed_id(prefixed_id_string)
Spree::PrefixedId.decode_prefixed_id(prefixed_id_string)
end
diff --git a/spree/core/app/models/concerns/spree/typed_adjustment_line.rb b/spree/core/app/models/concerns/spree/typed_adjustment_line.rb
index 7938a093fb..3a61ef6267 100644
--- a/spree/core/app/models/concerns/spree/typed_adjustment_line.rb
+++ b/spree/core/app/models/concerns/spree/typed_adjustment_line.rb
@@ -27,6 +27,17 @@ module Spree
order || cart
end
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
def amount=(amount)
self[:amount] = Spree::LocalizedNumber.parse(amount)
end
diff --git a/spree/core/app/models/concerns/spree/user_methods.rb b/spree/core/app/models/concerns/spree/user_methods.rb
index 7ff3e11ab3..18fdf69c17 100644
--- a/spree/core/app/models/concerns/spree/user_methods.rb
+++ b/spree/core/app/models/concerns/spree/user_methods.rb
@@ -151,7 +151,7 @@ module Spree
self.whitelisted_ransackable_scopes = %w[search multi_search with_min_total_spent]
scope :with_min_total_spent, ->(amount) {
- joins(:orders).where(spree_orders: { state: 'complete' }).
+ joins(:orders).where.not(spree_orders: { completed_at: nil }).
group("#{table_name}.id").
having('SUM(spree_orders.total) >= ?', amount.to_d)
}
@@ -170,7 +170,7 @@ module Spree
"LEFT JOIN (" \
"SELECT user_id, COUNT(*) AS orders_count, SUM(total) AS total_spent, MAX(completed_at) AS last_order_completed_at " \
"FROM #{order_table} " \
- "WHERE state = 'complete' AND user_id IS NOT NULL " \
+ "WHERE completed_at IS NOT NULL AND user_id IS NOT NULL " \
"GROUP BY user_id" \
") orders_agg ON orders_agg.user_id = #{table_name}.id"
)
diff --git a/spree/core/app/models/spree/address.rb b/spree/core/app/models/spree/address.rb
index b63401b6c0..1503bdbf62 100644
--- a/spree/core/app/models/spree/address.rb
+++ b/spree/core/app/models/spree/address.rb
@@ -382,8 +382,8 @@ module Spree
def unassign_from_incomplete_orders
orders = Spree::Order.incomplete.where(user_id: user_id)
- orders.where(ship_address_id: id).update_all(ship_address_id: nil, state: 'address', updated_at: Time.current)
- orders.where(bill_address_id: id).update_all(bill_address_id: nil, state: 'address', updated_at: Time.current)
+ orders.where(ship_address_id: id).update_all(ship_address_id: nil, updated_at: Time.current)
+ orders.where(bill_address_id: id).update_all(bill_address_id: nil, updated_at: Time.current)
end
end
end
diff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rb
index 86a07d5139..a48cd9b188 100644
--- a/spree/core/app/models/spree/cart.rb
+++ b/spree/core/app/models/spree/cart.rb
@@ -4,8 +4,10 @@ module Spree
# retained with +completed_at+ set. Carts have no status column —
# +completed_at+ is the only lifecycle marker.
#
- # Dormant until the 6.0 checkout flip: the storefront cart endpoints still
- # operate on incomplete orders. See docs/plans/6.0-cart-order-split.md.
+ # There is no checkout state machine: progression is computed by
+ # Spree::Checkout::Requirements against cart data, and recalculation happens
+ # on the writes that matter (items, addresses, market) instead of on state
+ # transitions. See docs/plans/6.0-cart-order-split.md.
class Cart < Spree.base_class
has_prefix_id :cart
@@ -21,36 +23,150 @@ module Spree
attribute :metadata, default: -> { {} }
attribute :accept_marketing, :boolean, default: false
+ with_options default: 0.0 do
+ attribute :item_total, :decimal
+ attribute :adjustment_total, :decimal
+ attribute :included_tax_total, :decimal
+ attribute :additional_tax_total, :decimal
+ attribute :taxable_adjustment_total, :decimal
+ attribute :non_taxable_adjustment_total, :decimal
+ attribute :promo_total, :decimal
+ attribute :fee_total, :decimal
+ attribute :delivery_total, :decimal
+ attribute :total, :decimal
+ attribute :payment_total, :decimal
+ end
+ attribute :item_count, :integer, default: 0
+ attribute :lock_version, :integer, default: 0
+ alias_attribute :total_quantity, :item_count
+ alias_attribute :discount_total, :promo_total
+
+ extend Spree::DisplayMoney
+ money_methods :item_total, :adjustment_total, :included_tax_total, :additional_tax_total,
+ :promo_total, :fee_total, :delivery_total, :total, :payment_total, :outstanding_balance,
+ :discount_total, :tax_total, :pre_tax_item_amount, :pre_tax_total, :amount_due
+ alias display_ship_total display_delivery_total
+ alias_attribute :ship_total, :delivery_total
+
belongs_to :store, class_name: 'Spree::Store'
belongs_to :market, class_name: 'Spree::Market', optional: true
belongs_to :channel, class_name: 'Spree::Channel', optional: true
belongs_to :customer, class_name: "::#{Spree.user_class}", optional: true
- belongs_to :ship_address, class_name: 'Spree::Address', optional: true
- belongs_to :bill_address, class_name: 'Spree::Address', optional: true
+ belongs_to :ship_address, class_name: 'Spree::Address', optional: true, dependent: :destroy
+ belongs_to :bill_address, class_name: 'Spree::Address', optional: true, dependent: :destroy
+ belongs_to :gift_card, class_name: 'Spree::GiftCard', optional: true
+
+ alias_method :user, :customer
+ alias_method :user=, :customer=
+ alias_attribute :user_id, :customer_id
+ alias_method :shipping_address, :ship_address
+ alias_method :shipping_address=, :ship_address=
+ alias_attribute :shipping_address_id, :ship_address_id
+ alias_method :billing_address, :bill_address
+ alias_method :billing_address=, :bill_address=
+ alias_attribute :billing_address_id, :bill_address_id
+ alias_attribute :customer_note, :special_instructions
has_many :line_items, -> { order(:created_at) }, class_name: 'Spree::LineItem', inverse_of: :cart, dependent: :destroy
+ has_many :variants, through: :line_items
+ has_many :products, through: :variants
has_many :tax_lines, class_name: 'Spree::TaxLine', dependent: :destroy, inverse_of: :cart
has_many :discounts, class_name: 'Spree::Discount', dependent: :destroy, inverse_of: :cart
has_many :fees, class_name: 'Spree::Fee', dependent: :destroy, inverse_of: :cart
+ has_many :fulfillments, class_name: 'Spree::Fulfillment', dependent: :destroy, inverse_of: :cart do
+ def states
+ pluck(:status).uniq
+ end
+ end
+ has_many :shipments, class_name: 'Spree::Fulfillment', inverse_of: :cart, deprecated: true
+ has_many :fulfillment_items, through: :fulfillments, class_name: 'Spree::FulfillmentItem'
+ has_many :order_promotions, class_name: 'Spree::OrderPromotion', inverse_of: :cart, dependent: :destroy
+ has_many :promotions, through: :order_promotions, class_name: 'Spree::Promotion'
+ has_many :payments, class_name: 'Spree::Payment', inverse_of: :cart, dependent: :destroy
+ has_many :payment_sessions, class_name: 'Spree::PaymentSession', inverse_of: :cart, dependent: :destroy
+ has_many :stock_reservations, class_name: 'Spree::StockReservation', inverse_of: :cart, dependent: :destroy
has_one :order, class_name: 'Spree::Order', inverse_of: :cart
+ alias items line_items
+
+ accepts_nested_attributes_for :line_items
+ accepts_nested_attributes_for :ship_address, :bill_address
+ accepts_nested_attributes_for :payments
+ alias_method :shipping_address_attributes=, :ship_address_attributes=
+ alias_method :billing_address_attributes=, :bill_address_attributes=
+
+ before_validation :ensure_market_presence
+ before_validation :ensure_channel_presence
+
validates :store, :currency, presence: true
+ validates :market, presence: true, if: -> { store&.markets&.exists? }
+ validate :currency_must_be_supported_by_store
scope :complete, -> { where.not(completed_at: nil) }
scope :incomplete, -> { where(completed_at: nil) }
- self.whitelisted_ransackable_attributes = %w[email completed_at]
+ self.whitelisted_ransackable_attributes = %w[email completed_at token updated_at]
+
+ attr_accessor :temporary_address, :use_billing, :use_shipping, :skip_market_resolution
+
+ before_validation :resolve_market_from_currency, if: -> { persisted? && currency_changed? && !skip_market_resolution }
+
+ delegate :name, to: :customer, prefix: true, allow_nil: true
+
+ # Public cart identifier on the wire (orders keep R-numbers; carts are
+ # identified by token).
+ def number
+ token
+ end
# @return [Boolean]
def completed?
completed_at.present?
end
+ alias complete? completed?
# @return [Boolean] whether a completion attempt currently holds this cart
def completing?
completing_at.present?
end
+ # Checkout begins once any checkout-only data is present (email or a
+ # shipping address). Drives stock-reservation dispatch.
+ def in_checkout?
+ !completed? && (email.present? || ship_address_id.present?)
+ end
+
+ # Reservation dispatch parity with the order-based checkout.
+ def cart?
+ !in_checkout?
+ end
+
+ # @return [Boolean] carts are never canceled — completion or expiry only
+ def canceled?
+ false
+ end
+
+ class_attribute :update_hooks, default: Set.new
+
+ # Mirrors Spree::Order.register_update_hook for cart-side hooks.
+ def self.register_update_hook(hook)
+ update_hooks.add(hook)
+ end
+
+ # Legacy extensions register their hooks on Spree::Order and expect them
+ # to fire during checkout — include those alongside cart-registered ones.
+ def update_hooks
+ self.class.update_hooks | Spree::Order.update_hooks
+ end
+
+ def updater
+ @updater ||= Spree::CartUpdater.new(self)
+ end
+
+ def update_with_updater!
+ updater.update
+ end
+
# The address tax is computed against, honoring the tax_using_ship_address
# preference (mirrors Spree::Order#tax_address).
#
@@ -63,5 +179,356 @@ module Spree
def tax_zone
Spree::Zone.match(tax_address) || Spree::Zone.default_tax
end
+
+ def currency
+ self[:currency] || store&.default_currency
+ end
+
+ def shipping_eq_billing_address?
+ bill_address == ship_address
+ end
+
+ def quantity
+ line_items.sum(:quantity)
+ end
+
+ def outstanding_balance
+ total - payment_total
+ end
+
+ def outstanding_balance?
+ outstanding_balance != 0
+ end
+
+ def payment_required?
+ total.to_f > 0.0
+ end
+
+ def confirmation_required?
+ Spree::Config[:always_include_confirm_step] ||
+ payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
+ end
+
+ # Whether every line item can be delivered without a shipping address
+ # (digital-only carts skip the address/delivery steps).
+ def delivery_required?
+ line_items.any? && !digital?
+ end
+
+ def digital?
+ line_items.any? && line_items.includes(variant: :product).all? { |line_item| line_item.variant.product.digital? }
+ end
+
+ def requires_ship_address?
+ !digital?
+ end
+
+ def paid?
+ total.positive? && payment_total >= total
+ end
+
+ def backordered?
+ fulfillment_items.any?(&:backordered?)
+ end
+
+ # Fulfillments never dispatch from a cart — determine_state reports
+ # 'pending' until completion copies them onto an order.
+ def can_ship?
+ false
+ end
+
+ def guest_checkout_disallowed?
+ return false if customer.present?
+
+ resolved_channel = channel || store&.default_channel
+ return false unless resolved_channel.respond_to?(:guest_checkout_enabled?)
+
+ !resolved_channel.guest_checkout_enabled?
+ end
+
+ # Idempotent delivery-proposal rebuild — replaces the destructive
+ # order-side create_proposed_shipments. Open fulfillments are rebuilt from
+ # the current items/address; nothing here touches a completed cart.
+ def rebuild_fulfillments!
+ return if completed?
+
+ discounts.for_fulfillments.delete_all
+ tax_lines.for_fulfillments.delete_all
+ fees.for_fulfillments.delete_all
+
+ fulfillment_ids = fulfillments.map(&:id)
+ StateChange.where(stateful_type: %w[Spree::Shipment Spree::Fulfillment], stateful_id: fulfillment_ids).delete_all
+ DeliveryRate.where(fulfillment_id: fulfillment_ids).delete_all
+ fulfillments.delete_all
+ fulfillment_items.reset
+
+ self.fulfillments = Spree::Stock::Coordinator.new(self).shipments.map do |fulfillment|
+ fulfillment.address_id = ship_address_id
+ fulfillment.order = nil
+ fulfillment.cart = self
+ fulfillment
+ end
+ prune_undeliverable_fulfillments!
+ fulfillments.reload
+ end
+
+ # Drops proposals that found no delivery rates and surfaces a
+ # delivery_unavailable warning per affected line item (parity with the
+ # order-side ensure_available_shipping_rates).
+ def prune_undeliverable_fulfillments!
+ undeliverable = fulfillments.reload.select { |fulfillment| fulfillment.delivery_rates.empty? }
+ return if undeliverable.empty?
+
+ affected_line_items = undeliverable.flat_map(&:line_items).uniq
+ undeliverable.each(&:destroy)
+ self.warnings |= affected_line_items.map do |line_item|
+ {
+ code: 'delivery_unavailable',
+ message: Spree.t('cart_line_item.delivery_unavailable', li_name: line_item.name),
+ line_item_id: line_item.prefixed_id
+ }
+ end
+ end
+
+ def ensure_available_shipping_rates
+ if fulfillments.empty? || fulfillments.any? { |fulfillment| fulfillment.delivery_rates.blank? }
+ errors.add(:base, Spree.t(:items_cannot_be_shipped))
+ return false
+ end
+ true
+ end
+
+ def set_fulfillments_cost
+ fulfillments.each(&:update_amounts)
+ updater.update_delivery_total
+ updater.persist_totals
+ end
+ alias set_shipments_cost set_fulfillments_cost
+ alias create_proposed_shipments rebuild_fulfillments!
+
+ def ensure_updated_shipments
+ rebuild_fulfillments! unless completed?
+ end
+
+ # Re-prices, re-taxes and rebuilds delivery proposals — the
+ # recalculation-on-write replacement for transition-triggered rebuilds.
+ # Called by Carts::Update after address/market changes.
+ def recalculate_for_address_change!
+ line_items.reload.each(&:update_price)
+ rebuild_fulfillments!
+ set_fulfillments_cost
+ update_with_updater!
+ end
+
+ # Duck-type parity with the order-side inventory hooks: carts have no
+ # named steps, only the delivery requirement.
+ def has_checkout_step?(step)
+ step.to_s == 'delivery' ? delivery_required? : true
+ end
+
+ # Checkout-step introspection (mirrors Order::Checkout, computed from
+ # requirements)
+ def checkout_steps
+ steps = ['address']
+ steps << 'delivery' if delivery_required?
+ steps << 'payment' if payment_required?
+ steps << 'confirm' if confirmation_required?
+ steps << 'complete'
+ steps
+ end
+
+ def current_checkout_step
+ return 'complete' if completed?
+
+ first_unmet = Spree::Checkout::Requirements.new(self).call.first
+ step = first_unmet ? first_unmet[:step].to_s : 'complete'
+ # `cart` (missing line items) is not a customer-facing checkout step
+ step == 'cart' ? 'address' : step
+ end
+
+ def completed_checkout_steps
+ steps = checkout_steps.reject { |step| step == 'complete' }
+ return steps if current_checkout_step == 'complete'
+
+ index = steps.index(current_checkout_step) || 0
+ steps.first(index)
+ end
+
+ def available_store_credits
+ return Spree::StoreCredit.none if customer.nil?
+
+ customer.store_credits.for_store(store).where(currency: currency).available.sort_by(&:amount_remaining).reverse
+ end
+
+ def total_available_store_credit
+ return 0.0 unless customer
+
+ customer.total_available_store_credit(currency, store)
+ end
+
+ def could_use_store_credit?
+ return false if store.payment_methods.store_credit.available.empty?
+
+ total_available_store_credit > 0
+ end
+
+ def total_applied_store_credit
+ payments.store_credits.valid.sum(:amount)
+ end
+
+ def covered_by_store_credit?
+ customer.present? && total_applied_store_credit.positive? && total_applied_store_credit >= total
+ end
+
+ def using_store_credit?
+ total_applied_store_credit.positive?
+ end
+
+ def display_total_applied_store_credit
+ Spree::Money.new(-total_applied_store_credit, currency: currency)
+ end
+
+ def order_total_after_store_credit
+ total - total_applied_store_credit
+ end
+
+ def total_minus_store_credits
+ total - total_applied_store_credit
+ end
+
+ def tax_total
+ included_tax_total + additional_tax_total
+ end
+
+ def pre_tax_item_amount
+ line_items.sum(:pre_tax_amount)
+ end
+
+ def pre_tax_total
+ pre_tax_item_amount + fulfillments.sum(:pre_tax_amount)
+ end
+
+ def amount_due
+ [outstanding_balance - total_applied_store_credit, 0].max
+ end
+
+ def gift_card_total
+ return 0.to_d unless gift_card.present?
+
+ store_credit_ids = payments.store_credits.valid.pluck(:source_id)
+ Spree::StoreCredit.where(id: store_credit_ids, originator: gift_card).sum(:amount)
+ end
+
+ def apply_gift_card(gift_card)
+ Spree.gift_card_apply_service.call(gift_card: gift_card, order: self)
+ end
+
+ def remove_gift_card
+ Spree.gift_card_remove_service.call(order: self)
+ end
+
+ def redeem_gift_card
+ return unless gift_card.present?
+
+ Spree.gift_card_redeem_service.call(gift_card: gift_card)
+ end
+
+ # See Spree::Order::GiftCard#recalculate_gift_card — same in-lock
+ # read-compute-write to keep the payment amount in sync with the total.
+ def recalculate_gift_card
+ return unless gift_card.present?
+
+ payment = payments.checkout.store_credits.where(source: gift_card.store_credits).first
+ return unless payment
+
+ gift_card.with_lock do
+ new_amount = [gift_card.amount_remaining + payment.amount, total].min
+ next if payment.amount == new_amount
+
+ difference = new_amount - payment.amount
+ payment.update_column(:amount, new_amount)
+ payment.source.update_column(:amount, new_amount)
+ gift_card.amount_used += difference
+ gift_card.save!
+ end
+ end
+
+ def display_gift_card_total
+ Spree::Money.new(gift_card_total, currency: currency)
+ end
+
+ def total_minus_gift_cards
+ total - gift_card_total
+ end
+
+ # Serializer surface: available payment methods for this cart.
+ def payment_methods
+ collect_frontend_payment_methods
+ end
+
+ def collect_frontend_payment_methods
+ store.payment_methods.active.available_on_front_end.select { |payment_method| payment_method.available_for_order?(self) }
+ end
+
+ # Binds a signing-in user to the cart (mirrors Order#associate_user!).
+ def associate_user!(user, override_email = true)
+ self.customer = user
+ self.email = user.email if override_email || email.blank?
+ self.bill_address ||= user.bill_address if user.bill_address&.valid?
+ self.ship_address ||= user.ship_address if user.ship_address&.valid? && delivery_required?
+ save! if persisted?
+ end
+
+ # Merges another cart into this one through the swappable merge strategy
+ # (Spree::Dependencies.cart_merge_strategy).
+ def merge!(other_cart, user = nil)
+ Spree::Dependencies.cart_merge_strategy.constantize.call(cart: self, other_cart: other_cart, user: user)
+ reload
+ end
+
+ # Transient warnings populated by remove_out_of_stock_items!
+ attribute :warnings, default: -> { [] }
+
+ # Removes out-of-stock/discontinued items and populates warnings
+ # (mirrors Order#remove_out_of_stock_items!).
+ def remove_out_of_stock_items!
+ existing_warnings = warnings
+ result = Spree::Carts::RemoveOutOfStockItems.call(order: self)
+ return self unless result.success?
+
+ cart, _messages, new_warnings = result.value
+ cart.warnings = existing_warnings | (new_warnings || [])
+ cart
+ end
+
+ private
+
+ def currency_must_be_supported_by_store
+ return if currency.blank? || store.blank?
+
+ supported_codes = store.supported_currencies_list.map(&:iso_code)
+ unless supported_codes.include?(currency)
+ errors.add(:currency, Spree.t(:currency_not_supported_by_store))
+ end
+ end
+
+ def ensure_market_presence
+ self.market ||= Spree::Current.market || store&.default_market
+ end
+
+ # When currency changes, auto-resolve the matching market (mirrors Order).
+ def resolve_market_from_currency
+ return unless store&.markets&.exists?
+ return if market&.currency == currency
+
+ resolved = store.markets.find_by(currency: currency)
+ self.market = resolved if resolved
+ end
+
+ def ensure_channel_presence
+ return if channel_id.present?
+
+ self.channel = store&.default_channel
+ end
end
end
diff --git a/spree/core/app/models/spree/cart_updater.rb b/spree/core/app/models/spree/cart_updater.rb
new file mode 100644
index 0000000000..532d886c26
--- /dev/null
+++ b/spree/core/app/models/spree/cart_updater.rb
@@ -0,0 +1,67 @@
+module Spree
+ # Recalculates a cart: same typed-adjustment two-pass as OrderUpdater
+ # (adjusters, then the tax provider) but persisting the cart's own column
+ # set — carts carry no payment/fulfillment status columns and are never
+ # frozen (completion copies them into an immutable order instead).
+ class CartUpdater < OrderUpdater
+ alias cart order
+
+ def update
+ cart.association(:line_items).reset if cart.persisted?
+ cart.association(:fulfillments).reset if cart.persisted?
+
+ update_item_count
+ update_totals
+ persist_totals
+ end
+
+ def update_payment_total
+ cart.payment_total = payments.completed.includes(:refunds).inject(0) { |sum, payment| sum + payment.amount - payment.refunds.sum(:amount) }
+ end
+
+ def persist_totals
+ cart.update_columns(
+ item_total: cart.item_total,
+ item_count: cart.item_count,
+ adjustment_total: cart.adjustment_total,
+ included_tax_total: cart.included_tax_total,
+ additional_tax_total: cart.additional_tax_total,
+ taxable_adjustment_total: cart.taxable_adjustment_total,
+ non_taxable_adjustment_total: cart.non_taxable_adjustment_total,
+ payment_total: cart.payment_total,
+ delivery_total: cart.delivery_total,
+ promo_total: cart.promo_total,
+ fee_total: cart.fee_total,
+ total: cart.total,
+ updated_at: Time.current
+ )
+ end
+
+ # Carts have no completion freeze — they are recalculated until the
+ # moment Carts::Complete copies them into an order.
+ def recalculate_adjustments
+ Spree.adjusters.each { |adjuster| adjuster.adjust(cart) }
+ send(:refresh_discount_and_fee_columns)
+ Spree.tax_provider.estimate(cart)
+ send(:refresh_tax_columns)
+ end
+
+ def update_adjustment_total
+ recalculate_adjustments
+
+ discounts_sum = cart.discounts.reload.sum(&:amount)
+ cart_fees = cart.fees.reload.to_a
+ tax_sums = cart.tax_lines.reload.group_by(&:included?).transform_values { |lines| lines.sum(&:amount) }
+
+ cart.promo_total = cart.discounts.select(&:promotion?).sum(&:amount)
+ cart.fee_total = cart_fees.sum(&:amount)
+ cart.included_tax_total = tax_sums.fetch(true, 0)
+ cart.additional_tax_total = tax_sums.fetch(false, 0)
+ cart.adjustment_total = discounts_sum + cart.fee_total + cart.additional_tax_total
+ cart.taxable_adjustment_total = 0
+ cart.non_taxable_adjustment_total = cart_fees.select(&:order_level?).sum(&:amount)
+
+ update_order_total
+ end
+ end
+end
diff --git a/spree/core/app/models/spree/checkout/default_requirements.rb b/spree/core/app/models/spree/checkout/default_requirements.rb
index f895f76312..36b1466ec0 100644
--- a/spree/core/app/models/spree/checkout/default_requirements.rb
+++ b/spree/core/app/models/spree/checkout/default_requirements.rb
@@ -32,7 +32,7 @@ module Spree
end
def shipping_method_selected?
- @order.shipments.any? && @order.shipments.all? { |s| s.shipping_method.present? }
+ @order.fulfillments.any? && @order.fulfillments.all? { |fulfillment| fulfillment.delivery_method.present? }
end
def payment_required?
diff --git a/spree/core/app/models/spree/coupon_code.rb b/spree/core/app/models/spree/coupon_code.rb
index 2e335e0689..19dbfdcea3 100644
--- a/spree/core/app/models/spree/coupon_code.rb
+++ b/spree/core/app/models/spree/coupon_code.rb
@@ -14,7 +14,19 @@ module Spree
scope :not_in_promotions, ->(promotion_ids) { where.not(promotion_id: promotion_ids) }
belongs_to :promotion, class_name: 'Spree::Promotion', touch: true
- belongs_to :order, class_name: 'Spree::Order'
+ belongs_to :order, class_name: 'Spree::Order', optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
validates :code, presence: true, uniqueness: { scope: spree_base_uniqueness_scope, conditions: -> { where(deleted_at: nil) } }
validates :state, :promotion, presence: true
@@ -26,12 +38,13 @@ module Spree
used_with_code(code).any?
end
- def apply_order!(order)
- update(order: order, state: 'used')
+ def apply_order!(owner)
+ owner_key = owner.is_a?(Spree::Cart) ? :cart : :order
+ update(owner_key => owner, state: 'used')
end
def remove_from_order
- update(order: nil, state: 'unused')
+ update(order: nil, cart: nil, state: 'unused')
end
def display_code
diff --git a/spree/core/app/models/spree/customer_return.rb b/spree/core/app/models/spree/customer_return.rb
index 342b452085..688e96619c 100644
--- a/spree/core/app/models/spree/customer_return.rb
+++ b/spree/core/app/models/spree/customer_return.rb
@@ -82,7 +82,8 @@ module Spree
def process_return!
return_items.each(&:receive!)
- order.return! if order.all_inventory_units_returned?
+ # The order-level 'returned' machine state is gone — return lifecycle
+ # belongs to the first-class Return models (6.0-returns plan).
end
def return_items_belong_to_same_order
diff --git a/spree/core/app/models/spree/fulfillment.rb b/spree/core/app/models/spree/fulfillment.rb
index b3282c262b..28027f6d50 100644
--- a/spree/core/app/models/spree/fulfillment.rb
+++ b/spree/core/app/models/spree/fulfillment.rb
@@ -20,10 +20,10 @@ module Spree
publishes_lifecycle_events
with_options inverse_of: :fulfillments do
- belongs_to :address, class_name: 'Spree::Address'
- belongs_to :order, class_name: 'Spree::Order', touch: true
+ belongs_to :address, class_name: 'Spree::Address', optional: true
+ belongs_to :order, class_name: 'Spree::Order', touch: true, optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true
end
- belongs_to :cart, class_name: 'Spree::Cart', optional: true
belongs_to :stock_location, -> { with_deleted }, class_name: 'Spree::StockLocation'
with_options dependent: :delete_all do
@@ -43,6 +43,7 @@ module Spree
before_validation :set_cost_zero_when_nil
validates :stock_location, presence: true
+ validate :exactly_one_owner
attr_accessor :special_instructions
@@ -71,7 +72,7 @@ module Spree
}
scope :digital_delivery, -> { joins(:delivery_methods).merge(Spree::DeliveryMethod.digital) }
- delegate :store, :currency, to: :order
+ delegate :store, :currency, to: :owner
# The exactly-one owner of this fulfillment — the cart during checkout,
# the order after completion. New code must read +owner+, never assume
@@ -81,13 +82,24 @@ module Spree
def owner
order || cart
end
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
delegate :amount_in_cents, to: :display_cost
state_machine :status, initial: :pending, use_transactions: false do
event :ready do
transition from: :pending, to: :ready, if: lambda { |fulfillment|
# Fix for #2040
- fulfillment.determine_state(fulfillment.order) == 'ready'
+ fulfillment.determine_state(fulfillment.owner) == 'ready'
}
end
@@ -112,7 +124,7 @@ module Spree
event :resume do
transition from: :canceled, to: :ready, if: lambda { |fulfillment|
- fulfillment.determine_state(fulfillment.order) == 'ready'
+ fulfillment.determine_state(fulfillment.owner) == 'ready'
}
transition from: :canceled, to: :pending
end
@@ -410,7 +422,7 @@ module Spree
# StockEstimator.new assignment below will replace the current delivery_method
original_shipping_method_id = delivery_method.try(:id)
- self.delivery_rates = Stock::Estimator.new(order).
+ self.delivery_rates = Stock::Estimator.new(owner).
shipping_rates(to_package, shipping_method_filter)
if delivery_method
@@ -458,13 +470,13 @@ module Spree
# Reload associations to pick up the new selected shipping rate
delivery_rates.reset
association(:selected_delivery_rate).reset
- # Update shipment cost and order totals only for incomplete orders (during checkout)
+ # Update shipment cost and owner totals only during checkout.
# For completed orders, totals are managed separately (e.g., in tests or admin adjustments)
- return if order.completed?
+ return if owner.nil? || owner.completed?
update_amounts
reload # reload to pick up cost set by update_columns in update_amounts
- order.set_shipments_cost
+ owner.set_shipments_cost
end
def set_up_inventory(status, variant, order, line_item, quantity = 1)
@@ -618,6 +630,8 @@ module Spree
end
def update_order_fulfillment_status
+ return if order.nil?
+
new_status = OrderUpdater.new(order).update_fulfillment_status
order.update_columns(fulfillment_status: new_status, updated_at: Time.current)
end
@@ -626,9 +640,9 @@ module Spree
# publish_shipment_resumed_event are defined in Spree::Fulfillment::CustomEvents
def can_get_rates?
- return true unless order.requires_ship_address?
+ return true unless owner&.requires_ship_address?
- order.ship_address&.valid?
+ owner.ship_address&.valid?
end
def manifest_restock(item)
@@ -649,6 +663,10 @@ module Spree
self.cost = 0 unless cost
end
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+ end
+
def update_adjustments
# A cost change shifts discount and tax bases — rebuild through the
# order-level recalculation. Creation is excluded (the surrounding flow
@@ -656,7 +674,7 @@ module Spree
# replacement) and completed orders are frozen.
return if previously_new_record?
- order.update_with_updater! if saved_change_to_cost? && status != 'fulfilled' && order&.persisted? && !order.completed?
+ owner.update_with_updater! if saved_change_to_cost? && status != 'fulfilled' && owner&.persisted? && !owner.completed?
end
end
end
diff --git a/spree/core/app/models/spree/gateway/bogus.rb b/spree/core/app/models/spree/gateway/bogus.rb
index 22a10b9506..4719c904d0 100644
--- a/spree/core/app/models/spree/gateway/bogus.rb
+++ b/spree/core/app/models/spree/gateway/bogus.rb
@@ -94,7 +94,7 @@ module Spree
def create_payment_session(order:, amount: nil, external_data: {})
payment_session_class.create(
- order: order,
+ owner: order,
payment_method: self,
amount: amount.presence || order.total_minus_store_credits,
currency: order.currency,
diff --git a/spree/core/app/models/spree/line_item.rb b/spree/core/app/models/spree/line_item.rb
index fa34cf8fe8..6c8d4d9dea 100644
--- a/spree/core/app/models/spree/line_item.rb
+++ b/spree/core/app/models/spree/line_item.rb
@@ -89,6 +89,17 @@ module Spree
order || cart
end
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
def copy_price
if variant
update_price if price.nil?
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index 2208fb3ba8..f458a0ce6c 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -18,6 +18,8 @@ module Spree
FULFILLMENT_STATUSES = %w(backorder canceled partial pending ready fulfilled shipped)
# @deprecated legacy name — remove in 6.1 together with the 'shipped' value
SHIPMENT_STATES = FULFILLMENT_STATUSES
+ # @deprecated legacy machine vocabulary — line-item removability is
+ # completion-based since 6.0; removed in 6.1.
LINE_ITEM_REMOVABLE_STATES = %w(cart address delivery payment confirm resumed)
extend Spree::DisplayMoney
@@ -106,14 +108,6 @@ module Spree
validation.fetch(:numericality)[:less_than_or_equal_to] = 0
end.freeze
- checkout_flow do
- go_to_state :address
- go_to_state :delivery, if: ->(order) { order.delivery_required? }
- go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
- go_to_state :confirm, if: ->(order) { order.confirmation_required? }
- go_to_state :complete
- end
-
# lock_version (renamed from state_lock_version) drives the API's manual
# optimistic concurrency (compare client-sent version, 409 on mismatch) —
# Rails auto-locking must not raise on internal saves.
@@ -121,7 +115,7 @@ module Spree
self.whitelisted_ransackable_associations = %w[fulfillments shipments user created_by approver canceler promotions bill_address ship_address line_items store channel tags]
self.whitelisted_ransackable_attributes = %w[
- completed_at email number state status payment_status payment_state fulfillment_status shipment_state delivery_total
+ completed_at email number status payment_status payment_state fulfillment_status shipment_state delivery_total
total item_total item_count considered_risky channel_id currency
]
self.whitelisted_ransackable_scopes = %w[complete incomplete refunded partially_refunded search multi_search]
@@ -289,8 +283,8 @@ module Spree
scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
scope :complete, -> { where.not(completed_at: nil) }
scope :incomplete, -> { where(completed_at: nil) }
- scope :canceled, -> { where(state: %w[canceled partially_canceled]) }
- scope :not_canceled, -> { where.not(state: %w[canceled partially_canceled]) }
+ scope :canceled, -> { where(status: 'canceled') }
+ scope :not_canceled, -> { where.not(status: 'canceled') }
scope :ready_to_ship, -> { where(fulfillment_status: %w[ready pending]) }
scope :partially_shipped, -> { where(fulfillment_status: %w[partial]) }
scope :not_shipped, -> { where(fulfillment_status: %w[ready pending partial]) }
@@ -415,11 +409,10 @@ module Spree
completed_at.present?
end
- # True when the order is mid-checkout: past the `cart` state but not yet
- # completed or canceled. Used by stock reservation hooks and any flow
- # that should only run during the active checkout phase.
+ # Orders are never mid-checkout since the cart flip — only a draft mid
+ # completion (or an admin draft) is still mutable.
def in_checkout?
- !cart? && !complete? && !canceled?
+ draft? && !completed? && !canceled? && !cart?
end
def draft?
@@ -430,6 +423,30 @@ module Spree
status == 'placed'
end
+ def canceled?
+ status == 'canceled'
+ end
+
+ alias complete? completed?
+
+ # @deprecated machine vocabulary — data-derived bridge for the 6.0
+ # transition, removed in 6.1. An order is "cart-like" while a draft
+ # with no checkout data.
+ def cart?
+ draft? && !completed? && email.blank? && ship_address_id.blank?
+ end
+
+ # @deprecated machine vocabulary — resumption is tracked by the transient
+ # flag only; removed in 6.1.
+ def resumed?
+ !!state_machine_resumed
+ end
+
+ # Derived, not stored (Decision 8): some but not all fulfillments canceled.
+ def partially_canceled?
+ !canceled? && fulfillments.canceled.any? && fulfillments.where.not(status: 'canceled').any?
+ end
+
# Checks if the order is fully refunded
# @return [Boolean]
def order_refunded?
@@ -471,13 +488,11 @@ module Spree
end
# If true, causes the confirmation step to happen during the checkout process
+ # Computed from data only — whether the confirm/review step exists never
+ # falls back to a machine state (the #4117 hack died with the machine).
def confirmation_required?
Spree::Config[:always_include_confirm_step] ||
- payments.valid.map(&:payment_method).compact.any?(&:confirmation_required?) ||
- # Little hacky fix for #4117
- # If this wasn't here, order would transition to address state on confirm failure
- # because there would be no valid payments any more.
- confirm?
+ payments.valid.map(&:payment_method).compact.any?(&:confirmation_required?)
end
def email_required?
@@ -570,6 +585,7 @@ module Spree
fulfillment_status.nil? || %w{ready backorder pending canceled}.include?(fulfillment_status)
end
+ alias can_cancel? allow_cancel?
def all_inventory_units_returned?
inventory_units.all?(&:returned?)
@@ -675,11 +691,11 @@ module Spree
end
def can_ship?
- complete? || resumed? || awaiting_return? || returned?
+ placed?
end
def uneditable?
- complete? || canceled? || returned?
+ completed? || canceled?
end
# Finalizes an in progress order after checkout is complete.
@@ -703,6 +719,13 @@ module Spree
touch :completed_at
+ # Completion side effects previously wired as machine transition
+ # callbacks — each guards its own idempotency.
+ use_all_coupon_codes
+ redeem_gift_card
+ subscribe_to_newsletter
+ create_user_record
+
auto_fulfill_provider_fulfillments
send_order_placed_webhook
@@ -742,7 +765,6 @@ module Spree
# If so add error and restart checkout.
def ensure_line_item_variants_are_not_discontinued
if line_items.any? { |li| !li.variant || li.variant.discontinued? }
- restart_checkout_flow
errors.add(:base, Spree.t(:discontinued_variants_present))
false
else
@@ -752,7 +774,6 @@ module Spree
def ensure_line_items_are_in_stock
if insufficient_stock_lines.present?
- restart_checkout_flow
errors.add(:base, Spree.t(:insufficient_stock_lines_present))
false
else
@@ -775,16 +796,6 @@ module Spree
checkout_steps.include?(step)
end
- def state_changed(name)
- state = "#{name}_state"
- if persisted?
- old_state = send("#{state}_was")
- new_state = send(state)
- unless old_state == new_state
- log_state_changes(state_name: name, old_state: old_state, new_state: new_state)
- end
- end
- end
def log_state_changes(state_name:, old_state:, new_state:)
state_changes.create(
@@ -902,11 +913,7 @@ module Spree
::Spree::PromotionHandler::Cart.new(self).activate
end
- # Clean shipments and make order back to address state
- #
- # At some point the might need to force the order to transition from address
- # to delivery again so that proper updated shipments are created.
- # e.g. customer goes back from payment step and changes order items
+ # Drops stale fulfillments so they are rebuilt from current items.
def ensure_updated_shipments
if fulfillments.any? && !completed?
fulfillments.destroy_all
@@ -914,23 +921,9 @@ module Spree
# Manually publish update event since update_column bypasses callbacks
publish_event('order.updated')
-
- restart_checkout_flow
end
end
- def restart_checkout_flow
- update_columns(
- state: 'cart',
- updated_at: Time.current
- )
-
- # Manually publish update event since update_columns bypasses callbacks
- publish_event('order.updated')
-
- next! unless line_items.empty?
- end
-
def refresh_shipment_rates(shipping_method_filter = DeliveryMethod::DISPLAY_ON_FRONT_END)
fulfillments.map { |s| s.refresh_rates(shipping_method_filter) }
end
@@ -969,6 +962,32 @@ module Spree
Spree.order_cancel_service.call(order: self, canceler: user, canceled_at: canceled_at)
end
+ # Machine-free lifecycle: cancel/resume flip +status+ and run the same
+ # side effects the machine transitions ran.
+ def cancel
+ return false unless allow_cancel?
+
+ update_column(:canceled_at, Time.current) if canceled_at.blank?
+ after_cancel
+ true
+ end
+
+ def cancel!
+ cancel || raise(ActiveRecord::RecordInvalid.new(self))
+ end
+
+ def resume
+ return false unless canceled?
+
+ self.state_machine_resumed = true
+ after_resume
+ true
+ end
+
+ def resume!
+ resume || raise(ActiveRecord::RecordInvalid.new(self))
+ end
+
# Approves the order and records the approver.
# Delegates to {Spree::Orders::Approve} service.
#
@@ -1122,7 +1141,7 @@ module Spree
# Determine if email is required (we don't want validation errors before we hit the checkout)
# we need to add delivery to the list for quick checkouts
def require_email
- true unless new_record? || ['cart', 'address', 'delivery'].include?(state)
+ !new_record? && (completed? || placed?)
end
def ensure_line_items_present
diff --git a/spree/core/app/models/spree/order/checkout.rb b/spree/core/app/models/spree/order/checkout.rb
index f77af4ee90..5b9dc663e9 100644
--- a/spree/core/app/models/spree/order/checkout.rb
+++ b/spree/core/app/models/spree/order/checkout.rb
@@ -1,295 +1,69 @@
module Spree
class Order < Spree.base_class
+ # Data-driven checkout surface. The checkout state machine is gone
+ # (docs/plans/6.0-cart-order-split.md): progression lives on the Cart via
+ # Spree::Checkout::Requirements, and this module keeps only the
+ # step-introspection API that serializers and completed orders still
+ # need — computed from order data, never from a state column.
module Checkout
def self.included(klass)
klass.class_eval do
- class_attribute :next_event_transitions
- class_attribute :previous_states
- class_attribute :checkout_flow
- class_attribute :checkout_steps
- class_attribute :removed_transitions
-
- self.checkout_steps ||= {}
- self.next_event_transitions ||= []
- self.previous_states ||= [:cart]
- self.removed_transitions ||= []
-
- def self.checkout_flow(&block)
- return @checkout_flow unless block_given?
-
- @checkout_flow = block
- define_state_machine!
- end
-
- def self.define_state_machine!
- self.checkout_steps = {}
- self.next_event_transitions = []
- self.previous_states = [:cart]
- self.removed_transitions = []
-
- # Build the checkout flow using the checkout_flow defined either
- # within the Order class, or a decorator for that class.
- #
- # This method may be called multiple times depending on if the
- # checkout_flow is re-defined in a decorator or not.
- instance_eval(&checkout_flow)
-
- klass = self
-
- # To avoid multiple occurrences of the same transition being defined
- # On first definition, state_machines will not be defined
- state_machines.clear if respond_to?(:state_machines)
- state_machine :state, initial: :cart, use_transactions: false, action: :save_state do
- klass.next_event_transitions.each { |t| transition(t.merge(on: :next)) }
-
- # Persist the state on the order
- after_transition do |order, transition|
- order.state_changes.create(
- previous_state: transition.from,
- next_state: transition.to,
- name: 'order',
- user_id: order.user_id
- )
- order.save
- end
-
- event :cancel do
- transition to: :canceled, if: :allow_cancel?
- end
-
- event :return do
- transition to: :returned,
- from: [:complete, :awaiting_return, :canceled, :returned, :resumed],
- if: :all_inventory_units_returned?
- end
-
- event :resume do
- transition to: :resumed, from: :canceled, if: :canceled?
- end
-
- event :authorize_return do
- transition to: :awaiting_return
- end
-
- before_transition to: :complete, do: :ensure_line_item_variants_are_not_discontinued
- before_transition to: :complete, do: :ensure_line_items_are_in_stock
-
- if states[:payment]
- before_transition to: :complete do |order|
- if order.payment_required? && order.payments.valid.empty?
- order.errors.add(:base, Spree.t(:no_payment_found))
- false
- elsif order.payment_required?
- order.process_payments!
- end
- end
-
- after_transition to: :complete, do: :create_user_record
- before_transition to: :payment, do: :set_shipments_cost
- before_transition to: :payment, do: :create_tax_charge!
- before_transition to: :payment, do: :recalculate_store_credit_payment
- end
-
- before_transition from: :cart, do: :ensure_line_items_present
-
- if states[:address]
- before_transition from: :address, do: :update_line_item_prices!
- before_transition from: :address, do: :create_tax_charge!
- before_transition to: :address, do: :assign_default_addresses!
- end
-
- if states[:delivery]
- before_transition to: :delivery, do: :create_proposed_shipments
- before_transition to: :delivery, do: :ensure_available_shipping_rates
- before_transition to: :delivery, do: :set_shipments_cost
- before_transition to: :delivery, do: :create_shipment_tax_charge!
- before_transition from: :delivery, do: :apply_free_shipping_promotions
- before_transition to: :delivery, do: :apply_unassigned_promotions
- after_transition to: :delivery, do: :move_to_next_step_if_address_not_required
- end
-
- before_transition to: :resumed, do: :ensure_line_item_variants_are_not_discontinued
- before_transition to: :resumed, do: :ensure_line_items_are_in_stock
- before_transition to: :resumed, do: proc { |order| order.state_machine_resumed = true }
-
- after_transition to: :complete, do: :finalize!
- after_transition to: :resumed, do: :after_resume
- after_transition to: :canceled, do: :after_cancel
- after_transition to: :complete, do: :use_all_coupon_codes
- after_transition to: :complete, do: :redeem_gift_card
- after_transition to: :complete, do: :subscribe_to_newsletter
-
- after_transition from: any - :cart, to: any - [:confirm, :complete] do |order|
- order.update_totals
- order.persist_totals
- end
- end
-
- alias_method :save_state, :save
- end
-
- def subscribe_to_newsletter
- return unless accept_marketing?
-
- Spree::NewsletterSubscriber.subscribe(email: email, user: user, store: store)
- end
-
- def self.go_to_state(name, options = {})
- self.checkout_steps[name] = options
- self.previous_states.each { |state| add_transition({ from: state, to: name }.merge(options)) }
- return self.previous_states << name if options[:if]
-
- self.previous_states = [name]
- end
-
- def self.insert_checkout_step(name, options = {})
- before = options.delete(:before)
- after = options.delete(:after) unless before
- after = self.checkout_steps.keys.last unless before || after
-
- cloned_steps = self.checkout_steps.clone
- cloned_removed_transitions = self.removed_transitions.clone
- checkout_flow do
- cloned_steps.each_pair do |key, value|
- go_to_state(name, options) if key == before
- go_to_state(key, value)
- go_to_state(name, options) if key == after
- end
- cloned_removed_transitions.each do |transition|
- remove_transition(transition)
- end
- end
- end
-
- def self.remove_checkout_step(name)
- cloned_steps = self.checkout_steps.clone
- cloned_removed_transitions = self.removed_transitions.clone
- checkout_flow do
- cloned_steps.each_pair do |key, value|
- go_to_state(key, value) unless key == name
- end
- cloned_removed_transitions.each do |transition|
- remove_transition(transition)
- end
- end
- end
-
- def self.remove_transition(options = {})
- self.removed_transitions << options
- self.next_event_transitions.delete(find_transition(options))
- end
-
- def self.find_transition(options = {})
- return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
-
- self.next_event_transitions.detect do |transition|
- transition[options[:from].to_sym] == options[:to].to_sym
- end
- end
-
- def self.checkout_step_names
- self.checkout_steps.keys
- end
-
- def self.add_transition(options)
- self.next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
- end
+ define_callbacks :updating_from_params
+ # Steps derive from what the order actually requires.
+ #
+ # @return [Array<String>]
def checkout_steps
- steps = (self.class.checkout_steps.each_with_object([]) do |(step, options), checkout_steps|
- next if options.include?(:if) && !options[:if].call(self)
-
- checkout_steps << step
- end).map(&:to_s)
- # Ensure there is always a complete step
- steps << 'complete' unless steps.include?('complete')
+ steps = ['address']
+ steps << 'delivery' if delivery_required?
+ steps << 'payment' if payment_required?
+ steps << 'confirm' if respond_to?(:confirmation_required?) && confirmation_required?
+ steps << 'complete'
steps
end
def has_checkout_step?(step)
- step.present? && self.checkout_steps.include?(step)
- end
-
- def passed_checkout_step?(step)
- has_checkout_step?(step) && checkout_step_index(step) < checkout_step_index(state)
+ step.present? && checkout_steps.include?(step.to_s)
end
def checkout_step_index(step)
- self.checkout_steps.index(step).to_i
+ checkout_steps.index(step).to_i
end
- # Customer-facing checkout step derived from the internal state machine state.
- # Maps +'cart'+ to +'address'+ since cart is not a user-facing checkout step.
+ # Customer-facing checkout step. Completed/canceled orders are past
+ # checkout; open drafts report the first unmet requirement's step.
#
- # @return [String] current checkout step name (e.g. +"address"+, +"delivery"+, +"payment"+)
+ # @return [String]
def current_checkout_step
- state == 'cart' ? 'address' : state
+ return 'complete' if completed? || canceled?
+
+ first_unmet = Spree::Checkout::Requirements.new(self).call.first
+ first_unmet ? first_unmet[:step].to_s : 'complete'
end
- # Checkout steps that have already been completed, i.e. all steps before
- # {#current_checkout_step}. Does not include +'complete'+.
+ # Checkout steps that have already been completed, i.e. all steps
+ # before {#current_checkout_step}. Does not include +'complete'+.
#
- # @return [Array<String>] completed step names in order
+ # @return [Array<String>]
def completed_checkout_steps
- steps = checkout_steps.reject { |s| s == 'complete' }
- idx = steps.index(current_checkout_step) || 0
- steps.first(idx)
- end
-
- def can_go_to_state?(state)
- return false unless has_checkout_step?(self.state) && has_checkout_step?(state)
+ steps = checkout_steps.reject { |step| step == 'complete' }
+ return steps if current_checkout_step == 'complete'
- checkout_step_index(state) > checkout_step_index(self.state)
+ index = steps.index(current_checkout_step) || 0
+ steps.first(index)
end
- define_callbacks :updating_from_params
-
- set_callback :updating_from_params, :before, :update_params_payment_source
-
- def update_from_params(params, permitted_params, request_env = {})
- success = false
- @updating_params = params
- run_callbacks :updating_from_params do
- # Set existing card after setting permitted parameters because
- # rails would slice parameters containing ruby objects, apparently
- existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
-
- attributes = if @updating_params[:order]
- @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? }
- else
- {}
- end
-
- if existing_card_id.present?
- credit_card = CreditCard.find existing_card_id
- if credit_card.user_id != user_id || credit_card.user_id.blank?
- raise Core::GatewayError, Spree.t(:invalid_credit_card)
- end
-
- credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
-
- attributes[:payments_attributes].first[:source] = credit_card
- attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
- attributes[:payments_attributes].first.delete :source_attributes
- end
-
- if attributes[:payments_attributes]
- attributes[:payments_attributes].first[:request_env] = request_env
- end
-
- success = update(attributes)
- set_shipments_cost if shipments.any?
- end
+ def subscribe_to_newsletter
+ return unless accept_marketing?
- @updating_params = nil
- success
+ Spree::NewsletterSubscriber.subscribe(email: email, user: user, store: store)
end
def assign_default_addresses!
if user
self.bill_address = user.bill_address if !bill_address_id && user.bill_address&.valid?
- # Skip setting ship address if order doesn't have a delivery checkout step
- # to avoid triggering validations on shipping address
+ # Skip the ship address for orders without a delivery step to
+ # avoid triggering shipping-address validations
self.ship_address = user.ship_address if !ship_address_id && user.ship_address&.valid? && checkout_steps.include?('delivery')
end
end
@@ -300,45 +74,6 @@ module Spree
Spree::Orders::CreateUserAccount.call(order: self, accepts_email_marketing: accept_marketing?)
end
-
- def move_to_next_step_if_address_not_required
- return if requires_ship_address?
-
- next!
- end
-
- private
-
- # For payment step, filter order parameters to produce the expected nested
- # attributes for a single payment and its source, discarding attributes
- # for payment methods other than the one selected
- #
- # If an existing credit card is provided, build the payment attributes
- # from scratch so the amount can be set. Example payload:
- #
- # {
- # "order": {
- # "existing_card": "2"
- # }
- # }
- #
- def update_params_payment_source
- if @updating_params[:payment_source].present?
- source_params = @updating_params.
- delete(:payment_source)[@updating_params[:order][:payments_attributes].
- first[:payment_method_id].to_s]
-
- if source_params
- @updating_params[:order][:payments_attributes].first[:source_attributes] = source_params
- end
- end
-
- if @updating_params[:order] && (@updating_params[:order][:payments_attributes] ||
- @updating_params[:order][:existing_card])
- @updating_params[:order][:payments_attributes] ||= [{}]
- @updating_params[:order][:payments_attributes].first[:amount] = order_total_after_store_credit
- end
- end
end
end
end
diff --git a/spree/core/app/models/spree/order/store_credit.rb b/spree/core/app/models/spree/order/store_credit.rb
index 87d8a0137f..ddcb4525f3 100644
--- a/spree/core/app/models/spree/order/store_credit.rb
+++ b/spree/core/app/models/spree/order/store_credit.rb
@@ -54,7 +54,9 @@ module Spree
end
def total_applicable_store_credit
- if payment? || confirm? || complete?
+ # Once payments exist (or the order completed), report what was
+ # actually applied; before that, what could be applied.
+ if completed? || payments.valid.any?
total_applied_store_credit
else
[total, user.try(:total_available_store_credit) || 0.0].min
diff --git a/spree/core/app/models/spree/order_promotion.rb b/spree/core/app/models/spree/order_promotion.rb
index b717163002..1caab7090f 100644
--- a/spree/core/app/models/spree/order_promotion.rb
+++ b/spree/core/app/models/spree/order_promotion.rb
@@ -2,20 +2,47 @@ module Spree
class OrderPromotion < Spree.base_class
has_prefix_id :discount
- belongs_to :order, class_name: 'Spree::Order'
+ # Owner — exactly one (cart during checkout, copied to the order at
+ # completion)
+ belongs_to :order, class_name: 'Spree::Order', optional: true, inverse_of: :order_promotions
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true, inverse_of: :order_promotions
belongs_to :promotion, class_name: 'Spree::Promotion'
delegate :name, :description, :code, :public_metadata, to: :promotion
- delegate :currency, to: :order
+ delegate :currency, to: :owner
- validates :order, :promotion, presence: true
- validates :order, uniqueness: { scope: :promotion }
+ validates :promotion, presence: true
+ validates :order, uniqueness: { scope: :promotion }, allow_nil: true
+ validates :cart, uniqueness: { scope: :promotion }, allow_nil: true
+ validate :exactly_one_owner
extend Spree::DisplayMoney
money_methods :amount
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ order || cart
+ end
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
def amount
- order.discounts.promotion.where(promotion_action_id: promotion.actions.ids).sum(:amount)
+ owner.discounts.promotion.where(promotion_action_id: promotion.actions.ids).sum(:amount)
+ end
+
+ private
+
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
end
end
end
diff --git a/spree/core/app/models/spree/order_updater.rb b/spree/core/app/models/spree/order_updater.rb
index efb1241ae1..35dcf87fde 100644
--- a/spree/core/app/models/spree/order_updater.rb
+++ b/spree/core/app/models/spree/order_updater.rb
@@ -68,7 +68,9 @@ module Spree
update_adjustment_total
end
- # give each of the fulfillments a chance to update themselves
+ # give each of the fulfillments a chance to update themselves.
+ # Completed orders only recompute statuses — repricing a completed
+ # order's delivery would break the money freeze.
def update_fulfillments
shipping_method_filter = order.completed? ? DeliveryMethod::DISPLAY_ON_BACK_END : DeliveryMethod::DISPLAY_ON_FRONT_END
@@ -76,6 +78,8 @@ module Spree
next unless fulfillment.persisted?
fulfillment.update!(order)
+ next if order.completed? && fulfillment.fulfilled?
+
fulfillment.refresh_rates(shipping_method_filter)
fulfillment.update_amounts
end
@@ -184,7 +188,6 @@ module Spree
end
end
- order.state_changed('shipment')
order.fulfillment_status
end
# @deprecated Use {#update_fulfillment_status}; removed in 6.1.
@@ -215,7 +218,6 @@ module Spree
#
# The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
def update_payment_state
- last_state = order.payment_state
if payments.present? && payments.valid.empty?
order.payment_state = 'failed'
elsif order.canceled? && order.payment_total == 0
@@ -225,7 +227,6 @@ module Spree
order.payment_state = 'credit_owed' if order.outstanding_balance < 0
order.payment_state = 'paid' unless order.outstanding_balance?
end
- order.state_changed('payment') if last_state != order.payment_state
order.payment_state
end
diff --git a/spree/core/app/models/spree/payment.rb b/spree/core/app/models/spree/payment.rb
index fbe1722420..bff511ef0e 100644
--- a/spree/core/app/models/spree/payment.rb
+++ b/spree/core/app/models/spree/payment.rb
@@ -25,11 +25,14 @@ module Spree
INVALID_STATES = %w(failed invalid void).freeze
with_options inverse_of: :payments do
- belongs_to :order, class_name: 'Spree::Order', touch: true
+ belongs_to :order, class_name: 'Spree::Order', touch: true, optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true
belongs_to :payment_method, -> { with_deleted }, class_name: 'Spree::PaymentMethod'
end
belongs_to :source, polymorphic: true
+ validate :exactly_one_owner
+
has_many :offsets, -> { offset_payment }, class_name: 'Spree::Payment', foreign_key: :source_id
has_many :log_entries, as: :source
has_many :state_changes, as: :stateful
@@ -47,7 +50,7 @@ module Spree
before_validation :validate_source
- after_initialize :set_amount, if: -> { new_record? && order.present? && !amount_changed? }
+ after_initialize :set_amount, if: -> { new_record? && owner.present? && !amount_changed? }
#
# Callbacks
@@ -96,7 +99,7 @@ module Spree
# transaction_id is much easier to understand
alias_attribute :transaction_id, :response_code
- delegate :currency, to: :order
+ delegate :currency, to: :owner
money_methods :amount, :credit_allowed
alias money display_amount # for compatibility with older versions of Spree
@@ -150,12 +153,12 @@ module Spree
end
def max_amount
- return amount if order.nil?
+ return amount if owner.nil?
- amount_from_order = order.total - order.payment_total
+ amount_from_order = owner.total - owner.payment_total
if payment_method&.store_credit?
- store_credits = order.available_store_credits
+ store_credits = owner.available_store_credits
store_credits.any? ? [store_credits.first.amount_remaining, amount_from_order].min : amount_from_order
else
amount_from_order
@@ -200,13 +203,13 @@ module Spree
payment_method.payment_source_class.new(source_attributes)
end
- if source.user_id.present? && source.user_id != order.user_id
+ if source.user_id.present? && source.user_id != owner&.user_id
self.source = nil
return
end
source.payment_method_id = payment_method.id if source.respond_to?(:payment_method_id)
- source.user_id = order.user_id if order
+ source.user_id = owner.user_id if owner
end
end
@@ -288,10 +291,30 @@ module Spree
INVALID_STATES.include?(state)
end
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ order || cart
+ end
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
private
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+ end
+
def set_amount
- self.amount = order.total - order.payment_total
+ self.amount = owner.total - owner.payment_total
end
def amount_must_be_less_than_or_equal_to_max_amount
@@ -325,9 +348,9 @@ module Spree
def payment_method_available_for_order
return if payment_method.blank?
- return if order.blank?
+ return if owner.blank?
- errors.add(:payment_method, :invalid) if !payment_method.available_for_order?(order) || !payment_method.available_for_store?(order.store)
+ errors.add(:payment_method, :invalid) if !payment_method.available_for_order?(owner) || !payment_method.available_for_store?(owner.store)
end
def add_source_error(field, message)
@@ -355,7 +378,7 @@ module Spree
def split_uncaptured_amount
if uncaptured_amount > 0
- order.payments.create!(
+ owner.payments.create!(
amount: uncaptured_amount,
payment_method: payment_method,
source: source,
@@ -367,15 +390,15 @@ module Spree
end
def update_order
- order.updater.update_payment_total if completed? || void?
+ owner.updater.update_payment_total if completed? || void?
- if order.completed?
- order.updater.update_payment_state
- order.updater.update_fulfillments
- order.updater.update_fulfillment_status
+ if owner.is_a?(Spree::Order) && owner.completed?
+ owner.updater.update_payment_state
+ owner.updater.update_fulfillments
+ owner.updater.update_fulfillment_status
end
- order.persist_totals if completed? || order.completed?
+ owner.updater.persist_totals if completed? || (owner.is_a?(Spree::Order) && owner.completed?)
end
def create_eligible_credit_event
@@ -396,7 +419,7 @@ module Spree
# invalid payment or store_credit payment shouldn't invalidate other payment types
return if has_invalid_state? || store_credit?
- order.payments.with_state('checkout').where.not(id: id).each do |payment|
+ owner.payments.with_state('checkout').where.not(id: id).each do |payment|
payment.invalidate! unless payment.store_credit?
end
end
diff --git a/spree/core/app/models/spree/payment_session.rb b/spree/core/app/models/spree/payment_session.rb
index d6f52b7312..f329cf0eab 100644
--- a/spree/core/app/models/spree/payment_session.rb
+++ b/spree/core/app/models/spree/payment_session.rb
@@ -10,7 +10,8 @@ module Spree
publishes_lifecycle_events
- belongs_to :order, class_name: 'Spree::Order'
+ belongs_to :order, class_name: 'Spree::Order', optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true, inverse_of: :payment_sessions
belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
belongs_to :customer, class_name: Spree.user_class.to_s, optional: true
@@ -18,7 +19,8 @@ module Spree
foreign_key: :response_code,
primary_key: :external_id
- validates :order, :payment_method, :external_id, :status, :currency, presence: true
+ validates :payment_method, :external_id, :status, :currency, presence: true
+ validate :exactly_one_owner
validates :external_id, uniqueness: { scope: [:order_id, :payment_method_id] }
validates :amount, presence: true, numericality: { greater_than: 0 }
@@ -62,7 +64,7 @@ module Spree
before_validation :set_defaults_from_order, on: :create
- delegate :store, to: :order
+ delegate :store, to: :owner
def amount_in_cents
money.cents
@@ -85,7 +87,7 @@ module Spree
def find_or_create_payment!(metadata = {})
return payment if payment.present?
- order.payments.find_or_create_by!(
+ owner.payments.find_or_create_by!(
payment_method: payment_method,
response_code: external_id,
) do |p|
@@ -93,14 +95,48 @@ module Spree
p.skip_source_requirement = true
end
rescue ActiveRecord::RecordNotUnique
- order.payments.find_by!(
+ owner.payments.find_by!(
payment_method: payment_method,
response_code: external_id
)
end
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ order || cart
+ end
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
+ # Assigns the owning record to the matching association (cart or order),
+ # clearing the other one. Lets gateways stay owner-agnostic.
+ #
+ # @param record [Spree::Cart, Spree::Order]
+ def owner=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ self.order = nil
+ else
+ self.order = record
+ self.cart = nil
+ end
+ end
+
private
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+ end
+
def publish_processing_event
publish_event('payment_session.processing')
end
@@ -122,11 +158,11 @@ module Spree
end
def set_defaults_from_order
- return unless order
+ return unless owner
- self.amount ||= order.total_minus_store_credits if amount.blank? || amount.zero?
- self.currency ||= order.currency
- self.customer ||= order.user
+ self.amount ||= owner.total_minus_store_credits if amount.blank? || amount.zero?
+ self.currency ||= owner.currency
+ self.customer ||= owner.user
end
end
end
diff --git a/spree/core/app/models/spree/permission_sets/default_customer.rb b/spree/core/app/models/spree/permission_sets/default_customer.rb
index 5cbabd4f8b..6b36b0585a 100644
--- a/spree/core/app/models/spree/permission_sets/default_customer.rb
+++ b/spree/core/app/models/spree/permission_sets/default_customer.rb
@@ -35,15 +35,25 @@ module Spree
!order.completed? && (order.user == user || order.token && token == order.token)
end
+ # Cart management — the checkout owner since the cart/order split
+ can :create, Spree::Cart
+ can :show, Spree::Cart do |cart, token|
+ cart.customer == user || cart.token && token == cart.token
+ end
+ can [:update, :destroy], Spree::Cart do |cart, token|
+ !cart.completed? && (cart.customer == user || cart.token && token == cart.token)
+ end
+
# Line item management
can :create, Spree::LineItem do |line_item, token|
- line_item.order.user == user || line_item.order.token && token == line_item.order.token
- end
- can :update, Spree::LineItem do |line_item, token|
- !line_item.order.completed? && (line_item.order.user == user || line_item.order.token && token == line_item.order.token)
+ owner = line_item.owner
+ owner_user = owner.is_a?(Spree::Cart) ? owner.customer : owner.user
+ owner_user == user || owner.token && token == owner.token
end
- can :destroy, Spree::LineItem do |line_item, token|
- !line_item.order.completed? && (line_item.order.user == user || line_item.order.token && token == line_item.order.token)
+ can [:update, :destroy], Spree::LineItem do |line_item, token|
+ owner = line_item.owner
+ owner_user = owner.is_a?(Spree::Cart) ? owner.customer : owner.user
+ !owner.completed? && (owner_user == user || owner.token && token == owner.token)
end
# User account management - available to all users (including guests for their own record)
diff --git a/spree/core/app/models/spree/promotion.rb b/spree/core/app/models/spree/promotion.rb
index 111d3babc8..fe38d326f1 100644
--- a/spree/core/app/models/spree/promotion.rb
+++ b/spree/core/app/models/spree/promotion.rb
@@ -110,8 +110,8 @@ module Spree
where('spree_promotions.expires_at IS NULL OR spree_promotions.expires_at > ?', Time.current)
end
- def self.order_activatable?(order)
- order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)
+ def self.order_activatable?(promotable)
+ promotable && !promotable.completed? && !promotable.canceled?
end
def generate_code=(generating_code)
diff --git a/spree/core/app/models/spree/promotion_rules/category.rb b/spree/core/app/models/spree/promotion_rules/category.rb
index 0b03cc7811..9cdcf6225b 100644
--- a/spree/core/app/models/spree/promotion_rules/category.rb
+++ b/spree/core/app/models/spree/promotion_rules/category.rb
@@ -47,7 +47,7 @@ module Spree
after_save :add_categories
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible_category_ids
diff --git a/spree/core/app/models/spree/promotion_rules/channel.rb b/spree/core/app/models/spree/promotion_rules/channel.rb
index 4b9c80725a..91f7c363a7 100644
--- a/spree/core/app/models/spree/promotion_rules/channel.rb
+++ b/spree/core/app/models/spree/promotion_rules/channel.rb
@@ -14,7 +14,7 @@ module Spree
)
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def channels
diff --git a/spree/core/app/models/spree/promotion_rules/country.rb b/spree/core/app/models/spree/promotion_rules/country.rb
index 69c7010459..db7e3b932e 100644
--- a/spree/core/app/models/spree/promotion_rules/country.rb
+++ b/spree/core/app/models/spree/promotion_rules/country.rb
@@ -12,7 +12,7 @@ module Spree
preference :country_iso, :string # legacy ISO-based shortcut
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def countries
diff --git a/spree/core/app/models/spree/promotion_rules/currency.rb b/spree/core/app/models/spree/promotion_rules/currency.rb
index bf0aef19f2..217eb0c510 100644
--- a/spree/core/app/models/spree/promotion_rules/currency.rb
+++ b/spree/core/app/models/spree/promotion_rules/currency.rb
@@ -5,7 +5,7 @@ module Spree
preference :currency, :string
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/customer_group.rb b/spree/core/app/models/spree/promotion_rules/customer_group.rb
index 7a1f604318..24bda25e4c 100644
--- a/spree/core/app/models/spree/promotion_rules/customer_group.rb
+++ b/spree/core/app/models/spree/promotion_rules/customer_group.rb
@@ -7,7 +7,7 @@ module Spree
preference :customer_group_ids, :array, default: [], parse_on_set: normalize_id_preference(klass: Spree::CustomerGroup)
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def customer_groups
diff --git a/spree/core/app/models/spree/promotion_rules/first_order.rb b/spree/core/app/models/spree/promotion_rules/first_order.rb
index 5633d128a3..37cf191bdd 100644
--- a/spree/core/app/models/spree/promotion_rules/first_order.rb
+++ b/spree/core/app/models/spree/promotion_rules/first_order.rb
@@ -4,7 +4,7 @@ module Spree
attr_reader :user, :email, :store
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/item_total.rb b/spree/core/app/models/spree/promotion_rules/item_total.rb
index 1ed83cfd04..0df8d524bd 100644
--- a/spree/core/app/models/spree/promotion_rules/item_total.rb
+++ b/spree/core/app/models/spree/promotion_rules/item_total.rb
@@ -12,7 +12,7 @@ module Spree
OPERATORS_MAX = ['lt', 'lte']
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, _options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/market.rb b/spree/core/app/models/spree/promotion_rules/market.rb
index b7f75ecd7c..5c4ffe61e0 100644
--- a/spree/core/app/models/spree/promotion_rules/market.rb
+++ b/spree/core/app/models/spree/promotion_rules/market.rb
@@ -14,7 +14,7 @@ module Spree
)
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def markets
diff --git a/spree/core/app/models/spree/promotion_rules/one_use_per_user.rb b/spree/core/app/models/spree/promotion_rules/one_use_per_user.rb
index e9f3746ce4..7ca72af271 100644
--- a/spree/core/app/models/spree/promotion_rules/one_use_per_user.rb
+++ b/spree/core/app/models/spree/promotion_rules/one_use_per_user.rb
@@ -2,7 +2,7 @@ module Spree
module PromotionRules
class OneUsePerUser < Spree::PromotionRule
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, _options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/option_value.rb b/spree/core/app/models/spree/promotion_rules/option_value.rb
index 7cae2273f5..37818cae4d 100644
--- a/spree/core/app/models/spree/promotion_rules/option_value.rb
+++ b/spree/core/app/models/spree/promotion_rules/option_value.rb
@@ -8,7 +8,7 @@ module Spree
}
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(promotable, _options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/product.rb b/spree/core/app/models/spree/promotion_rules/product.rb
index 64f941f85a..e24bae2751 100644
--- a/spree/core/app/models/spree/promotion_rules/product.rb
+++ b/spree/core/app/models/spree/promotion_rules/product.rb
@@ -42,7 +42,7 @@ module Spree
end
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, _options = {})
diff --git a/spree/core/app/models/spree/promotion_rules/user.rb b/spree/core/app/models/spree/promotion_rules/user.rb
index 785cdb8844..04b5972d9e 100644
--- a/spree/core/app/models/spree/promotion_rules/user.rb
+++ b/spree/core/app/models/spree/promotion_rules/user.rb
@@ -41,7 +41,7 @@ module Spree
after_save :add_users
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible_user_ids
diff --git a/spree/core/app/models/spree/promotion_rules/user_logged_in.rb b/spree/core/app/models/spree/promotion_rules/user_logged_in.rb
index cf63a02690..b6af300886 100644
--- a/spree/core/app/models/spree/promotion_rules/user_logged_in.rb
+++ b/spree/core/app/models/spree/promotion_rules/user_logged_in.rb
@@ -8,7 +8,7 @@ module Spree
end
def applicable?(promotable)
- promotable.is_a?(Spree::Order)
+ promotable.is_a?(Spree::Order) || promotable.is_a?(Spree::Cart)
end
def eligible?(order, _options = {})
diff --git a/spree/core/app/models/spree/stock_reservation.rb b/spree/core/app/models/spree/stock_reservation.rb
index aaf633a968..8de5ef3fb3 100644
--- a/spree/core/app/models/spree/stock_reservation.rb
+++ b/spree/core/app/models/spree/stock_reservation.rb
@@ -6,15 +6,17 @@ module Spree
belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_reservations
belongs_to :line_item, class_name: 'Spree::LineItem', inverse_of: :stock_reservations
- belongs_to :order, class_name: 'Spree::Order', inverse_of: :stock_reservations
+ belongs_to :order, class_name: 'Spree::Order', inverse_of: :stock_reservations, optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', inverse_of: :stock_reservations, optional: true
- validates :stock_item, :line_item, :order, :quantity, :expires_at, presence: true
+ validates :stock_item, :line_item, :quantity, :expires_at, presence: true
+ validate :exactly_one_owner
validates :quantity, numericality: { greater_than: 0, only_integer: true }, presence: true
validates :line_item_id, uniqueness: { scope: :stock_item_id }, presence: true
scope :active, -> { where('spree_stock_reservations.expires_at > ?', Time.current) }
scope :expired, -> { where('spree_stock_reservations.expires_at <= ?', Time.current) }
- scope :for_order, ->(order) { where(order_id: order.id) }
+ scope :for_order, ->(owner) { owner.is_a?(Spree::Cart) ? where(cart_id: owner.id) : where(order_id: owner.id) }
scope :for_store, ->(store) {
joins(:order).where(spree_orders: { store_id: store.id })
}
@@ -22,6 +24,22 @@ module Spree
self.whitelisted_ransackable_attributes = %w[stock_item_id line_item_id order_id quantity expires_at]
self.whitelisted_ransackable_associations = %w[stock_item line_item order]
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ order || cart
+ end
+
+ # Bridge for legacy callers assigning +current_order+ (now a Spree::Cart)
+ # to the order association — routes carts to the cart FK instead.
+ def order=(record)
+ if record.is_a?(Spree::Cart)
+ self.cart = record
+ super(nil)
+ else
+ super
+ end
+ end
+
def active?
expires_at > Time.current
end
@@ -34,5 +52,11 @@ module Spree
minutes = Spree::Config[:default_stock_reservation_ttl_minutes] if minutes.blank?
minutes.to_i.then { |m| m > 0 ? m : 10 }.minutes
end
+
+ private
+
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+ end
end
end
diff --git a/spree/core/app/models/spree/store.rb b/spree/core/app/models/spree/store.rb
index 9c1aef2122..8e7e6eca18 100644
--- a/spree/core/app/models/spree/store.rb
+++ b/spree/core/app/models/spree/store.rb
@@ -71,7 +71,7 @@ module Spree
#
# Associations
#
- has_many :carts, -> { incomplete }, class_name: 'Spree::Order', inverse_of: :store
+ has_many :carts, class_name: 'Spree::Cart', inverse_of: :store, dependent: :destroy
has_many :checkouts, -> { incomplete }, class_name: 'Spree::Order', inverse_of: :store
has_many :orders, class_name: 'Spree::Order'
has_many :line_items, through: :orders, class_name: 'Spree::LineItem'
diff --git a/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb b/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
index 3ae3752280..de82b537f7 100644
--- a/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
+++ b/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
@@ -72,7 +72,7 @@ module Spree
csv = [
order.number,
index.zero? ? order.email : nil,
- index.zero? ? order.state : nil,
+ index.zero? ? order.status : nil,
index.zero? ? order.currency : nil,
index.zero? ? order.item_total.to_f : nil,
index.zero? ? order.shipment_total.to_f : nil,
diff --git a/spree/core/app/services/spree/addresses/create.rb b/spree/core/app/services/spree/addresses/create.rb
index 7cf3af3634..0fd16b2fb3 100644
--- a/spree/core/app/services/spree/addresses/create.rb
+++ b/spree/core/app/services/spree/addresses/create.rb
@@ -42,7 +42,7 @@ module Spree
private
def assign_to_order(order:, address_id:)
- order.update(ship_address_id: address_id, state: 'address')
+ order.update(ship_address_id: address_id)
end
end
end
diff --git a/spree/core/app/services/spree/addresses/update.rb b/spree/core/app/services/spree/addresses/update.rb
index 298ef39275..badc9c496b 100644
--- a/spree/core/app/services/spree/addresses/update.rb
+++ b/spree/core/app/services/spree/addresses/update.rb
@@ -91,8 +91,8 @@ module Spree
def reassign_incomplete_orders(old_address_id, new_address)
orders = Spree::Order.incomplete.where(user_id: new_address.user_id)
- orders.where(ship_address_id: old_address_id).update_all(ship_address_id: new_address.id, state: 'address', updated_at: Time.current)
- orders.where(bill_address_id: old_address_id).update_all(bill_address_id: new_address.id, state: 'address', updated_at: Time.current)
+ orders.where(ship_address_id: old_address_id).update_all(ship_address_id: new_address.id, updated_at: Time.current)
+ orders.where(bill_address_id: old_address_id).update_all(bill_address_id: new_address.id, updated_at: Time.current)
end
def defaults_changed?(address, default_billing, default_shipping)
diff --git a/spree/core/app/services/spree/carts/associate.rb b/spree/core/app/services/spree/carts/associate.rb
index 29ef2ef4c8..6720739f83 100644
--- a/spree/core/app/services/spree/carts/associate.rb
+++ b/spree/core/app/services/spree/carts/associate.rb
@@ -11,12 +11,18 @@ module Spree
guest_order.bill_address ||= user.bill_address
guest_order.ship_address ||= user.ship_address
- changes = guest_order.slice(*Spree::Order::ASSOCIATED_USER_ATTRIBUTES)
+ owner_key = guest_order.is_a?(Spree::Cart) ? :customer_id : :user_id
+ changes = {
+ owner_key => guest_order.user&.id,
+ email: guest_order.email,
+ bill_address_id: guest_order.bill_address&.id,
+ ship_address_id: guest_order.ship_address&.id
+ }.compact
# immediately persist the changes we just made, but don't use save
# since we might have an invalid address associated
ActiveRecord::Base.connected_to(role: :writing) do
- Spree::Order.unscoped.where(id: guest_order.id).update_all(changes)
+ guest_order.class.unscoped.where(id: guest_order.id).update_all(changes)
end
# Manually publish update event since update_all bypasses callbacks
diff --git a/spree/core/app/services/spree/carts/complete.rb b/spree/core/app/services/spree/carts/complete.rb
index 3ced15b05c..5edf722520 100644
--- a/spree/core/app/services/spree/carts/complete.rb
+++ b/spree/core/app/services/spree/carts/complete.rb
@@ -1,49 +1,276 @@
-# In Spree 6 this servoice will complete the Spree::Cart, and create a Spree::Order
-# created based on the contents of the cart.
module Spree
module Carts
+ # Completes a cart into an immutable order — a three-phase pipeline with
+ # explicit transaction boundaries. External payment I/O never runs inside
+ # a DB transaction; everything after a successful charge is small,
+ # idempotent and resumable (docs/plans/6.0-cart-order-split.md).
+ #
+ # PREPARE (txn) replay → lock → in-lock recalculation → drift guard →
+ # validate → draft order + copies (unique orders.cart_id)
+ # PAYMENT offline methods collapse into FINALIZE; external
+ # gateways run outside any txn with compensation
+ # FINALIZE (txn) inventory + counters + draft→placed + cart.completed_at
+ # + RecomputeStatuses; events after commit
class Complete
prepend Spree::ServiceModule::Base
- # Completes the cart and creates a Spree::Order based on its contents.
- # @return [Spree::Order]
- def call(cart:)
- return success(cart) if cart.completed?
- return failure(cart, 'Order is canceled') if cart.canceled?
- # Enforced here (not only in the controller) so every completion path —
- # API, payment-session webhook — honors the channel's guest-checkout gate.
- return failure(cart, Spree.t(:guest_checkout_not_allowed)) if cart.guest_checkout_disallowed?
+ COMPLETING_TTL = 5.minutes
+ def call(cart:, expected_total: nil, payment_pending: false)
+ # Legacy signature bridge: completing an already-created draft order
+ # (admin/B2B path) funnels through the same finalize semantics.
+ return complete_order(cart, payment_pending: payment_pending) if cart.is_a?(Spree::Order)
+
+ # P1 — replay: a double-clicked Place Order must get the order back
+ if (existing = completion_result(cart))
+ return finalize_or_return(cart, existing)
+ end
+
+ order = nil
+
+ # PHASE P — PREPARE
cart.with_lock do
- process_payments!(cart) if cart.payment_required?
+ if cart.completing? && cart.completing_at > COMPLETING_TTL.ago
+ return failure(cart, code: 'completion_in_progress')
+ end
+
+ # In-lock recalculation — the totals about to be charged are
+ # computed here, not trusted from earlier requests
+ cart.update_with_updater!
+
+ if expected_total.present? && BigDecimal(expected_total.to_s) != cart.total
+ return failure(cart, code: 'cart_changed', current_total: cart.total)
+ end
- return failure(cart, cart.errors.full_messages.to_sentence) if cart.errors.any?
+ validation = Spree::Carts::Validate.new.errors_for(cart)
+ return failure(cart, code: 'validation_failed', errors: validation) if validation.any?
- advance_to_complete!(cart)
+ cart.update_columns(completing_at: Time.current)
+ order = create_draft_order!(cart)
+ end
+
+ # PHASE Y — PAYMENT (external I/O outside any transaction)
+ if order.payment_required? && !payment_covered?(order)
+ begin
+ order.process_payments!
+ rescue Spree::Core::GatewayError => e
+ return compensate!(cart, order, e.message)
+ end
- if cart.reload.complete?
- Spree::StockReservations::Release.call(order: cart)
- success(cart)
- else
- failure(cart, cart.errors.full_messages.to_sentence.presence || 'Could not complete checkout')
+ unless payment_covered?(order)
+ return compensate!(cart, order, order.errors.full_messages.to_sentence.presence || Spree.t(:payment_processing_failed))
end
end
+
+ # PHASE F — FINALIZE
+ finalize!(cart, order)
+ success(order)
+ rescue ActiveRecord::RecordNotUnique
+ # Concurrent completion won the unique orders.cart_id race — replay
+ retry_result = completion_result(cart.reload)
+ retry_result ? finalize_or_return(cart, retry_result) : failure(cart, code: 'completion_in_progress')
end
private
- def process_payments!(cart)
- # If payments were already processed by the payment session
- # (e.g. Stripe charged the card during complete_payment_session),
- # skip re-processing. Only process unprocessed (checkout state) payments.
- return if cart.payment_total >= cart.total
- return if cart.payments.valid.any?(&:completed?) && cart.unprocessed_payments.empty?
+ # Exactly one of cart.order (single partition) or, later, the
+ # multi-vendor order group.
+ def completion_result(cart)
+ cart.order
+ end
+
+ def finalize_or_return(cart, order)
+ return success(order) if order.placed? || order.canceled?
+
+ # Draft order exists — a previous attempt died mid-pipeline. Resume:
+ # re-verify payment coverage, then re-run FINALIZE (idempotent).
+ if order.payment_required? && !payment_covered?(order)
+ return failure(cart, code: 'payment_failed', message: Spree.t(:payment_processing_failed))
+ end
+
+ finalize!(cart, order)
+ success(order)
+ end
+
+ # P7 — the copy contract: the order receives copies (line items with
+ # typed money lines re-pointed, fulfillments + selected rates, address
+ # copies); money records (payments, sessions, reservations, coupon
+ # codes) re-point — external transaction references must never fork.
+ def create_draft_order!(cart)
+ order = nil
+ ApplicationRecord.transaction do
+ order = cart.store.orders.new(
+ cart: cart,
+ status: 'draft',
+ email: cart.email,
+ currency: cart.currency,
+ locale: cart.locale,
+ market: cart.market,
+ channel: cart.channel,
+ user: cart.customer,
+ token: cart.token,
+ accept_marketing: cart.accept_marketing,
+ special_instructions: cart.special_instructions,
+ last_ip_address: cart.last_ip_address,
+ ship_address: cart.ship_address&.dup,
+ bill_address: cart.bill_address&.dup
+ )
+ order.save!
+
+ line_item_map = copy_line_items!(cart, order)
+ fulfillment_map = copy_fulfillments!(cart, order, line_item_map)
+ copy_typed_lines!(cart, order, line_item_map, fulfillment_map)
+ copy_promotions!(cart, order)
+ repoint_money_records!(cart, order)
+
+ order.update_columns(
+ item_total: cart.item_total,
+ item_count: cart.item_count,
+ adjustment_total: cart.adjustment_total,
+ included_tax_total: cart.included_tax_total,
+ additional_tax_total: cart.additional_tax_total,
+ taxable_adjustment_total: cart.taxable_adjustment_total,
+ non_taxable_adjustment_total: cart.non_taxable_adjustment_total,
+ promo_total: cart.promo_total,
+ fee_total: cart.fee_total,
+ delivery_total: cart.delivery_total,
+ total: cart.total,
+ payment_total: cart.payment_total
+ )
+ end
+ order
+ end
+
+ def copy_line_items!(cart, order)
+ cart.line_items.reload.index_with do |cart_line_item|
+ attributes = cart_line_item.attributes.except('id', 'cart_id', 'created_at', 'updated_at')
+ order.line_items.create!(attributes.merge('order_id' => order.id))
+ end
+ end
+
+ # @return [Hash{Integer => Integer}] cart fulfillment id → order fulfillment id
+ def copy_fulfillments!(cart, order, line_item_map)
+ line_item_id_map = line_item_map.transform_keys(&:id).transform_values(&:id)
+
+ cart.fulfillments.reload.each_with_object({}) do |cart_fulfillment, map|
+ attributes = cart_fulfillment.attributes.except('id', 'cart_id', 'number', 'created_at', 'updated_at')
+ fulfillment = order.fulfillments.create!(attributes.merge('order_id' => order.id, 'address_id' => order.ship_address_id))
+
+ if (selected = cart_fulfillment.selected_delivery_rate)
+ rate_attributes = selected.attributes.except('id', 'created_at', 'updated_at')
+ fulfillment.delivery_rates.create!(rate_attributes.merge('fulfillment_id' => fulfillment.id))
+ end
+
+ cart_fulfillment.fulfillment_items.each do |item|
+ item_attributes = item.attributes.except('id', 'created_at', 'updated_at')
+ fulfillment.fulfillment_items.create!(
+ item_attributes.merge(
+ 'fulfillment_id' => fulfillment.id,
+ 'order_id' => order.id,
+ 'line_item_id' => line_item_id_map.fetch(item.line_item_id)
+ )
+ )
+ end
+
+ map[cart_fulfillment.id] = fulfillment.id
+ end
+ end
+
+ def copy_typed_lines!(cart, order, line_item_map, fulfillment_map)
+ line_item_id_map = line_item_map.transform_keys(&:id).transform_values(&:id)
+
+ [Spree::TaxLine, Spree::Discount, Spree::Fee].each do |klass|
+ klass.where(cart_id: cart.id).find_each do |row|
+ attributes = row.attributes.except('id', 'cart_id', 'created_at', 'updated_at')
+ attributes['order_id'] = order.id
+
+ if row.respond_to?(:line_item_id) && row.line_item_id
+ attributes['line_item_id'] = line_item_id_map[row.line_item_id]
+ next if attributes['line_item_id'].nil?
+ end
+ if row.respond_to?(:fulfillment_id) && row.fulfillment_id
+ attributes['fulfillment_id'] = fulfillment_map[row.fulfillment_id]
+ next if attributes['fulfillment_id'].nil?
+ end
+
+ klass.create!(attributes)
+ end
+ end
+ end
+
+ def copy_promotions!(cart, order)
+ cart.order_promotions.find_each do |cart_promotion|
+ order.order_promotions.find_or_create_by!(promotion_id: cart_promotion.promotion_id)
+ end
+ end
+
+ def repoint_money_records!(cart, order)
+ cart.payments.update_all(order_id: order.id, cart_id: nil)
+ cart.payment_sessions.update_all(order_id: order.id, cart_id: nil)
+ cart.stock_reservations.update_all(order_id: order.id, cart_id: nil)
+ Spree::CouponCode.where(cart_id: cart.id).update_all(order_id: order.id, cart_id: nil)
+ order.payments.reset
+ end
- cart.process_payments!
+ # Completion gates on "a valid payment exists covering the total",
+ # never on paid? — a net-terms order completes with a pending payment.
+ def payment_covered?(order)
+ order.payments.reset
+ order.payments.valid.where(state: %w[pending processing completed]).sum(:amount) >= order.total
end
- def advance_to_complete!(cart)
- cart.next until cart.complete? || cart.errors.present?
+ # Y3 — only pre-capture failures compensate; post-capture failures
+ # resume through the sweeper, never destroy the order.
+ def compensate!(cart, order, message)
+ if order.payments.valid.completed.none?
+ ApplicationRecord.transaction do
+ order.payments.update_all(order_id: nil, cart_id: cart.id)
+ order.payment_sessions.update_all(order_id: nil, cart_id: cart.id)
+ order.stock_reservations.update_all(order_id: nil, cart_id: cart.id)
+ Spree::CouponCode.where(order_id: order.id).update_all(order_id: nil, cart_id: cart.id)
+ order.reload.destroy!
+ cart.update_columns(completing_at: nil)
+ end
+ end
+ failure(cart, code: 'payment_failed', message: message)
+ end
+
+ def finalize!(cart, order)
+ ApplicationRecord.transaction do
+ order.finalize! unless order.placed?
+ order.update_columns(status: 'placed') unless order.reload.placed?
+ cart.update_columns(completed_at: Time.current, completing_at: nil)
+ end
+ Spree::StockReservations::Release.call(order: order)
+ Spree::Orders::RecomputeStatuses.call(order: order)
+ mark_coupon_codes_used!(cart, order)
+ end
+
+ def mark_coupon_codes_used!(_cart, order)
+ Spree::CouponCode.where(order_id: order.id).unused.update_all(state: 1)
+ end
+
+ # Admin/B2B draft orders bypass the cart but reuse the same finalize
+ # semantics (idempotency + inventory + reservation release in one home).
+ def complete_order(order, payment_pending: false)
+ return success(order) if order.completed?
+ return failure(order, 'Order is canceled') if order.canceled?
+
+ order.with_lock do
+ skip_payments = payment_pending || !order.payment_required?
+ order.process_payments! if !skip_payments && !payment_covered?(order)
+
+ return failure(order, order.errors.full_messages.to_sentence) if order.errors.any?
+
+ if !skip_payments && !payment_covered?(order)
+ return failure(order, Spree.t(:payment_processing_failed))
+ end
+
+ order.finalize! unless order.completed?
+ Spree::StockReservations::Release.call(order: order)
+ Spree::Orders::RecomputeStatuses.call(order: order)
+ success(order)
+ end
end
end
end
diff --git a/spree/core/app/services/spree/carts/empty.rb b/spree/core/app/services/spree/carts/empty.rb
index 55636cd871..226015fb31 100644
--- a/spree/core/app/services/spree/carts/empty.rb
+++ b/spree/core/app/services/spree/carts/empty.rb
@@ -28,7 +28,6 @@ module Spree
order.order_promotions.destroy_all
order.update_totals
order.persist_totals
- order.restart_checkout_flow
Spree::StockReservations::Release.call(order: order)
diff --git a/spree/core/app/services/spree/carts/merge.rb b/spree/core/app/services/spree/carts/merge.rb
new file mode 100644
index 0000000000..f8a6056e57
--- /dev/null
+++ b/spree/core/app/services/spree/carts/merge.rb
@@ -0,0 +1,41 @@
+module Spree
+ module Carts
+ # Default cart-merge strategy (Spree::Dependencies.cart_merge_strategy).
+ # Preserves the legacy OrderMerger behavior minus its bugs: a
+ # currency-mismatched source cart is surfaced (skipped and kept), never
+ # silently destroyed.
+ class Merge
+ prepend Spree::ServiceModule::Base
+
+ def call(cart:, other_cart:, user: nil)
+ return success(cart) if other_cart.nil? || other_cart.id == cart.id
+ return failure(cart, Spree.t('errors.messages.cart_currency_mismatch')) if other_cart.currency != cart.currency
+
+ ApplicationRecord.transaction do
+ other_cart.line_items.reload.each do |other_line_item|
+ current = cart.line_items.detect do |line_item|
+ line_item.variant_id == other_line_item.variant_id &&
+ Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: cart, line_item: line_item, options: {}).value
+ rescue StandardError
+ line_item.variant_id == other_line_item.variant_id
+ end
+
+ if current
+ current.quantity += other_line_item.quantity
+ current.save!
+ other_line_item.destroy!
+ else
+ other_line_item.update!(cart: cart, order: nil)
+ end
+ end
+
+ cart.associate_user!(user) if user && cart.customer.blank?
+ other_cart.reload.destroy! if other_cart.line_items.reload.empty?
+ end
+
+ cart.update_with_updater!
+ success(cart)
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/carts/update.rb b/spree/core/app/services/spree/carts/update.rb
index 6e17c882eb..85ba0f1ffb 100644
--- a/spree/core/app/services/spree/carts/update.rb
+++ b/spree/core/app/services/spree/carts/update.rb
@@ -34,6 +34,10 @@ module Spree
attr_reader :cart, :params
+ def address_changed?
+ cart.saved_change_to_ship_address_id? || cart.saved_change_to_market_id?
+ end
+
def assign_cart_attributes
cart.email = params[:email] if params[:email].present?
cart.customer_note = params[:customer_note] if params.key?(:customer_note)
@@ -61,10 +65,9 @@ module Spree
address_id = resolve_address_id(address_params[:id])
cart.public_send(:"#{address_type}_id=", address_id) if address_id
else
- # Only revert to address state when shipping address changes.
- # Billing address updates (e.g. during payment) should not
- # destroy shipments and reset the checkout flow.
- revert_to_address_state if address_type == :shipping_address && cart.has_checkout_step?('address')
+ # Only a shipping-address change invalidates delivery proposals;
+ # billing updates (e.g. during payment) must not rebuild them.
+ @address_invalidated = true if address_type == :shipping_address
cart.public_send(:"#{address_type}_attributes=", address_params)
end
end
@@ -101,16 +104,10 @@ module Spree
unless cart.market.country_ids.include?(cart.ship_address.country_id)
cart.ship_address = nil
- revert_to_address_state if cart.has_checkout_step?('address')
+ @address_invalidated = true
end
end
- def revert_to_address_state
- return if ['cart', 'address'].include?(cart.state)
-
- cart.state = 'address'
- end
-
# Three-way dispatch on the cart→checkout transition:
# entering checkout → Reserve, mid-checkout mutation → Extend, reverting to cart → Release.
# A failed Reserve raises so the enclosing transaction rolls back and the
@@ -126,23 +123,29 @@ module Spree
end
end
- # Auto-advance as far as the checkout state machine allows, but never
- # to complete. The complete transition must always be explicit via
- # the /carts/:id/complete endpoint — otherwise gift cards or store
- # credits that fully cover the order total would auto-complete the
- # cart during address/delivery updates.
+ # Recalculation-on-write: address/market changes re-price, re-tax and
+ # rebuild delivery proposals; completion stays explicit via the
+ # /carts/:id/complete endpoint (a fully-covered cart must never
+ # auto-complete during address updates).
def try_advance
return if cart.complete? || cart.canceled?
- steps = cart.checkout_steps
- loop do
- current_index = steps.index(cart.state).to_i
- next_step = steps[current_index + 1]
- break if next_step.nil? || next_step == 'complete'
- break unless cart.next
+ if @address_invalidated || address_changed?
+ if cart.respond_to?(:recalculate_for_address_change!)
+ cart.recalculate_for_address_change!
+ else
+ cart.ensure_updated_shipments
+ if cart.ship_address.present? && cart.respond_to?(:create_proposed_shipments)
+ cart.create_proposed_shipments
+ cart.set_shipments_cost
+ end
+ cart.update_with_updater!
+ end
+ else
+ cart.update_with_updater!
end
rescue StandardError => e
- Rails.error.report(e, context: { order_id: cart.id, state: cart.state }, source: 'spree.checkout')
+ Rails.error.report(e, context: { order_id: cart.id }, source: 'spree.checkout')
ensure
# A halted transition records warnings on the cart, which reload would drop, so carry them across the reload.
warnings = cart.warnings
diff --git a/spree/core/app/services/spree/carts/validate.rb b/spree/core/app/services/spree/carts/validate.rb
new file mode 100644
index 0000000000..69db35cc9b
--- /dev/null
+++ b/spree/core/app/services/spree/carts/validate.rb
@@ -0,0 +1,51 @@
+module Spree
+ module Carts
+ # The full completion battery, returning structured per-field errors with
+ # stable codes: { step:, field:, code:, message: }. Also exposed read-only
+ # so storefronts can render checkout readiness without attempting
+ # completion.
+ class Validate
+ prepend Spree::ServiceModule::Base
+
+ def call(cart:)
+ errors = errors_for(cart)
+ errors.empty? ? success(cart) : failure(cart, errors)
+ end
+
+ # @return [Array<Hash>] structured errors; empty when the cart can complete
+ def errors_for(cart)
+ errors = Spree::Checkout::Requirements.new(cart).call.map do |requirement|
+ requirement.merge(code: code_for(requirement))
+ end
+
+ errors.concat(stock_errors(cart))
+ errors << guest_policy_error(cart) if cart.guest_checkout_disallowed?
+ errors.compact
+ end
+
+ private
+
+ def code_for(requirement)
+ "#{requirement[:field]}_required"
+ end
+
+ def stock_errors(cart)
+ cart.line_items.includes(variant: :product).filter_map do |line_item|
+ if line_item.variant.product.discontinued?
+ error('cart', 'line_items', 'discontinued', Spree.t('cart_line_item.discontinued', li_name: line_item.name))
+ elsif !line_item.sufficient_stock?
+ error('cart', 'line_items', 'out_of_stock', Spree.t('cart_line_item.out_of_stock', li_name: line_item.name))
+ end
+ end
+ end
+
+ def guest_policy_error(cart)
+ error('address', 'email', 'guest_checkout_not_allowed', Spree.t(:guest_checkout_not_allowed))
+ end
+
+ def error(step, field, code, message)
+ { step: step, field: field, code: code, message: message }
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/checkout/advance.rb b/spree/core/app/services/spree/checkout/advance.rb
index 04bf177acb..dfd61ae933 100644
--- a/spree/core/app/services/spree/checkout/advance.rb
+++ b/spree/core/app/services/spree/checkout/advance.rb
@@ -1,57 +1,28 @@
module Spree
module Checkout
+ # Requirements-driven replacement for machine advancement: there are no
+ # states to walk, so "advancing" a cart means recalculating it (prices,
+ # promotions, tax, delivery proposals) so its requirements reflect the
+ # latest data. The optional +shipping_method_id+ keeps the quick-checkout
+ # flows working (Google Pay does not always send a separate selection).
class Advance
prepend Spree::ServiceModule::Base
def call(order:, state: nil, shipping_method_id: nil)
- return failure(order) if state.present? && !order.has_checkout_step?(state)
- return success(order) if state.present? && order.passed_checkout_step?(state)
+ cart = order
- old_state = order.state
- order_updater_ran = false
-
- # We need to check how many times we transitioned between checkout steps and return the error if no transition has been made
- # We'll always return an error when passing the `state` arg and not reaching the targeted state
- transitions_count = 0
-
- until cannot_make_transition?(order, state)
- next_result = Spree.checkout_next_service.call(order: order)
- return failure(order, order.errors) if next_result.failure? && (transitions_count.zero? || state.present?)
-
- transitions_count +=1
-
- # Quick Checkout with Google Pay not always sends events for shipping method selection
- # we have to check this after payment
-
- if order.delivery? &&
- shipping_method_id.present? &&
- order.fulfillments.count == 1 &&
- order.shipping_method.id != shipping_method_id
-
- result = Spree::Checkout::SelectShippingMethod.call(order: order, params: { shipping_method_id: shipping_method_id })
-
- # We're running the order update inside Spree::Checkout::SelectShippingMethod
- order_updater_ran = result.success?
- end
+ if cart.fulfillments.empty? && cart.delivery_required? && cart.ship_address.present? && cart.respond_to?(:rebuild_fulfillments!)
+ cart.rebuild_fulfillments!
end
- if order.state != old_state && !order_updater_ran
- order.updater.update_fulfillment_status
- order.updater.update_payment_state
- order.save! if order.changed?
+ if shipping_method_id.present? && cart.fulfillments.count == 1 &&
+ cart.fulfillments.first.delivery_method&.id != shipping_method_id
+ result = Spree::Checkout::SelectShippingMethod.call(order: cart, params: { shipping_method_id: shipping_method_id })
+ return result if result.failure?
end
- success(order)
- end
-
- private
-
- def cannot_make_transition?(order, state = nil)
- order.state == state || order.confirm? || order.complete? || order.errors.present? || order.passed_checkout_step?(state)
- end
-
- def report_advance_error(error, order)
- # You can report checkout advance error here
+ cart.update_with_updater!
+ success(cart)
end
end
end
diff --git a/spree/core/app/services/spree/checkout/complete.rb b/spree/core/app/services/spree/checkout/complete.rb
index a5cc659e72..63bd822928 100644
--- a/spree/core/app/services/spree/checkout/complete.rb
+++ b/spree/core/app/services/spree/checkout/complete.rb
@@ -1,22 +1,12 @@
module Spree
module Checkout
+ # @deprecated Use Spree::Carts::Complete; removed in 6.1.
class Complete
prepend Spree::ServiceModule::Base
def call(order:)
- Spree.checkout_next_service.call(order: order) until cannot_make_transition?(order)
-
- if order.reload.complete?
- success(order)
- else
- failure(order)
- end
- end
-
- private
-
- def cannot_make_transition?(order)
- order.complete? || order.errors.present?
+ Spree::Deprecation.warn('Spree::Checkout::Complete is deprecated and will be removed in Spree 6.1. Use Spree::Carts::Complete instead.')
+ Spree::Dependencies.carts_complete_service.constantize.call(cart: order)
end
end
end
diff --git a/spree/core/app/services/spree/checkout/next.rb b/spree/core/app/services/spree/checkout/next.rb
index 0ade1edb32..7a37f7b67f 100644
--- a/spree/core/app/services/spree/checkout/next.rb
+++ b/spree/core/app/services/spree/checkout/next.rb
@@ -1,12 +1,14 @@
module Spree
module Checkout
+ # @deprecated There are no checkout states to advance since 6.0 —
+ # recalculates the cart and returns it. Removed in 6.1; use
+ # Spree::Checkout::Advance.
class Next
prepend Spree::ServiceModule::Base
def call(order:)
- return success(order.reload) if order.next
-
- failure(order)
+ Spree::Deprecation.warn('Spree::Checkout::Next is deprecated and will be removed in Spree 6.1. Use Spree::Checkout::Advance instead.')
+ Spree::Checkout::Advance.call(order: order)
end
end
end
diff --git a/spree/core/app/services/spree/checkout/update.rb b/spree/core/app/services/spree/checkout/update.rb
index 93f5eff155..5574c625d0 100644
--- a/spree/core/app/services/spree/checkout/update.rb
+++ b/spree/core/app/services/spree/checkout/update.rb
@@ -14,22 +14,59 @@ module Spree
params[:order][:ship_address_attributes] = replace_country_iso_with_id(params[:order][:ship_address_attributes]) if ship_changed
params[:order][:bill_address_attributes] = replace_country_iso_with_id(params[:order][:bill_address_attributes]) if bill_changed
- # for quick checkouts we cannot revert to previous states
- # we already have the address and delivery steps completed
- # however we need to update the shipping address with missing data
- # as previously we didn't have access to first/last name and street
- unless params[:do_not_change_state]
- order.state = 'address' if (ship_changed || bill_changed || quick_checkout_cancelled?(params)) && order.has_checkout_step?('address')
- order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
- end
+ # An address change invalidates the delivery proposals — rebuild them
+ # (recalculation-on-write; there are no states to rewind).
+ address_changed = ship_changed || bill_changed || quick_checkout_cancelled?(params)
- return success(order) if order.update_from_params(params, permitted_attributes, request_env)
+ return success(order) if update_from_params(order, params, permitted_attributes, request_env, address_changed)
failure(order)
end
private
+ def update_from_params(order, params, permitted_attributes, request_env, address_changed)
+ massage_payment_params!(order, params)
+
+ attributes = params[:order] ? params[:order].permit(permitted_attributes).delete_if { |_k, v| v.nil? } : {}
+
+ if (existing_card_id = params[:order]&.delete(:existing_card)).present?
+ credit_card = Spree::CreditCard.find(existing_card_id)
+ if credit_card.user_id != order.user_id || credit_card.user_id.blank?
+ raise Spree::Core::GatewayError, Spree.t(:invalid_credit_card)
+ end
+
+ credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
+
+ attributes[:payments_attributes].first[:source] = credit_card
+ attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
+ attributes[:payments_attributes].first.delete(:source_attributes)
+ end
+
+ attributes[:payments_attributes].first[:request_env] = request_env if attributes[:payments_attributes]
+
+ result = order.update(attributes)
+ if result
+ order.recalculate_for_address_change! if address_changed && order.respond_to?(:recalculate_for_address_change!)
+ order.set_shipments_cost if order.respond_to?(:set_shipments_cost) && order.fulfillments.any?
+ end
+ result
+ end
+
+ # For the payment step, filter parameters to the nested attributes of
+ # the selected payment method and set the chargeable amount.
+ def massage_payment_params!(order, params)
+ if params[:payment_source].present? && params.dig(:order, :payments_attributes)
+ source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].to_s]
+ params[:order][:payments_attributes].first[:source_attributes] = source_params if source_params
+ end
+
+ if params[:order] && (params[:order][:payments_attributes] || params[:order][:existing_card])
+ params[:order][:payments_attributes] ||= [{}]
+ params[:order][:payments_attributes].first[:amount] = order.order_total_after_store_credit
+ end
+ end
+
def validate_address_ownership(order, params)
return nil unless params[:order]
diff --git a/spree/core/app/services/spree/orders/complete.rb b/spree/core/app/services/spree/orders/complete.rb
index 69c2fc8dac..006d7e539b 100644
--- a/spree/core/app/services/spree/orders/complete.rb
+++ b/spree/core/app/services/spree/orders/complete.rb
@@ -1,10 +1,7 @@
module Spree
module Orders
- # Admin-side order completion.
- #
- # Distinct from Spree::Carts::Complete (storefront checkout). Callers must
- # wrap invocation in Spree::Api::V3::OrderLock#with_order_lock — this
- # service does not lock the row itself.
+ # Admin-side completion of a draft order, sharing finalize semantics with
+ # cart checkout (idempotency, inventory finalization, reservation release).
#
# @param order [Spree::Order]
# @param payment_pending [Boolean] if true, completes the order without
@@ -20,33 +17,10 @@ module Spree
def call(order:, payment_pending: false, notify_customer: false)
order.notify_customer = notify_customer
- return success(order) if order.completed?
- return failure(order, 'Order is canceled') if order.canceled?
-
- process_payments!(order) if order.payment_required? && !payment_pending
-
- return failure(order, order.errors.full_messages.to_sentence) if order.errors.any?
-
- advance_to_complete!(order)
-
- if order.reload.complete?
- success(order)
- else
- failure(order, order.errors.full_messages.to_sentence.presence || 'Could not complete order')
- end
- end
-
- private
-
- def process_payments!(order)
- return if order.payment_total >= order.total
- return if order.payments.valid.any?(&:completed?) && order.unprocessed_payments.empty?
-
- order.process_payments!
- end
-
- def advance_to_complete!(order)
- order.next until order.complete? || order.errors.present?
+ Spree::Dependencies.carts_complete_service.constantize.call(
+ cart: order,
+ payment_pending: payment_pending
+ )
end
end
end
diff --git a/spree/core/app/services/spree/orders/recompute_statuses.rb b/spree/core/app/services/spree/orders/recompute_statuses.rb
new file mode 100644
index 0000000000..d73def45ff
--- /dev/null
+++ b/spree/core/app/services/spree/orders/recompute_statuses.rb
@@ -0,0 +1,67 @@
+module Spree
+ module Orders
+ # The ONLY writer of +payment_status+ and +fulfillment_status+.
+ # Derive-then-persist: statuses are recomputed from payment/refund/
+ # fulfillment records and stored in indexed columns so admin filtering
+ # keeps working. Triggered from payment/refund/fulfillment/return event
+ # subscribers — never inline from controllers.
+ class RecomputeStatuses
+ prepend Spree::ServiceModule::Base
+
+ PAYMENT_STATUSES = %w[none authorized partially_paid paid partially_refunded refunded overcharged voided].freeze
+
+ def call(order:)
+ order.update_columns(
+ payment_status: payment_status_for(order),
+ fulfillment_status: fulfillment_status_for(order),
+ updated_at: Time.current
+ )
+ success(order)
+ end
+
+ private
+
+ # Money is quantized to currency precision before comparing, and
+ # granted refunds are subtracted from the target total — the two rules
+ # every derivation implementation gets wrong first.
+ def payment_status_for(order)
+ currency = ::Money::Currency.find(order.currency) || ::Money::Currency.find('USD')
+ precision = currency.exponent
+
+ captured = quantize(order.payments.valid.completed.sum(:amount), precision)
+ authorized = quantize(order.payments.valid.pending.sum(:amount), precision)
+ refunded = quantize(order.refunds.sum(:amount), precision)
+ target = quantize(order.total, precision) - refunded
+ net_captured = captured - refunded
+
+ if order.canceled? && net_captured <= 0 && captured.positive?
+ 'voided'
+ elsif refunded.positive? && net_captured <= 0
+ 'refunded'
+ elsif refunded.positive?
+ 'partially_refunded'
+ elsif captured.zero? && authorized.zero?
+ 'none'
+ elsif captured.zero?
+ 'authorized'
+ elsif net_captured > target
+ 'overcharged'
+ elsif net_captured >= target
+ 'paid'
+ else
+ 'partially_paid'
+ end
+ end
+
+ # Domain owned by the fulfillment plan (incl. backorder) — same rollup
+ # OrderUpdater#update_fulfillment_status computes.
+ def fulfillment_status_for(order)
+ Spree::OrderUpdater.new(order).update_fulfillment_status
+ end
+
+ def quantize(amount, precision)
+ BigDecimal(amount.to_s).round(precision)
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/payments/handle_webhook.rb b/spree/core/app/services/spree/payments/handle_webhook.rb
index 5ed18a1649..53eb6d7fa9 100644
--- a/spree/core/app/services/spree/payments/handle_webhook.rb
+++ b/spree/core/app/services/spree/payments/handle_webhook.rb
@@ -10,7 +10,7 @@ module Spree
def call(payment_method:, action:, payment_session:, metadata: {})
return success(nil) if payment_session.nil?
- order = payment_session.order
+ order = payment_session.owner
case action
when :captured, :authorized
@@ -43,7 +43,8 @@ module Spree
payment_session.complete if payment_session.can_complete?
unless order.reload.completed?
- Spree::Dependencies.carts_complete_service.constantize.call(cart: order)
+ completable = order.is_a?(Spree::Order) ? (order.cart || order) : order
+ Spree::Dependencies.carts_complete_service.constantize.call(cart: completable)
end
end
diff --git a/spree/core/app/services/spree/stock_reservations/extend.rb b/spree/core/app/services/spree/stock_reservations/extend.rb
index 5691e4d2e0..babfa0aa9d 100644
--- a/spree/core/app/services/spree/stock_reservations/extend.rb
+++ b/spree/core/app/services/spree/stock_reservations/extend.rb
@@ -9,7 +9,7 @@ module Spree
expires_at = Time.current + Spree::StockReservation.ttl_for(order)
Spree::StockReservation
- .where(order_id: order.id)
+ .merge(Spree::StockReservation.for_order(order))
.update_all(expires_at: expires_at, updated_at: Time.current)
success(order)
diff --git a/spree/core/app/services/spree/stock_reservations/release.rb b/spree/core/app/services/spree/stock_reservations/release.rb
index 12646bee37..d70f3eb2a1 100644
--- a/spree/core/app/services/spree/stock_reservations/release.rb
+++ b/spree/core/app/services/spree/stock_reservations/release.rb
@@ -4,7 +4,7 @@ module Spree
prepend Spree::ServiceModule::Base
def call(order:)
- Spree::StockReservation.where(order_id: order.id).delete_all
+ Spree::StockReservation.merge(Spree::StockReservation.for_order(order)).delete_all
success(order)
end
end
diff --git a/spree/core/app/services/spree/stock_reservations/reserve.rb b/spree/core/app/services/spree/stock_reservations/reserve.rb
index 4d471dacef..7911e9d890 100644
--- a/spree/core/app/services/spree/stock_reservations/reserve.rb
+++ b/spree/core/app/services/spree/stock_reservations/reserve.rb
@@ -20,7 +20,7 @@ module Spree
.lock
.index_by(&:id)
- held = held_by_others(locked_stock_items.keys, order.id)
+ held = held_by_others(locked_stock_items.keys, order)
existing = existing_reservations_for(targets)
this_order_used = Hash.new(0)
@@ -45,7 +45,13 @@ module Spree
reservation = existing[[stock_item.id, line_item.id]] ||
Spree::StockReservation.new(stock_item: stock_item, line_item: line_item)
- reservation.order = order
+ if order.is_a?(Spree::Cart)
+ reservation.cart = order
+ reservation.order = nil
+ else
+ reservation.order = order
+ reservation.cart = nil
+ end
reservation.quantity = line_item.quantity
reservation.expires_at = expires_at
reservation.save!
@@ -78,13 +84,14 @@ module Spree
variant.stock_items.detect { |si| si.stock_location&.active? && si.available? }
end
- def held_by_others(stock_item_ids, exclude_order_id)
+ def held_by_others(stock_item_ids, owner)
return {} if stock_item_ids.empty?
+ owner_column = owner.is_a?(Spree::Cart) ? :cart_id : :order_id
Spree::StockReservation
.active
.where(stock_item_id: stock_item_ids)
- .where.not(order_id: exclude_order_id)
+ .where.not(owner_column => owner.id)
.group(:stock_item_id)
.sum(:quantity)
end
diff --git a/spree/core/app/services/spree/variants/remove_line_items.rb b/spree/core/app/services/spree/variants/remove_line_items.rb
index fbc5039807..64f1d7962e 100644
--- a/spree/core/app/services/spree/variants/remove_line_items.rb
+++ b/spree/core/app/services/spree/variants/remove_line_items.rb
@@ -4,7 +4,12 @@ module Spree
prepend Spree::ServiceModule::Base
def call(variant:)
- variant.line_items.joins(:order).where(spree_orders: { state: Spree::Order::LINE_ITEM_REMOVABLE_STATES }).find_each do |line_item|
+ # Removable = still mutable: any cart-owned line, or a line on an
+ # uncompleted, uncanceled order (drafts).
+ variant.line_items.where.not(cart_id: nil).find_each do |line_item|
+ Spree::Variants::RemoveLineItemJob.perform_later(line_item: line_item)
+ end
+ variant.line_items.joins(:order).merge(Spree::Order.incomplete.not_canceled).find_each do |line_item|
Spree::Variants::RemoveLineItemJob.perform_later(line_item: line_item)
end
diff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.yml
index 66013e17db..5f1532eaf4 100644
--- a/spree/core/config/locales/en.yml
+++ b/spree/core/config/locales/en.yml
@@ -919,6 +919,7 @@ en:
messages:
cannot_delete_channel_with_active_api_keys: Channel cannot be deleted while active API keys are bound to it. Revoke those keys first.
cannot_delete_default_channel: Default channel cannot be deleted. Promote another channel to default first.
+ cart_currency_mismatch: carts in different currencies cannot be merged
channel_store_mismatch: must belong to the same store
delivery_zone_postal_definition_required: postal code member requires a prefix or a from/to range
delivery_zone_prefix_and_range_exclusive: cannot be combined with a from/to range
diff --git a/spree/core/db/migrate/20260729100001_add_checkout_columns_to_spree_carts.rb b/spree/core/db/migrate/20260729100001_add_checkout_columns_to_spree_carts.rb
new file mode 100644
index 0000000000..d2b721bf39
--- /dev/null
+++ b/spree/core/db/migrate/20260729100001_add_checkout_columns_to_spree_carts.rb
@@ -0,0 +1,31 @@
+class AddCheckoutColumnsToSpreeCarts < ActiveRecord::Migration[7.2]
+ def change
+ change_table :spree_carts do |t|
+ t.decimal :item_total, precision: 10, scale: 2
+ t.decimal :adjustment_total, precision: 10, scale: 2
+ t.decimal :included_tax_total, precision: 10, scale: 2
+ t.decimal :additional_tax_total, precision: 10, scale: 2
+ t.decimal :taxable_adjustment_total, precision: 10, scale: 2
+ t.decimal :non_taxable_adjustment_total, precision: 10, scale: 2
+ t.decimal :promo_total, precision: 10, scale: 2
+ t.decimal :fee_total, precision: 10, scale: 2
+ t.decimal :delivery_total, precision: 10, scale: 2
+ t.decimal :total, precision: 10, scale: 2
+ t.decimal :payment_total, precision: 10, scale: 2
+ t.integer :item_count
+ t.string :coupon_code
+ end
+
+ # Owner pattern: promotion connections and payment sessions are created
+ # during checkout (cart-owned), copied/re-pointed at completion.
+ add_reference :spree_order_promotions, :cart, null: true
+ add_reference :spree_payment_sessions, :cart, null: true
+ add_reference :spree_payments, :cart, null: true
+ add_reference :spree_stock_reservations, :cart, null: true
+ add_reference :spree_coupon_codes, :cart, null: true
+
+ # The checkout state machine is gone — checkout progression lives on the
+ # Cart (Checkout::Requirements); Order keeps only status.
+ remove_column :spree_orders, :state, :string
+ end
+end
diff --git a/spree/core/db/migrate/20260729100002_relax_owner_null_constraints.rb b/spree/core/db/migrate/20260729100002_relax_owner_null_constraints.rb
new file mode 100644
index 0000000000..264e3923a4
--- /dev/null
+++ b/spree/core/db/migrate/20260729100002_relax_owner_null_constraints.rb
@@ -0,0 +1,7 @@
+class RelaxOwnerNullConstraints < ActiveRecord::Migration[7.2]
+ # Owner XOR: order_id becomes nullable where cart_id joined the pattern.
+ def change
+ change_column_null :spree_stock_reservations, :order_id, true
+ change_column_null :spree_payment_sessions, :order_id, true
+ end
+end
diff --git a/spree/core/db/migrate/20260729100003_add_gift_card_to_spree_carts.rb b/spree/core/db/migrate/20260729100003_add_gift_card_to_spree_carts.rb
new file mode 100644
index 0000000000..775bbf9d96
--- /dev/null
+++ b/spree/core/db/migrate/20260729100003_add_gift_card_to_spree_carts.rb
@@ -0,0 +1,5 @@
+class AddGiftCardToSpreeCarts < ActiveRecord::Migration[7.2]
+ def change
+ add_reference :spree_carts, :gift_card, null: true
+ end
+end
diff --git a/spree/core/db/sample_data/orders.rb b/spree/core/db/sample_data/orders.rb
index 348c78a272..ab1914515e 100644
--- a/spree/core/db/sample_data/orders.rb
+++ b/spree/core/db/sample_data/orders.rb
@@ -78,21 +78,25 @@ end
orders.each(&:create_proposed_shipments)
-Spree::Order.where(id: orders.map(&:id)).update_all(state: :complete, status: 'placed', completed_at: Time.current - 1.day)
+Spree::Order.where(id: orders.map(&:id)).update_all(status: 'placed', completed_at: Time.current - 1.day)
-# Adjustments (tax)
+# Tax lines (zero-amount sample rows against the California rate)
tax_rate = Spree::TaxRate.find_by(name: 'California')
if tax_rate
orders.each do |order|
- order.all_adjustments.where(
- adjustable: order,
- source: tax_rate,
- label: 'Tax',
- state: 'open',
- mandatory: true
- ).first_or_create! do |adj|
- adj.amount = 0
+ line_item = order.line_items.first
+ next if line_item.nil?
+
+ order.tax_lines.where(
+ line_item: line_item,
+ tax_rate: tax_rate,
+ label: 'Tax'
+ ).first_or_create! do |tax_line|
+ tax_line.amount = 0
+ tax_line.rate = tax_rate.amount
+ tax_line.included = tax_rate.included_in_price
+ tax_line.provider_id = 'internal'
end
end
end
diff --git a/spree/core/lib/spree/core/configuration.rb b/spree/core/lib/spree/core/configuration.rb
index 0c1a84c1ba..833c2d8e54 100644
--- a/spree/core/lib/spree/core/configuration.rb
+++ b/spree/core/lib/spree/core/configuration.rb
@@ -94,6 +94,10 @@ module Spree
preference :reserve_stock_on, :string, default: 'checkout' # 'checkout' (default) or 'cart' — landing in 6.0 alongside Cart/Order split
preference :stock_reservations_enabled, :boolean, default: true # Hold stock during checkout to prevent overselling
preference :default_stock_reservation_ttl_minutes, :integer, default: 10 # Fallback TTL when a Store doesn't override
+ # Tiered cart-expiry reaper (docs/plans/6.0-cart-order-split.md Decision 5)
+ preference :guest_cart_expiry_days, :integer, default: 30
+ preference :customer_cart_expiry_days, :integer, default: 90
+ preference :empty_cart_expiry_hours, :integer, default: 48
preference :send_core_emails, :boolean, default: true, deprecated: true # Default mail headers settings
preference :shipping_instructions, :boolean, deprecated: true
preference :show_only_complete_orders_by_default, :boolean, deprecated: true
diff --git a/spree/core/lib/spree/core/controller_helpers/order.rb b/spree/core/lib/spree/core/controller_helpers/order.rb
index 3a5a58e9c2..939fc1b336 100644
--- a/spree/core/lib/spree/core/controller_helpers/order.rb
+++ b/spree/core/lib/spree/core/controller_helpers/order.rb
@@ -14,7 +14,9 @@ module Spree
@order_token ||= cookies.signed[:token] || params[:order_token]
end
- # The current incomplete order from the token for use in cart and during checkout
+ # The current incomplete cart from the token — the checkout owner
+ # since the cart/order split. The name stays for compatibility;
+ # Wave 6 renames the storefront surface to current_cart.
def current_order(options = {})
options[:create_order_if_necessary] ||= false
options[:includes] ||= false
@@ -27,14 +29,18 @@ module Spree
@current_order = find_order_by_token_or_user(options, false)
if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
- @current_order = current_store.orders.create!(current_order_params.except(:token))
- @current_order.associate_user! try_spree_current_user if try_spree_current_user
- @current_order.last_ip_address = ip_address
+ result = Spree::Carts::Create.call(params: {
+ store: current_store,
+ currency: current_currency,
+ user: try_spree_current_user
+ })
+ @current_order = result.value
+ @current_order.update_columns(last_ip_address: ip_address)
create_token_cookie(@current_order.token)
end
- # There is some edge case where the order doesn't have a token.
+ # There is some edge case where the cart doesn't have a token.
# but can't reproduce it. So let's generate one on the fly in that case.
@current_order.regenerate_token if @current_order && @current_order.token.blank?
@@ -42,6 +48,7 @@ module Spree
@current_order
end
+ alias current_cart current_order
def associate_user
@order ||= current_order
@@ -82,9 +89,8 @@ module Spree
private
def user_orders_scope
- try_spree_current_user.orders.
+ Spree::Cart.where(customer_id: try_spree_current_user.id).
incomplete.
- not_canceled.
where.not(id: current_order.id).
where(store_id: current_store.id)
end
@@ -132,20 +138,28 @@ module Spree
includes = options[:includes] ? order_includes : {}
- # Find any incomplete orders for the token
- incomplete_orders = current_store.orders.incomplete.not_canceled.includes(includes)
+ # Find any incomplete carts for the token
+ incomplete_carts = current_store.carts.incomplete.includes(includes)
token_order_params = current_order_params.except(:user_id)
- order = if with_adjustments
- incomplete_orders.includes(:discounts, :fees).lock(options[:lock]).find_by(token_order_params)
- else
- incomplete_orders.lock(options[:lock]).find_by(token_order_params)
- end
+ cart = if with_adjustments
+ incomplete_carts.includes(:discounts, :fees).lock(options[:lock]).find_by(token_order_params)
+ else
+ incomplete_carts.lock(options[:lock]).find_by(token_order_params)
+ end
+
+ # Find any incomplete carts for the current user
+ cart = last_incomplete_cart(includes) if cart.nil? && try_spree_current_user
- # Find any incomplete orders for the current user
- order = last_incomplete_order(includes) if order.nil? && try_spree_current_user
+ cart
+ end
- order
+ def last_incomplete_cart(includes = {})
+ @last_incomplete_cart ||= Spree::Cart.where(customer_id: try_spree_current_user.id, store_id: current_store.id).
+ incomplete.
+ order(created_at: :desc).
+ includes(includes).
+ first
end
def order_includes
diff --git a/spree/core/lib/spree/core/dependencies.rb b/spree/core/lib/spree/core/dependencies.rb
index e2bcfa5117..503d319d66 100644
--- a/spree/core/lib/spree/core/dependencies.rb
+++ b/spree/core/lib/spree/core/dependencies.rb
@@ -24,6 +24,11 @@ module Spree
# carts
carts_complete_service: 'Spree::Carts::Complete',
+ carts_create_service: 'Spree::Carts::Create',
+ carts_update_service: 'Spree::Carts::Update',
+ carts_upsert_items_service: 'Spree::Carts::UpsertItems',
+ carts_validate_service: 'Spree::Carts::Validate',
+ cart_merge_strategy: 'Spree::Carts::Merge',
# checkout
checkout_next_service: 'Spree::Checkout::Next',
diff --git a/spree/core/lib/spree/testing_support/factories/cart_factory.rb b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
index d70c82bb72..2788b11a06 100644
--- a/spree/core/lib/spree/testing_support/factories/cart_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
@@ -2,5 +2,18 @@ FactoryBot.define do
factory :cart, class: Spree::Cart do
store { Spree::Store.find_by(default: true) || association(:store) }
currency { 'USD' }
+
+ factory :cart_with_line_items do
+ transient do
+ line_items_count { 1 }
+ line_items_price { BigDecimal(10) }
+ end
+
+ after(:create) do |cart, evaluator|
+ create_list(:line_item, evaluator.line_items_count, cart: cart, order: nil, price: evaluator.line_items_price)
+ cart.line_items.reload
+ cart.update_with_updater!
+ end
+ end
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/line_item_factory.rb b/spree/core/lib/spree/testing_support/factories/line_item_factory.rb
index 9a71001b68..4b349e212c 100644
--- a/spree/core/lib/spree/testing_support/factories/line_item_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/line_item_factory.rb
@@ -1,12 +1,13 @@
FactoryBot.define do
factory :line_item, class: Spree::LineItem do
- order
- quantity { 1 }
- price { BigDecimal('10.00') }
- currency { order.currency }
transient do
product { nil }
end
+
+ order { cart.present? ? nil : create(:order) }
+ quantity { 1 }
+ price { BigDecimal('10.00') }
+ currency { (order || cart)&.currency }
variant do
resolved_product = product || create(:product)
resolved_product.default_variant
diff --git a/spree/core/lib/spree/testing_support/factories/order_factory.rb b/spree/core/lib/spree/testing_support/factories/order_factory.rb
index 9ef17950d1..640a7b69ea 100644
--- a/spree/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/order_factory.rb
@@ -10,6 +10,18 @@ FactoryBot.define do
transient do
line_items_price { BigDecimal(10) }
attach_to_default_store { true }
+ # Legacy machine vocabulary shim — the state column is gone. 'complete'
+ # marks the order completed; every other value is ignored (mid-checkout
+ # entities are carts since 6.0).
+ state { nil }
+ end
+
+ after(:create) do |order, evaluator|
+ if evaluator.state.to_s == 'complete' && order.completed_at.blank?
+ order.update_columns(completed_at: Time.current, status: 'placed')
+ elsif evaluator.state.to_s == 'canceled'
+ order.update_columns(status: 'canceled', canceled_at: order.canceled_at || Time.current)
+ end
end
before(:create) do |order|
@@ -73,12 +85,10 @@ FactoryBot.define do
end
factory :completed_order_with_totals do
- state { 'complete' }
-
after(:create) do |order, evaluator|
# Set completed_at before refreshing shipment rates so order.completed? returns true
# This prevents the shipping rate selection from recalculating order totals
- order.update_column(:completed_at, order.completed_at || Time.current)
+ order.update_columns(completed_at: order.completed_at || Time.current, status: 'placed')
order.refresh_shipment_rates(evaluator.shipping_method_filter)
end
@@ -110,7 +120,7 @@ FactoryBot.define do
order.fulfillments.each do |shipment|
shipment.fulfillment_items.update_all state: 'on_hand'
- shipment.update_column('state', 'ready')
+ shipment.update_column(:status, 'ready')
end
order.reload
end
diff --git a/spree/core/lib/spree/testing_support/factories/payment_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
index d376e70ab4..b4c5aacc1a 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
@@ -1,11 +1,11 @@
FactoryBot.define do
factory :payment, class: Spree::Payment do
- order { create(:order, total: amount) }
+ order { cart.present? ? nil : create(:order, total: amount) }
amount { 45.75 }
state { 'checkout' }
response_code { "BGS-#{SecureRandom.hex(6)}" }
- payment_method { create(:credit_card_payment_method, store: order.store) }
+ payment_method { create(:credit_card_payment_method, store: (order || cart).store) }
association(:source, factory: :credit_card)
factory :payment_with_refund do
diff --git a/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
index 2efcae8f74..2bd485862a 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
@@ -1,9 +1,13 @@
FactoryBot.define do
factory :payment_session, class: 'Spree::PaymentSession' do
- order
- payment_method { create(:credit_card_payment_method, store: order.store) }
- amount { order.total }
- currency { order.currency }
+ transient do
+ owner { order || cart }
+ end
+
+ order { cart.present? ? nil : create(:order) }
+ payment_method { create(:credit_card_payment_method, store: (order || cart).store) }
+ amount { (order || cart).total }
+ currency { (order || cart).currency }
status { 'pending' }
external_id { "ps_test_#{SecureRandom.hex(12)}" }
external_data { {} }
@@ -39,7 +43,7 @@ FactoryBot.define do
factory :bogus_payment_session, class: 'Spree::PaymentSessions::Bogus' do
type { 'Spree::PaymentSessions::Bogus' }
- payment_method { create(:bogus_payment_method, store: order.store) }
+ payment_method { create(:bogus_payment_method, store: (order || cart).store) }
external_id { "bogus_#{SecureRandom.hex(12)}" }
external_data { { 'client_secret' => "bogus_secret_#{SecureRandom.hex(8)}" } }
end
diff --git a/spree/core/lib/spree/testing_support/factories/stock_reservation_factory.rb b/spree/core/lib/spree/testing_support/factories/stock_reservation_factory.rb
index 21474a6f96..2d76c75f0c 100644
--- a/spree/core/lib/spree/testing_support/factories/stock_reservation_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/stock_reservation_factory.rb
@@ -12,12 +12,15 @@ FactoryBot.define do
# same variant. Callers can override stock_item:/line_item:/order: to wire
# up a specific scenario.
after(:build) do |reservation, evaluator|
- reservation.order ||= evaluator.order || create(:order_with_line_items, line_items_count: 1)
+ if reservation.owner.nil?
+ reservation.order = evaluator.order || create(:order_with_line_items, line_items_count: 1)
+ end
+ owner = reservation.owner
if reservation.line_item.nil?
- reservation.line_item = reservation.order.line_items.first ||
- create(:line_item, order: reservation.order)
- reservation.order.line_items.reload
+ reservation.line_item = owner.line_items.first ||
+ create(:line_item, order: owner.is_a?(Spree::Order) ? owner : nil, cart: owner.is_a?(Spree::Cart) ? owner : nil)
+ owner.line_items.reload
end
reservation.stock_item ||= reservation.line_item.variant.stock_items.first ||
diff --git a/spree/core/lib/spree/testing_support/order_walkthrough.rb b/spree/core/lib/spree/testing_support/order_walkthrough.rb
index 89238420ac..59038819be 100644
--- a/spree/core/lib/spree/testing_support/order_walkthrough.rb
+++ b/spree/core/lib/spree/testing_support/order_walkthrough.rb
@@ -1,8 +1,12 @@
+# Cart-first checkout walkthrough. `up_to(step)` returns a Spree::Cart with
+# every step BEFORE the given one satisfied (matching the legacy contract
+# where `up_to(:delivery)` had completed the address step). `up_to(:complete)`
+# runs the real completion pipeline and returns the resulting Spree::Order.
class OrderWalkthrough
def self.up_to(state, store = nil)
store ||= Spree::Store.default
- # A payment method must exist for an order to proceed through the Address state
+ # A payment method must exist for checkout to proceed
unless Spree::PaymentMethod.exists?
FactoryBot.create(:check_payment_method)
end
@@ -13,57 +17,60 @@ class OrderWalkthrough
zone.members << Spree::ZoneMember.create(zoneable: country)
country.states << FactoryBot.create(:state, country: country)
- # A shipping method must exist for rates to be displayed on checkout page
- unless Spree::ShippingMethod.exists?
- FactoryBot.create(:shipping_method).tap do |sm|
- sm.calculator.preferred_amount = 10
- sm.calculator.preferred_currency = store.default_currency
- sm.calculator.save
+ # A delivery method must exist for rates to be displayed on checkout page
+ unless Spree::DeliveryMethod.exists?
+ FactoryBot.create(:shipping_method).tap do |delivery_method|
+ delivery_method.calculator.preferred_amount = 10
+ delivery_method.calculator.preferred_currency = store.default_currency
+ delivery_method.calculator.save
end
end
- order = store.orders.create!(email: '[email protected]')
- add_line_item!(order)
- order.next!
+ cart = store.carts.create!(currency: store.default_currency, email: '[email protected]')
+ add_line_item!(cart)
end_state_position = states.index(state.to_sym)
- states[0...end_state_position].each do |state|
- send(state, order)
+ states[0...end_state_position].each do |step|
+ send(step, cart)
end
- order
- end
+ return complete_cart!(cart) if state.to_sym == :complete
- private
+ cart.update_with_updater!
+ cart
+ end
- def self.add_line_item!(order)
- FactoryBot.create(:line_item, order: order)
- order.reload
+ def self.add_line_item!(cart)
+ FactoryBot.create(:line_item, cart: cart, order: nil)
+ cart.reload
end
- def self.address(order)
- order.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
- order.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
- order.next!
+ def self.address(cart)
+ cart.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+ cart.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+ cart.save!
+ cart.rebuild_fulfillments!
+ cart.set_fulfillments_cost
end
- def self.delivery(order)
- order.next!
+ def self.delivery(cart)
+ # Rates were proposed with the address; keep the selected defaults.
+ cart.update_with_updater!
end
- def self.payment(order)
+ def self.payment(cart)
FactoryBot.create :payment,
- order: order,
+ cart: cart,
+ order: nil,
payment_method: Spree::PaymentMethod.first,
- amount: order.total
-
- # TODO: maybe look at some way of making this payment_state change automatic
- order.payment_state = 'paid'
- order.next!
+ amount: cart.reload.total
end
- def self.complete(_order)
- # noop?
+ def self.complete_cart!(cart)
+ result = Spree::Carts::Complete.call(cart: cart)
+ raise "OrderWalkthrough completion failed: #{result.error&.value.inspect}" if result.failure?
+
+ result.value
end
def self.states
diff --git a/spree/core/spec/jobs/spree/payments/handle_webhook_job_spec.rb b/spree/core/spec/jobs/spree/payments/handle_webhook_job_spec.rb
index 6cf1c47cda..96a7f52a1e 100644
--- a/spree/core/spec/jobs/spree/payments/handle_webhook_job_spec.rb
+++ b/spree/core/spec/jobs/spree/payments/handle_webhook_job_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Spree::Payments::HandleWebhookJob, type: :job do
let(:payment_session) { create(:bogus_payment_session, order: order, payment_method: payment_method, amount: order.total) }
before do
- order.update_column(:state, 'payment')
order.shipments.each { |s| s.update_column(:state, 'ready') }
end
diff --git a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
index fb4d8fd94d..6dd1b03d9c 100644
--- a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
+++ b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
@@ -34,10 +34,10 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context 'create_order_if_necessary option is false' do
- let!(:order) { create :order, user: user, store: store }
+ let!(:cart) { create :cart, customer: user, store: store }
- it 'returns current order' do
- expect(controller.current_order).to eq order
+ it 'returns the current cart' do
+ expect(controller.current_order).to eq cart
end
end
@@ -45,7 +45,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
it 'creates new order' do
expect do
controller.current_order(create_order_if_necessary: true)
- end.to change(Spree::Order, :count).to(1)
+ end.to change(Spree::Cart, :count).to(1)
end
end
@@ -140,18 +140,20 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
describe '#set_current_order' do
+ let(:current_cart) { create(:cart, customer: user, store: store) }
+
before { allow(controller).to receive_messages(try_spree_current_user: user) }
context 'user has some incomplete orders other than current one' do
before do
- allow(controller).to receive_messages(current_order: order, last_incomplete_order: incomplete_order, cookies: double(signed: { token: 'token' }))
+ allow(controller).to receive_messages(current_order: current_cart, last_incomplete_order: incomplete_order, cookies: double(signed: { token: 'token' }))
end
context 'within the same store' do
- let!(:incomplete_order) { create(:order, user: user, store: order.store) }
+ let!(:incomplete_order) { create(:cart, customer: user, store: current_cart.store) }
- it 'calls Spree::Order#merge!' do
- expect(order).to receive(:merge!).with(incomplete_order, user)
+ it 'merges the other cart' do
+ expect(current_cart).to receive(:merge!).with(incomplete_order, user)
controller.set_current_order
end
end
diff --git a/spree/core/spec/models/spree/address_spec.rb b/spree/core/spec/models/spree/address_spec.rb
index e5f0f4d38b..b8855f28ab 100644
--- a/spree/core/spec/models/spree/address_spec.rb
+++ b/spree/core/spec/models/spree/address_spec.rb
@@ -575,7 +575,7 @@ describe Spree::Address, type: :model do
incomplete_order.reload
expect(incomplete_order.bill_address_id).to be_nil
expect(incomplete_order.ship_address_id).to be_nil
- expect(incomplete_order.state).to eq('address')
+ expect(incomplete_order.reload.completed_at).to be_nil
end
it 'still hard-deletes the address' do
@@ -590,7 +590,7 @@ describe Spree::Address, type: :model do
expect(other_order.reload.ship_address_id).to eq(address.id)
expect(other_order.bill_address_id).to eq(address.id)
- expect(other_order.state).to eq('delivery')
+ expect(other_order.reload.ship_address_id).to eq(address.id)
end
context 'when the address is also used by a completed order' do
diff --git a/spree/core/spec/models/spree/inventory_unit_spec.rb b/spree/core/spec/models/spree/inventory_unit_spec.rb
index 1cce4f1146..ae3c8b9e0e 100644
--- a/spree/core/spec/models/spree/inventory_unit_spec.rb
+++ b/spree/core/spec/models/spree/inventory_unit_spec.rb
@@ -98,7 +98,7 @@ describe Spree::InventoryUnit, type: :model do
context 'other shipments' do
let(:other_order) do
order = create(:order)
- order.state = 'payment'
+ order.completed_at = nil
order.completed_at = nil
order.tap(&:save!)
end
diff --git a/spree/core/spec/models/spree/order/adjustments_spec.rb b/spree/core/spec/models/spree/order/adjustments_spec.rb
index f86522acbb..d131eac1ed 100644
--- a/spree/core/spec/models/spree/order/adjustments_spec.rb
+++ b/spree/core/spec/models/spree/order/adjustments_spec.rb
@@ -12,19 +12,16 @@ describe Spree::Order do
end
before do
- # Don't care about available payment methods in this test
- allow(persisted_order).to receive_messages(has_available_payment: false)
persisted_order.line_items << line_item
+ persisted_order.update!(ship_address: create(:address))
+ persisted_order.create_proposed_shipments
+ persisted_order.set_shipments_cost
create(:discount, order: persisted_order, line_item: line_item, amount: -line_item.amount, label: 'Promotion', kind: 'manual')
persisted_order.update_with_updater!
- persisted_order.state = 'delivery'
- persisted_order.save # To ensure new state_change event
end
- it 'transitions from delivery to payment' do
- allow(persisted_order).to receive_messages(payment_required?: true)
- persisted_order.next!
- expect(persisted_order.state).to eq('payment')
+ it 'still requires payment (shipping keeps the total above zero)' do
+ expect(persisted_order.reload.payment_required?).to be(true)
end
end
diff --git a/spree/core/spec/models/spree/order/callbacks_spec.rb b/spree/core/spec/models/spree/order/callbacks_spec.rb
index dbd57b8731..3fbdd6f566 100644
--- a/spree/core/spec/models/spree/order/callbacks_spec.rb
+++ b/spree/core/spec/models/spree/order/callbacks_spec.rb
@@ -3,15 +3,10 @@ require 'spec_helper'
describe Spree::Order, type: :model do
let(:order) { build(:order) }
- before do
- Spree::Order.define_state_machine!
- end
-
context 'validations' do
context 'email validation' do
# Regression test for #1238
it "o'[email protected] is a valid email address" do
- order.state = 'address'
order.email = "o'[email protected]"
order.valid?
expect(order.errors).to be_empty
@@ -34,9 +29,8 @@ describe Spree::Order, type: :model do
end
end
- context 'in the cart state' do
+ context 'as a draft' do
it 'does not validate email address' do
- order.state = 'cart'
order.email = nil
order.valid?
expect(order.errors).to be_empty
diff --git a/spree/core/spec/models/spree/order/checkout_spec.rb b/spree/core/spec/models/spree/order/checkout_spec.rb
index 96f1769b05..cc8c5d0bfe 100644
--- a/spree/core/spec/models/spree/order/checkout_spec.rb
+++ b/spree/core/spec/models/spree/order/checkout_spec.rb
@@ -1,5 +1,4 @@
require 'spec_helper'
-require 'spree/testing_support/order_walkthrough'
describe Spree::Order, type: :model do
let!(:store) { @default_store }
@@ -8,830 +7,173 @@ describe Spree::Order, type: :model do
let(:accept_marketing) { false }
let!(:state) { country.states.first || create(:state, country: country, name: 'New York', abbr: 'NY') }
- def assert_state_changed(order, from, to)
- state_change_exists = order.state_changes.where(previous_state: from, next_state: to).exists?
- assert state_change_exists, "Expected order to transition from #{from} to #{to}, but didn't."
- end
-
- context 'with default state machine' do
- let(:transitions) do
- [
- { address: :delivery },
- { delivery: :payment },
- { delivery: :confirm },
- { payment: :confirm },
- { confirm: :complete },
- { payment: :complete },
- { delivery: :complete }
- ]
- end
-
- it 'has the following transitions' do
- transitions.each do |transition|
- transition = Spree::Order.find_transition(from: transition.keys.first, to: transition.values.first)
- expect(transition).not_to be_nil
- end
- end
-
- # Regression test for #11900 — the delivery → confirm transition must
- # exist so that orders skipping payment (e.g. $0 orders) still reach the
- # confirm step when confirmation_required? is true. The transition is
- # gated at runtime by the :if option on the :confirm go_to_state.
- it 'has a transition from delivery to confirm' do
- transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
- expect(transition).not_to be_nil
- end
-
- it '.find_transition when contract was broken' do
- expect(Spree::Order.find_transition(foo: :bar, baz: :dog)).to be_falsey
- end
-
- it '.remove_transition' do
- options = { from: transitions.first.keys.first, to: transitions.first.values.first }
- expect(Spree::Order).to receive_messages(
- removed_transitions: [],
- next_event_transitions: transitions.dup
- )
- expect(Spree::Order.remove_transition(options)).to be_truthy
- expect(Spree::Order.removed_transitions).to eql([options])
- expect(Spree::Order.next_event_transitions).not_to include(transitions.first)
- end
-
- it '.remove_transition when contract was broken' do
- expect(Spree::Order.remove_transition(nil)).to be_falsey
- end
-
- it 'always return integer on checkout_step_index' do
- expect(order.checkout_step_index('imnotthere')).to be_a Integer
- expect(order.checkout_step_index('delivery')).to be > 0
- end
-
- it 'passes delivery state when transitioning from address over delivery to payment' do
- allow(order).to receive_messages payment_required?: true
- order.state = 'address'
- expect(order.passed_checkout_step?('delivery')).to be false
- order.state = 'delivery'
- expect(order.passed_checkout_step?('delivery')).to be false
- order.state = 'payment'
- expect(order.passed_checkout_step?('delivery')).to be true
- end
-
- describe '#checkout_steps' do
- context 'when confirmation not required' do
- before do
- allow(order).to receive_messages confirmation_required?: false
- allow(order).to receive_messages payment_required?: true
- end
-
- specify do
- expect(order.checkout_steps).to eq(%w(address delivery payment complete))
- end
- end
-
- context 'when confirmation required' do
- before do
- allow(order).to receive_messages confirmation_required?: true
- allow(order).to receive_messages payment_required?: true
- end
-
- specify do
- expect(order.checkout_steps).to eq(%w(address delivery payment confirm complete))
- end
- end
-
- context 'when delivery not required' do
- before { allow(order).to receive_messages delivery_required?: false }
-
- specify do
- expect(order.checkout_steps).to eq(%w(address complete))
- end
- end
-
- context 'when payment not required' do
- before { allow(order).to receive_messages payment_required?: false }
-
- specify do
- expect(order.checkout_steps).to eq(%w(address delivery complete))
- end
- end
-
- context 'when payment required' do
- before { allow(order).to receive_messages payment_required?: true }
-
- specify do
- expect(order.checkout_steps).to eq(%w(address delivery payment complete))
- end
- end
- end
-
- it 'starts out at cart' do
- expect(order.state).to eq('cart')
- end
-
- context 'to address' do
+ describe '#checkout_steps' do
+ context 'when confirmation not required' do
before do
- order.email = '[email protected]'
- order.save!
+ allow(order).to receive_messages confirmation_required?: false
+ allow(order).to receive_messages payment_required?: true
end
- context 'with a line item' do
- before do
- order.line_items << FactoryBot.create(:line_item)
- end
-
- it 'transitions to address' do
- order.next!
- assert_state_changed(order, 'cart', 'address')
- expect(order.state).to eq('address')
- end
-
- it "doesn't raise an error if the default address is invalid" do
- order.user = build(:user, ship_address: build(:address), bill_address: build(:address))
-
- expect { order.next! }.not_to raise_error
- end
-
- context 'with default addresses' do
- let(:default_address) { create(:address, state: state) }
-
- before do
- order.update("#{address_kind}_address_id": nil)
- order.update(user: create(:user, "#{address_kind}_address" => default_address))
- order.next!
- order.reload
- end
-
- shared_examples 'it cloned the default address' do
- it do
- default_attributes = default_address.attributes
- order_attributes = order.send("#{address_kind}_address".to_sym).try(:attributes) || {}
- expect(order_attributes.except('id', 'created_at', 'updated_at')).to eql(default_attributes.except('id', 'created_at', 'updated_at'))
- end
- end
-
- it_behaves_like 'it cloned the default address' do
- let(:address_kind) { 'ship' }
- end
-
- it_behaves_like 'it cloned the default address' do
- let(:address_kind) { 'bill' }
- end
- end
- end
-
- it 'cannot transition to address without any line items' do
- expect(order.line_items).to be_blank
- expect { order.next! }.to raise_error(StateMachines::InvalidTransition, /#{Spree.t(:there_are_no_items_for_this_order)}/)
+ specify do
+ expect(order.checkout_steps).to eq(%w(address delivery payment complete))
end
end
- context 'from address' do
+ context 'when confirmation required' do
before do
- order.state = 'address'
- allow(order).to receive(:has_available_payment)
- create(:shipment, order: order)
- order.email = '[email protected]'
- order.save!
- end
-
- it 'updates totals' do
- allow(order).to receive_messages(ensure_available_shipping_rates: true)
- line_item = FactoryBot.create(:line_item, price: 10, adjustment_total: 10)
- line_item.variant.update!(price: 10)
- order.line_items << line_item
- tax_rate = create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05)
- allow(Spree::TaxRate).to receive_messages match: [tax_rate]
- order.email = '[email protected]'
- order.next!
- expect(order.adjustment_total).to eq(0.5)
- expect(order.additional_tax_total).to eq(0.5)
- expect(order.included_tax_total).to eq(0)
- expect(order.total).to eq(10.5)
- end
-
- it 'updates prices' do
- allow(order).to receive_messages(ensure_available_shipping_rates: true)
- line_item = FactoryBot.create(:line_item, price: 10, adjustment_total: 10)
- line_item.variant.update!(price: 20)
- order.line_items << line_item
- tax_rate = create :tax_rate,
- included_in_price: true,
- tax_category: line_item.tax_category,
- amount: 0.05
- allow(Spree::TaxRate).to receive_messages(match: [tax_rate])
- order.email = '[email protected]'
- order.next!
- expect(order.adjustment_total).to eq(0)
- expect(order.additional_tax_total).to eq(0)
- expect(order.included_tax_total).to eq(0.95)
- expect(order.total).to eq(20)
- end
-
- it 'transitions to delivery' do
- allow(order).to receive_messages(ensure_available_shipping_rates: true)
- order.next!
- assert_state_changed(order, 'address', 'delivery')
- expect(order.state).to eq('delivery')
+ allow(order).to receive_messages confirmation_required?: true
+ allow(order).to receive_messages payment_required?: true
end
- context 'cannot transition to delivery' do
- context 'with an existing shipment' do
- let!(:line_item) { create(:line_item, price: 10, order: order) }
-
- context 'if there are no shipping rates for any shipment' do
- it 'raises an InvalidTransitionError' do
- expect { order.next! }.to raise_error(StateMachines::InvalidTransition, /#{Spree.t(:products_cannot_be_shipped, product_names: line_item.name)}/)
- end
-
- it 'deletes all the shipments' do
- order.next
- expect(order.shipments).to be_empty
- end
- end
- end
+ specify do
+ expect(order.checkout_steps).to eq(%w(address delivery payment confirm complete))
end
end
- context 'to delivery' do
- context 'when order has default selected_shipping_rate_id' do
- let(:shipment) { create(:shipment, order: order) }
- let(:shipping_method) { create(:shipping_method) }
- let(:shipping_rate) do
- [
- Spree::ShippingRate.create!(shipping_method: shipping_method, cost: 10.00, shipment: shipment)
- ]
- end
-
- before do
- order.state = 'address'
- shipment.selected_shipping_rate_id = shipping_rate.first.id
- order.email = '[email protected]'
- order.save!
-
- allow(order).to receive(:has_available_payment)
- allow(order).to receive(:create_proposed_shipments)
- allow(order).to receive(:ensure_available_shipping_rates).and_return(true)
- end
-
- it 'invokes set_shipment_cost' do
- expect(order).to receive(:set_shipments_cost)
- order.next!
- end
+ context 'when delivery not required' do
+ before { allow(order).to receive_messages delivery_required?: false }
- it 'updates shipment_total' do
- expect { order.next! }.to change(order, :shipment_total).by(10.00)
- end
+ specify do
+ expect(order.checkout_steps).to eq(%w(address complete))
end
end
- context 'from delivery' do
- before do
- order.state = 'delivery'
- allow(order).to receive(:apply_free_shipping_promotions)
- end
-
- it 'attempts to apply free shipping promotions' do
- expect(order).to receive(:apply_free_shipping_promotions)
- order.next!
- end
-
- context 'with payment required' do
- before do
- allow(order).to receive_messages payment_required?: true
- end
-
- it 'transitions to payment' do
- expect(order).to receive(:set_shipments_cost)
- order.next!
- assert_state_changed(order, 'delivery', 'payment')
- expect(order.state).to eq('payment')
- end
- end
-
- context 'without payment required' do
- before do
- allow(order).to receive_messages payment_required?: false
- end
-
- it 'transitions to complete' do
- order.next!
- expect(order.state).to eq('complete')
- end
- end
-
- # Regression test for #11900 — a $0 order (payment not required) that
- # still requires confirmation must transition delivery → confirm, not
- # delivery → complete.
- context 'without payment required but with confirmation required' do
- before do
- allow(order).to receive_messages payment_required?: false
- allow(order).to receive_messages confirmation_required?: true
- end
-
- it 'transitions to confirm' do
- order.next!
- assert_state_changed(order, 'delivery', 'confirm')
- expect(order.state).to eq('confirm')
- end
- end
-
- context 'correctly determining payment required based on shipping information' do
- let(:shipment) do
- FactoryBot.create(:shipment)
- end
-
- before do
- # Needs to be set here because we're working with a persisted order object
- order.email = '[email protected]'
- order.save!
- order.shipments << shipment
- end
-
- context 'with a shipment that has a price' do
- before do
- shipment.shipping_rates.first.update_column(:cost, 10)
- order.set_shipments_cost
- end
-
- it 'transitions to payment' do
- order.next!
- expect(order.state).to eq('payment')
- end
- end
+ context 'when payment not required' do
+ before { allow(order).to receive_messages payment_required?: false }
- context 'with a shipment that is free' do
- before do
- shipment.shipping_rates.first.update_column(:cost, 0)
- order.set_shipments_cost
- end
-
- it 'skips payment, transitions to complete' do
- order.next!
- expect(order.state).to eq('complete')
- end
- end
+ specify do
+ expect(order.checkout_steps).to eq(%w(address delivery complete))
end
end
- context 'from payment' do
- before do
- order.state = 'payment'
- end
-
- context 'with confirmation required' do
- before do
- allow(order).to receive_messages confirmation_required?: true
- end
-
- it 'transitions to confirm' do
- order.next!
- assert_state_changed(order, 'payment', 'confirm')
- expect(order.state).to eq('confirm')
- end
- end
-
- context 'without confirmation required' do
- before do
- order.email = '[email protected]'
- order.total = 100
- allow(order).to receive_messages confirmation_required?: false
- allow(order).to receive_messages payment_required?: true
- order.payments << FactoryBot.create(:payment, amount: 100, state: payment_state, order: order)
- end
-
- context 'when there is at least one valid payment' do
- let(:payment_state) { 'checkout' }
-
- context 'line_items are in stock' do
- before do
- expect(order).to receive(:process_payments!).once.and_return(true)
- end
-
- it 'transitions to complete' do
- order.next!
- assert_state_changed(order, 'payment', 'complete')
- expect(order.state).to eq('complete')
- end
- end
-
- context 'line_items are not in stock' do
- before do
- expect(order).to receive(:ensure_line_items_are_in_stock).once.and_return(false)
- end
-
- it 'does not receive process_payments!' do
- expect(order).not_to receive(:process_payments!)
- order.next
- end
-
- it 'does not transition to complete' do
- order.next
- expect(order.state).to eq('payment')
- end
- end
- end
-
- context 'when there is only an invalid payment' do
- let(:payment_state) { 'failed' }
-
- it 'raises a StateMachine::InvalidTransition' do
- expect do
- order.next!
- end.to raise_error(StateMachines::InvalidTransition, /#{Spree.t(:no_payment_found)}/)
-
- expect(order.errors[:base]).to include(Spree.t(:no_payment_found))
- end
- end
- end
-
- # Regression test for #2028
- context 'when payment is not required' do
- before do
- allow(order).to receive_messages payment_required?: false
- end
+ context 'when payment required' do
+ before { allow(order).to receive_messages payment_required?: true }
- it 'does not call process payments' do
- expect(order).not_to receive(:process_payments!)
- order.next!
- assert_state_changed(order, 'payment', 'complete')
- expect(order.state).to eq('complete')
- end
+ specify do
+ expect(order.checkout_steps).to eq(%w(address delivery payment complete))
end
end
end
- context 'to complete' do
- before do
- order.state = 'confirm'
- order.save!
- end
-
- context 'default credit card' do
- let(:digital_shipping_method) { create(:digital_shipping_method) }
- let(:digital_product) { create(:product, shipping_category: digital_shipping_method.shipping_categories.first) }
- let(:variant_digital) { create(:variant, product: digital_product) }
- let(:physical_product_with_digital_asset) { create(:product) }
- let(:variant_physical_with_digital_asset) { create(:variant, product: physical_product_with_digital_asset, digitals: [create(:digital)]) }
-
- before do
- order.user = FactoryBot.create(:user)
- order.email = '[email protected]'
- order.payments << FactoryBot.create(:payment)
- create(:digital, variant: variant_digital)
-
- # make sure we will actually capture a payment
- allow(order).to receive_messages(payment_required?: true)
- order.line_items << FactoryBot.create(:line_item, variant: variant_digital)
- order.line_items << FactoryBot.create(:line_item, variant: variant_physical_with_digital_asset)
- order.updater.update
-
- order.save!
- end
-
- describe 'newsletter subscription' do
- context 'when newsletter is accepted for the order' do
- let(:accept_marketing) { true }
-
- it 'subscribes to newsletter' do
- expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: order.user, store: order.store)
- order.next!
- end
- end
-
- context 'when newsletter is not accepted for the order' do
- let(:accept_marketing) { false }
-
- it 'does not subscribe to newsletter' do
- expect(Spree::NewsletterSubscriber).not_to receive(:subscribe)
- order.next!
- end
- end
- end
-
- it 'creates a digital_link for the digital line_item' do
- order.next!
- expect(order.state).to eq 'complete'
- expect(order.line_items.find_by(variant: variant_digital).digital_links).not_to be_empty
- end
-
- it 'creates a digital_link for the physical line_item if it has a digital asset' do
- order.next!
- expect(order.state).to eq 'complete'
- expect(order.line_items.find_by(variant: variant_physical_with_digital_asset).digital_links).not_to be_empty
- end
-
- context 'when gift card is present' do
- let(:gift_card) { create(:gift_card, amount: order.total, store: store) }
- let(:order) { create(:order_with_line_items, store: store, state: 'payment') }
-
- before do
- order.apply_gift_card(gift_card)
- end
-
- it 'redeems the gift card' do
- expect(gift_card.redeemed_at).to be_nil
- expect { order.next! }.to change { gift_card.reload.state }.from('active').to('redeemed')
- expect(gift_card.amount_used).to eq(order.total)
- expect(gift_card.amount_remaining).to eq(0)
- expect(gift_card.redeemed_at).to be_present
- end
-
- context 'when gift card has amount bigger than order total' do
- let(:gift_card) { create(:gift_card, amount: order.total + 1, store: store) }
-
- it 'partially redeems the gift card' do
- expect { order.next! }.to change { gift_card.reload.state }.from('active').to('partially_redeemed')
- expect(gift_card.amount_used).to eq(order.total)
- expect(gift_card.amount_remaining).to eq(1)
- expect(gift_card.redeemed_at).to be_nil
- end
- end
- end
-
- context 'when user is not present' do
- before do
- order.user = nil
- order.email = '[email protected]'
- order.save!
- end
-
- context 'with signup_for_an_account set to true' do
- before do
- allow(order).to receive(:signup_for_an_account?).and_return(true)
- end
-
- it 'creates a new user' do
- expect { order.next! }.to change { Spree.user_class.count }.by(1)
- expect(order.user).to be_present
- expect(order.user.email).to eq(order.email)
- end
- end
-
- context 'with signup_for_an_account set to false' do
- before do
- allow(order).to receive(:signup_for_an_account?).and_return(false)
- end
-
- it 'does not create a new user' do
- expect { order.next! }.not_to change { Spree.user_class.count }
- end
- end
- end
+ describe '#checkout_step_index' do
+ it 'always returns an integer' do
+ expect(order.checkout_step_index('imnotthere')).to be_a Integer
+ expect(order.checkout_step_index('delivery')).to be > 0
end
end
- context 'subclassed order' do
- # This causes another test above to fail, but fixing this test should make
- # the other test pass
- class SubclassedOrder < Spree::Order
- checkout_flow do
- go_to_state :payment
- go_to_state :complete
- end
- end
+ describe '#assign_default_addresses!' do
+ let(:default_address) { create(:address, state: state) }
+ let(:order) { create(:order, store: store, ship_address: nil, bill_address: nil, user: user) }
- skip 'should only call default transitions once when checkout_flow is redefined' do
- order = SubclassedOrder.new
- allow(order).to receive_messages payment_required?: true
- expect(order).to receive(:process_payments!).once
- order.state = 'payment'
- order.next!
- assert_state_changed(order, 'payment', 'complete')
- expect(order.state).to eq('complete')
- end
- end
+ shared_examples 'it cloned the default address' do
+ it do
+ order.assign_default_addresses!
+ order.save!
+ order.reload
- context 're-define checkout flow' do
- before do
- @old_checkout_flow = Spree::Order.checkout_flow
- Spree::Order.class_eval do
- checkout_flow do
- go_to_state :payment
- go_to_state :complete
- end
+ default_attributes = default_address.attributes
+ order_attributes = order.send("#{address_kind}_address".to_sym).try(:attributes) || {}
+ expect(order_attributes.except('id', 'created_at', 'updated_at')).to eql(default_attributes.except('id', 'created_at', 'updated_at'))
end
end
- after do
- Spree::Order.checkout_flow(&@old_checkout_flow)
+ it_behaves_like 'it cloned the default address' do
+ let(:user) { create(:user, ship_address: default_address) }
+ let(:address_kind) { 'ship' }
end
- it 'does not keep old event transitions when checkout_flow is redefined' do
- expect(Spree::Order.next_event_transitions).to eq([{ cart: :payment }, { payment: :complete }])
+ it_behaves_like 'it cloned the default address' do
+ let(:user) { create(:user, bill_address: default_address) }
+ let(:address_kind) { 'bill' }
end
- it 'does not keep old events when checkout_flow is redefined' do
- state_machine = Spree::Order.state_machine
- expect(state_machine.states.any? { |s| s.name == :address }).to be false
- known_states = state_machine.events[:next].branches.map(&:known_states).flatten
- expect(known_states).not_to include(:address)
- expect(known_states).not_to include(:delivery)
- expect(known_states).not_to include(:confirm)
- end
- end
+ it "doesn't raise an error if the default address is invalid" do
+ order = create(:order, store: store, ship_address: nil, bill_address: nil)
+ order.user = build(:user, ship_address: build(:address, city: nil), bill_address: build(:address, city: nil))
- # Regression test for #3665
- context 'with only a complete step' do
- before do
- @old_checkout_flow = Spree::Order.checkout_flow
- Spree::Order.class_eval do
- checkout_flow do
- go_to_state :complete
- end
- end
- end
-
- after do
- Spree::Order.checkout_flow(&@old_checkout_flow)
- end
-
- it 'does not attempt to process payments' do
- allow(order).to receive_message_chain(:line_items, :present?) { true }
- allow(order).to receive(:ensure_line_items_are_in_stock).and_return(true)
- allow(order).to receive(:ensure_line_item_variants_are_not_discontinued).and_return(true)
- expect(order).not_to receive(:payment_required?)
- expect(order).not_to receive(:process_payments!)
- order.next!
- assert_state_changed(order, 'cart', 'complete')
+ expect { order.assign_default_addresses! }.not_to raise_error
end
end
- context 'insert checkout step' do
- before do
- @old_checkout_flow = Spree::Order.checkout_flow
- Spree::Order.class_eval do
- insert_checkout_step :new_step, before: :address
- end
+ describe 'completion side effects' do
+ let(:order) do
+ create(:order_with_line_items, store: store, user: user, email: email, accept_marketing: accept_marketing)
end
+ let(:user) { create(:user) }
+ let(:email) { user.email }
- after do
- Spree::Order.checkout_flow(&@old_checkout_flow)
- end
+ describe 'newsletter subscription' do
+ context 'when newsletter is accepted for the order' do
+ let(:accept_marketing) { true }
- context 'before' do
- before do
- Spree::Order.class_eval do
- insert_checkout_step :before_address, before: :address
+ it 'subscribes to newsletter' do
+ expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: order.user, store: order.store)
+ order.finalize!
end
end
- specify do
- order = Spree::Order.new
- expect(order.checkout_steps).to eq(%w(new_step before_address address delivery complete))
- end
-
- it 'goes through checkout without raising error' do
- expect { OrderWalkthrough.up_to(:complete) }.not_to raise_error
- end
- end
+ context 'when newsletter is not accepted for the order' do
+ let(:accept_marketing) { false }
- context 'after' do
- before do
- Spree::Order.class_eval do
- insert_checkout_step :after_address, after: :address
+ it 'does not subscribe to newsletter' do
+ expect(Spree::NewsletterSubscriber).not_to receive(:subscribe)
+ order.finalize!
end
end
-
- specify do
- order = Spree::Order.new
- expect(order.checkout_steps).to eq(%w(new_step address after_address delivery complete))
- end
-
- it 'goes through checkout without raising error' do
- expect { OrderWalkthrough.up_to(:complete) }.not_to raise_error
- end
- end
- end
-
- context 'remove checkout step' do
- before do
- @old_checkout_flow = Spree::Order.checkout_flow
- Spree::Order.class_eval do
- remove_checkout_step :address
- end
- end
-
- after do
- Spree::Order.checkout_flow(&@old_checkout_flow)
- end
-
- specify do
- order = Spree::Order.new
- expect(order.checkout_steps).to eq(%w(delivery complete))
- end
- end
-
- describe 'update_from_params' do
- let(:permitted_params) { {} }
- let(:params) { {} }
-
- it 'calls update_attributes without order params' do
- expect(order).to receive(:update).with({})
- order.update_from_params(params, permitted_params)
end
- it 'runs the callbacks' do
- expect(order).to receive(:run_callbacks).with(:updating_from_params)
- order.update_from_params(params, permitted_params)
- end
-
- context 'passing a credit card' do
- let(:permitted_params) do
- Spree::PermittedAttributes.checkout_attributes +
- [payments_attributes: Spree::PermittedAttributes.payment_attributes]
- end
-
- let(:credit_card) { create(:credit_card, user_id: order.user_id) }
-
- let(:params) do
- ActionController::Parameters.new(
- order: { payments_attributes: [{ payment_method_id: 1 }], existing_card: credit_card.id },
- cvc_confirm: '737',
- payment_source: {
- '1' => { name: 'Luis Braga',
- number: '4111 1111 1111 1111',
- expiry: '06 / 2016',
- verification_value: '737',
- cc_type: '' }
- }
- )
- end
-
- before { order.user_id = 3 }
-
- it 'sets confirmation value when its available via :cvc_confirm' do
- allow(Spree::CreditCard).to receive_messages find: credit_card
- expect(credit_card).to receive(:verification_value=)
- order.update_from_params(params, permitted_params)
- end
-
- it 'sets existing card as source for new payment' do
- expect do
- order.update_from_params(params, permitted_params)
- end.to change { Spree::Payment.count }.by(1)
+ context 'when gift card is present' do
+ let(:gift_card) { create(:gift_card, amount: order.total, store: store) }
- expect(Spree::Payment.last.source).to eq credit_card
+ before do
+ order.update_with_updater!
+ order.apply_gift_card(gift_card)
end
- it 'sets request_env on payment' do
- request_env = { 'USER_AGENT' => 'Firefox' }
-
- order.update_from_params(params, permitted_params, request_env)
- expect(order.payments[0].request_env).to eq request_env
+ it 'redeems the gift card' do
+ expect(gift_card.redeemed_at).to be_nil
+ expect { order.finalize! }.to change { gift_card.reload.state }.from('active').to('redeemed')
+ expect(gift_card.amount_used).to eq(order.total)
+ expect(gift_card.amount_remaining).to eq(0)
+ expect(gift_card.redeemed_at).to be_present
end
- it 'dont let users mess with others users cards' do
- credit_card.update_column :user_id, 5
+ context 'when gift card has amount bigger than order total' do
+ let(:gift_card) { create(:gift_card, amount: order.total + 1, store: store) }
- expect do
- order.update_from_params(params, permitted_params)
- end.to raise_error(Spree.t(:invalid_credit_card))
+ it 'partially redeems the gift card' do
+ expect { order.finalize! }.to change { gift_card.reload.state }.from('active').to('partially_redeemed')
+ expect(gift_card.amount_used).to eq(order.total)
+ expect(gift_card.amount_remaining).to eq(1)
+ expect(gift_card.redeemed_at).to be_nil
+ end
end
end
- context 'has params' do
- let(:permitted_params) { [:good_param] }
- let(:params) { ActionController::Parameters.new(order: { bad_param: 'okay' }) }
-
- it 'does not let through unpermitted attributes' do
- expect(order).to receive(:update).with(ActionController::Parameters.new.permit!)
- order.update_from_params(params, permitted_params)
- end
-
- context 'has existing_card param' do
- let(:permitted_params) do
- Spree::PermittedAttributes.checkout_attributes +
- [payments_attributes: Spree::PermittedAttributes.payment_attributes]
- end
- let(:credit_card) { create(:credit_card, user_id: order.user_id) }
- let(:params) do
- ActionController::Parameters.new(
- order: { payments_attributes: [{ payment_method_id: 1 }], existing_card: credit_card.id }
- )
- end
+ context 'when user is not present' do
+ let(:user) { nil }
+ let(:email) { '[email protected]' }
+ context 'with signup_for_an_account set to true' do
before do
- Dummy::Application.config.action_controller.action_on_unpermitted_parameters = :raise
- order.user_id = 3
+ allow(order).to receive(:signup_for_an_account?).and_return(true)
end
- after do
- Dummy::Application.config.action_controller.action_on_unpermitted_parameters = :log
- end
-
- it 'does not attempt to permit existing_card' do
- expect do
- order.update_from_params(params, permitted_params)
- end.not_to raise_error
+ it 'creates a new user' do
+ expect { order.finalize! }.to change { Spree.user_class.count }.by(1)
+ expect(order.user).to be_present
+ expect(order.user.email).to eq(order.email)
end
end
- context 'has allowed params' do
- let(:params) { ActionController::Parameters.new(order: { good_param: 'okay' }) }
+ context 'with signup_for_an_account set to false' do
+ before do
+ allow(order).to receive(:signup_for_an_account?).and_return(false)
+ end
- it 'accepts permitted attributes' do
- expect(order).to receive(:assign_attributes).with(ActionController::Parameters.new('good_param' => 'okay').permit!)
- order.update_from_params(params, permitted_params)
+ it 'does not create a new user' do
+ expect { order.finalize! }.not_to change { Spree.user_class.count }
end
end
end
diff --git a/spree/core/spec/models/spree/order/finalizing_spec.rb b/spree/core/spec/models/spree/order/finalizing_spec.rb
index 612644464e..438e60849b 100644
--- a/spree/core/spec/models/spree/order/finalizing_spec.rb
+++ b/spree/core/spec/models/spree/order/finalizing_spec.rb
@@ -8,7 +8,7 @@ describe Spree::Order, type: :model do
let(:order) { Spree::Order.create(email: '[email protected]') }
before do
- order.update_column :state, 'complete'
+ order.update_columns(completed_at: Time.current, status: 'placed')
end
after { Spree::Config.set track_inventory_levels: true }
@@ -72,7 +72,7 @@ describe Spree::Order, type: :model do
it 'leaves order in complete state' do
order.finalize!
- expect(order.state).to eq 'complete'
+ expect(order.status).to eq 'placed'
end
end
end
diff --git a/spree/core/spec/models/spree/order/payment_spec.rb b/spree/core/spec/models/spree/order/payment_spec.rb
index 748b236b22..8fcc31e29e 100644
--- a/spree/core/spec/models/spree/order/payment_spec.rb
+++ b/spree/core/spec/models/spree/order/payment_spec.rb
@@ -268,7 +268,9 @@ module Spree
# Creates an order w/total 20
reimbursement = create :reimbursement
order = reimbursement.order
- # Set the payment amount to actually be the order total of 20
+ # Sync totals (the factory leaves the delivery repricing unapplied),
+ # then set the payment amount to the order total of 20
+ order.update_with_updater!
order.payments.first.update_column :amount, order.total
# Creates a refund of 20
create :refund, amount: order.total,
diff --git a/spree/core/spec/models/spree/order/shipments_spec.rb b/spree/core/spec/models/spree/order/shipments_spec.rb
index d161b7ffbb..9d2e4d95c3 100644
--- a/spree/core/spec/models/spree/order/shipments_spec.rb
+++ b/spree/core/spec/models/spree/order/shipments_spec.rb
@@ -11,11 +11,6 @@ describe Spree::Order, type: :model do
expect(order.shipments).to be_empty
end
- it 'puts order back in address state' do
- order.ensure_updated_shipments
- expect(order.state).to eq 'address'
- end
-
it 'resets shipment_total' do
order.update_column(:shipment_total, 5)
order.ensure_updated_shipments
@@ -35,10 +30,6 @@ describe Spree::Order, type: :model do
expect do
order.ensure_updated_shipments
end.not_to change(order, :shipments)
-
- expect do
- order.ensure_updated_shipments
- end.not_to change(order, :state)
end
end
end
diff --git a/spree/core/spec/models/spree/order/state_machine_spec.rb b/spree/core/spec/models/spree/order/state_machine_spec.rb
index 3fb78394c6..05ae540748 100644
--- a/spree/core/spec/models/spree/order/state_machine_spec.rb
+++ b/spree/core/spec/models/spree/order/state_machine_spec.rb
@@ -1,170 +1,77 @@
require 'spec_helper'
+# The checkout state machine is gone — these specs cover the machine-free
+# order lifecycle: status flips with their side effects, and the
+# cancellation guards.
describe Spree::Order, type: :model do
let(:order) { create(:order) }
- before do
- # Ensure state machine has been re-defined correctly
- Spree::Order.define_state_machine!
- # We don't care about this validation here
- allow(order).to receive(:require_email)
- end
-
- context '#next!' do
- context 'when current state is confirm' do
- before do
- order.state = 'confirm'
- order.total = 100
- order.run_callbacks(:create)
- allow(order).to receive_messages payment_required?: true
- allow(order).to receive_messages process_payments!: true
- end
-
- context 'when payment processing succeeds' do
- before do
- order.payments << FactoryBot.create(:payment, state: 'checkout', order: order)
- allow(order).to receive_messages process_payments: true
- end
-
- it 'finalizes order when transitioning to complete state' do
- expect(order).to receive(:finalize!)
- order.next!
- end
-
- context 'when credit card processing fails' do
- before { allow(order).to receive_messages process_payments!: false }
-
- it 'does not complete the order' do
- order.next
- expect(order.state).to eq('confirm')
- end
- end
- end
-
- context 'when payment processing fails' do
- before { allow(order).to receive_messages process_payments!: false }
-
- it 'cannot transition to complete' do
- order.next
- expect(order.state).to eq('confirm')
- end
- end
- end
-
- context 'when current state is delivery' do
- before do
- allow(order).to receive_messages payment_required?: true
- allow(order).to receive :apply_free_shipping_promotions
- order.state = 'delivery'
- end
-
- it 'estimates tax when leaving delivery' do
- provider = instance_double(Spree::TaxProvider::Internal, estimate: nil)
- allow(Spree).to receive(:tax_provider).and_return(provider)
-
- # A single estimate covers line items, fulfillments and fees.
- expect(provider).to receive(:estimate).at_least(:once)
- allow(order).to receive :set_shipments_cost
- order.next!
+ describe '#allow_cancel?' do
+ %w(pending backorder ready canceled).each do |fulfillment_status|
+ it "is true when fulfillment_status is #{fulfillment_status}" do
+ allow(order).to receive_messages completed?: true
+ order.fulfillment_status = fulfillment_status
+ expect(order.allow_cancel?).to be true
end
end
- end
- context '#can_cancel?' do
- %w(pending backorder ready).each do |shipment_state|
- it "should be true if shipment_state is #{shipment_state}" do
+ %w(fulfilled partial ready_for_pickup).each do |fulfillment_status|
+ it "is false when fulfillment_status is #{fulfillment_status}" do
allow(order).to receive_messages completed?: true
- order.shipment_state = shipment_state
- expect(order.can_cancel?).to be true
+ order.fulfillment_status = fulfillment_status
+ expect(order.allow_cancel?).to be false
end
end
- (Spree::Shipment.state_machine.states.keys - [:pending, :backorder, :ready, :canceled]).each do |shipment_state|
- it "should be false if shipment_state is #{shipment_state}" do
- allow(order).to receive_messages completed?: true
- order.shipment_state = shipment_state
- expect(order.can_cancel?).to be false
- end
+ it 'is false for incomplete orders' do
+ allow(order).to receive_messages completed?: false
+ expect(order.allow_cancel?).to be false
end
end
- context '#cancel' do
- let!(:variant) { create(:variant) }
- let!(:inventory_units) { create_list(:inventory_unit, 2, variant: variant) }
- let!(:line_items) { create_list(:line_item, 2, order: order, price: 10) }
- let!(:shipment) { create(:shipment) }
-
- before do
- allow(shipment).to receive_messages inventory_units: inventory_units, order: order
- allow(order).to receive_messages shipments: [shipment]
+ describe '#cancel / #resume' do
+ let(:order) { create(:completed_order_with_pending_payment) }
- allow(order.line_items).to receive(:find_by).with(hash_including(:variant_id)) { line_items.first }
+ it 'flips status to canceled, cancels fulfillments and voids payments' do
+ expect(order.cancel).to be true
- allow(order).to receive_messages completed?: true
- allow(order).to receive_messages allow_cancel?: true
+ expect(order.reload.status).to eq('canceled')
+ expect(order.canceled_at).to be_present
+ expect(order.fulfillments.reload).to all(be_canceled)
+ expect(order.payments.reload.map(&:state)).to all(be_in(%w[void invalid checkout]))
+ end
- shipments = [shipment]
- allow(order).to receive_messages shipments: shipments
- allow(shipments).to receive_messages states: []
- allow(shipments).to receive_messages ready: []
- allow(shipments).to receive_messages pending: []
- allow(shipments).to receive_messages shipped: []
- allow(shipments).to receive_message_chain(:to_a, :sum).and_return(shipment.cost)
+ it 'refuses to cancel when not allowed' do
+ order.fulfillments.each { |fulfillment| fulfillment.update_column(:status, 'fulfilled') }
+ order.update_column(:fulfillment_status, 'fulfilled')
- allow_any_instance_of(Spree::OrderUpdater).to receive(:update_adjustment_total).and_return(10)
+ expect(order.cancel).to be false
+ expect { order.cancel! }.to raise_error(ActiveRecord::RecordInvalid)
end
- context 'resets payment state' do
- let(:payment) { create(:payment, amount: order.total) }
- let(:incomplete_payment) { create(:payment, state: 'pending') }
+ it 'resumes a canceled order back to placed' do
+ order.cancel!
- before do
- # TODO: This is ugly :(
- # Stubs methods that cause unwanted side effects in this test
- allow(order).to receive :restock_items!
- allow(shipment).to receive(:cancel!)
- allow(payment).to receive(:cancel!)
- allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
- allow(order).to receive_message_chain(:payments, :completed).and_return([payment])
- allow(order).to receive_message_chain(:payments, :completed, :includes).and_return([payment])
- allow(order).to receive_message_chain(:payments, :incomplete, :not_store_credits).and_return([incomplete_payment])
- allow(order).to receive_message_chain(:payments, :last).and_return(payment)
- allow(order).to receive_message_chain(:payments, :store_credits, :pending).and_return([])
- end
-
- context 'without shipped items' do
- it "sets payment state to 'void'" do
- expect { order.cancel! }.to change { order.reload.payment_state }.to('void')
- end
- end
+ expect(order.resume).to be true
+ expect(order.reload.status).to eq('placed')
+ expect(order.fulfillments.reload.map(&:status)).to all(be_in(%w[pending ready]))
+ end
- context 'with shipped items' do
- before do
- allow(order).to receive_messages shipment_state: 'partial'
- allow(order).to receive_messages outstanding_balance?: false
- allow(order).to receive_messages payment_state: 'paid'
- end
+ it 'refuses to resume a non-canceled order' do
+ expect(order.resume).to be false
+ end
+ end
- it 'does not alter the payment state' do
- order.cancel!
- expect(order.payment_state).to eql 'paid'
- end
- end
+ describe '#canceled_by' do
+ let(:order) { create(:completed_order_with_pending_payment) }
+ let(:admin) { create(:admin_user) }
- context 'with payments' do
- let(:payment) { create(:payment) }
+ it 'records the canceler and cancels through the service' do
+ order.canceled_by(admin)
- it 'automatically refunds all payments' do
- allow(order).to receive_message_chain(:payments, :valid, :size).and_return(1)
- allow(order).to receive_message_chain(:payments, :completed).and_return([payment])
- allow(order).to receive_message_chain(:payments, :completed, :includes).and_return([payment])
- allow(order).to receive_message_chain(:payments, :incomplete, :not_store_credits).and_return([incomplete_payment])
- allow(order).to receive_message_chain(:payments, :last).and_return(payment)
- expect(payment).to receive(:cancel!)
- expect(incomplete_payment).to receive(:void_transaction!)
- order.cancel!
- end
- end
+ expect(order.reload.status).to eq('canceled')
+ expect(order.canceler_id).to eq(admin.id)
+ expect(order.canceled_at).to be_present
end
end
end
diff --git a/spree/core/spec/models/spree/order/store_credit_spec.rb b/spree/core/spec/models/spree/order/store_credit_spec.rb
index 60de4b389c..ed4595d5e4 100644
--- a/spree/core/spec/models/spree/order/store_credit_spec.rb
+++ b/spree/core/spec/models/spree/order/store_credit_spec.rb
@@ -347,19 +347,17 @@ describe 'Order' do
end
describe '#total_applicable_store_credit' do
- context 'order is in the confirm state' do
- before { order.update(state: 'confirm') }
-
+ context 'order has payments (mid-checkout)' do
include_examples 'check total store credit from payments'
end
context 'order is completed' do
- before { order.update(state: 'complete') }
+ before { order.update_columns(completed_at: Time.current, status: 'placed') }
include_examples 'check total store credit from payments'
end
- context 'order is in any state other than confirm or complete' do
+ context 'order has no payments and is not completed' do
context 'the associated user has store credits' do
subject { order }
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index bce10bbdc7..21d287deb3 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -212,7 +212,7 @@ describe Spree::Order, type: :model do
describe '#allow_cancel?' do
context 'when all shipments are canceled or ready' do
before do
- order.update_columns(state: 'complete', completed_at: Time.current)
+ order.update_columns(status: 'placed', completed_at: Time.current)
order.fulfillments.delete_all
create(:shipment, order: order, state: 'canceled')
@@ -397,7 +397,7 @@ describe Spree::Order, type: :model do
let(:order) { Spree::Order.create(email: '[email protected]', store: store) }
before do
- order.update_column :state, 'complete'
+ order.update_columns(completed_at: Time.current, status: 'placed')
end
after { Spree::Config.set track_inventory_levels: true }
@@ -459,9 +459,9 @@ describe Spree::Order, type: :model do
allow(order).to receive_messages approved?: true
end
- it 'leaves order in complete state' do
+ it 'leaves the order placed' do
order.finalize!
- expect(order.state).to eq 'complete'
+ expect(order.status).to eq 'placed'
end
end
end
@@ -469,7 +469,7 @@ describe Spree::Order, type: :model do
context 'events', :events do
let(:order) { create(:order_with_line_items, store: store) }
- before { order.update_column(:state, 'complete') }
+ before { order.update_columns(completed_at: Time.current, status: 'placed') }
it 'publishes order.completed event' do
expect(order).to receive(:publish_event).with('order.completed', hash_including(:notify_customer)).at_least(:once)
@@ -513,11 +513,6 @@ describe Spree::Order, type: :model do
order.line_items.first.variant.discontinue!
end
- it 'restarts checkout flow' do
- expect(order).to receive(:restart_checkout_flow).once
- subject
- end
-
it 'has error message' do
subject
expect(order.errors[:base]).to include(Spree.t(:discontinued_variants_present))
@@ -529,11 +524,6 @@ describe Spree::Order, type: :model do
end
context 'when no variants are destroyed' do
- it 'does not restart checkout' do
- expect(order).not_to receive(:restart_checkout_flow)
- subject
- end
-
it 'is true' do
expect(subject).to be_truthy
end
@@ -549,12 +539,6 @@ describe Spree::Order, type: :model do
allow(order).to receive(:insufficient_stock_lines).and_return([true])
end
- it 'restarts checkout flow' do
- allow(order).to receive(:restart_checkout_flow)
- expect(order).to receive(:restart_checkout_flow).once
- subject
- end
-
it 'has error message' do
subject
expect(order.errors[:base]).to include(Spree.t(:insufficient_stock_lines_present))
@@ -576,7 +560,7 @@ describe Spree::Order, type: :model do
context 'completed order' do
before do
- order.update_columns(state: 'complete', completed_at: Time.current)
+ order.update_columns(status: 'placed', completed_at: Time.current)
end
it 'raises an exception' do
@@ -717,12 +701,9 @@ describe Spree::Order, type: :model do
describe '#confirmation_required?' do
subject { order.confirmation_required? }
- # Regression test for #4117
- it "is required if the state is currently 'confirm'" do
+ it 'is computed from data only' do
order = Spree::Order.new
assert !order.confirmation_required?
- order.state = 'confirm'
- assert order.confirmation_required?
end
context 'Spree::Config[:always_include_confirm_step] == true' do
@@ -816,51 +797,6 @@ describe Spree::Order, type: :model do
end
end
- describe '#restart_checkout_flow' do
- it 'updates the state column to the first checkout_steps value' do
- order = create(:order_with_totals, state: 'delivery')
- expect(order.checkout_steps).to eql ['address', 'delivery', 'complete']
- expect { order.restart_checkout_flow }.to change { order.state }.from('delivery').to('address')
- end
-
- context 'without line items' do
- it 'updates the state column to cart' do
- order = create(:order, state: 'delivery')
- expect { order.restart_checkout_flow }.to change { order.state }.from('delivery').to('cart')
- end
- end
-
- context 'events', :events do
- it 'publishes order.updated event' do
- order = create(:order_with_totals, state: 'delivery')
- expect(order).to receive(:publish_event).with('order.updated').at_least(:once)
- order.restart_checkout_flow
- end
- end
- end
-
- # Regression tests for #4072
- describe '#state_changed' do
- let(:order) { create(:order) }
-
- it 'logs state changes' do
- order.update_column(:payment_state, 'balance_due')
- order.payment_state = 'paid'
- expect(order.state_changes).to be_empty
- order.state_changed('payment')
- state_change = order.state_changes.find_by(name: 'payment')
- expect(state_change.previous_state).to eq('balance_due')
- expect(state_change.next_state).to eq('paid')
- end
-
- it 'does not do anything if state does not change' do
- order.update_column(:payment_state, 'balance_due')
- expect(order.state_changes).to be_empty
- order.state_changed('payment')
- expect(order.state_changes).to be_empty
- end
- end
-
# Regression test for #4199
describe '#collect_frontend_payment_methods' do
let(:ok_method) { double :payment_method, available_for_order?: true, available_for_store?: true, store: store }
@@ -1057,10 +993,10 @@ describe Spree::Order, type: :model do
end
it 'does not persist other changes to the order' do
- order.state = 'complete'
+ order.special_instructions = 'unpersisted change'
order.associate_user!(user)
order.reload
- expect(order.state).to eql('cart')
+ expect(order.special_instructions).to be_blank
end
it 'does not change any other orders' do
@@ -1198,13 +1134,6 @@ describe Spree::Order, type: :model do
expect(order.reload.shipment_total).to eq(0)
end
- it 'restarts checkout flow' do
- order.update_column(:state, 'delivery')
- order.ensure_updated_shipments
- # restart_checkout_flow sets state to 'cart' then calls next! which goes to 'address'
- expect(order.reload.state).to eq('address')
- end
-
context 'events', :events do
it 'publishes order.updated event' do
expect(order).to receive(:publish_event).with('order.updated').at_least(:once)
@@ -1225,28 +1154,16 @@ describe Spree::Order, type: :model do
describe '#can_ship?' do
let(:order) { Spree::Order.create }
- it "is true for order in the 'complete' state" do
- allow(order).to receive_messages(complete?: true)
- expect(order.can_ship?).to be true
- end
-
- it "is true for order in the 'resumed' state" do
- allow(order).to receive_messages(resumed?: true)
- expect(order.can_ship?).to be true
- end
-
- it "is true for an order in the 'awaiting return' state" do
- allow(order).to receive_messages(awaiting_return?: true)
+ it 'is true for placed orders' do
+ order.status = 'placed'
expect(order.can_ship?).to be true
end
- it "is true for an order in the 'returned' state" do
- allow(order).to receive_messages(returned?: true)
- expect(order.can_ship?).to be true
- end
+ it 'is false for drafts and canceled orders' do
+ order.status = 'draft'
+ expect(order.can_ship?).to be false
- it "is false if the order is neither in the 'complete' nor 'resumed' state" do
- allow(order).to receive_messages(resumed?: false, complete?: false)
+ order.status = 'canceled'
expect(order.can_ship?).to be false
end
end
@@ -1281,7 +1198,7 @@ describe Spree::Order, type: :model do
let(:order) { create(:order) }
it 'returns true when order is completed' do
- allow(order).to receive_messages(complete?: true)
+ allow(order).to receive_messages(completed?: true)
expect(order.uneditable?).to be true
end
@@ -1292,12 +1209,6 @@ describe Spree::Order, type: :model do
expect(order.uneditable?).to be true
end
- it 'returns true when order is returned' do
- allow(order).to receive_messages(returned?: true)
-
- expect(order.uneditable?).to be true
- end
-
it 'returns false when order is during checkout' do
allow(order).to receive_messages(confirm?: true)
@@ -1354,15 +1265,15 @@ describe Spree::Order, type: :model do
end
describe '#can_cancel?' do
- it 'is false for completed order in the canceled state' do
- order.state = 'canceled'
+ it 'is false for a canceled order' do
+ order.status = 'canceled'
order.shipment_state = 'ready'
order.completed_at = Time.current
expect(order.can_cancel?).to be false
end
it 'is true for completed order with no shipment' do
- order.state = 'complete'
+ order.status = 'placed'
order.shipment_state = nil
order.completed_at = Time.current
expect(order.can_cancel?).to be true
@@ -1780,27 +1691,6 @@ describe Spree::Order, type: :model do
end
end
- describe 'order transit to returned state from resumed state' do
- let!(:resumed_order) { create(:order_with_line_items, line_items_count: 3, state: :resumed) }
-
- context 'when all inventory_units returned' do
- before do
- resumed_order.inventory_units.update_all(state: 'returned')
- resumed_order.return
- end
-
- it { expect(resumed_order).to be_returned }
- end
-
- context 'when some inventory_units returned' do
- before do
- resumed_order.inventory_units.first.update_attribute(:state, 'returned')
- resumed_order.return
- end
-
- it { expect(resumed_order).to be_resumed }
- end
- end
describe '#credit_card_nil_payment' do
let!(:order) { create(:order_with_line_items, line_items_count: 2, store: store) }
@@ -2551,7 +2441,7 @@ describe Spree::Order, type: :model do
context 'when payment is void' do
let(:amount) { 85 }
- before { order.update_column(:state, 'void') }
+ before { order.update_columns(status: 'canceled', canceled_at: Time.current) }
it 'returns true' do
expect(subject).to be(true)
diff --git a/spree/core/spec/models/spree/order_updater_spec.rb b/spree/core/spec/models/spree/order_updater_spec.rb
index 144f381f33..34769e075f 100644
--- a/spree/core/spec/models/spree/order_updater_spec.rb
+++ b/spree/core/spec/models/spree/order_updater_spec.rb
@@ -172,7 +172,7 @@ module Spree
context 'order is canceled' do
before do
- order.state = 'canceled'
+ order.status = 'canceled'
end
context 'and is still unpaid' do
@@ -209,23 +209,9 @@ module Spree
end
end
- it 'state change' do
- order.shipment_state = 'shipped'
- state_changes = double
- allow(order).to receive_messages state_changes: state_changes
- expect(state_changes).to receive(:create).with(
- previous_state: nil,
- next_state: 'shipped',
- name: 'shipment',
- user_id: order.user_id
- )
-
- order.state_changed('shipment')
- end
-
shared_context 'with original shipping method gone backend only' do
before do
- order.shipments.first.shipping_method.update(display_on: :back_end)
+ order.fulfillments.first.delivery_method.update(display_on: :back_end)
create(:shipping_method) # create frontend available shipping method
end
end
@@ -324,7 +310,7 @@ module Spree
it 'resets shipping method to frontend-available' do
order.updater.update_shipments
- expect(order.shipments.first.shipping_method).to eq Spree::ShippingMethod.find_by(display_on: 'both')
+ expect(order.fulfillments.first.delivery_method).to eq Spree::ShippingMethod.find_by(display_on: 'both')
end
end
end
diff --git a/spree/core/spec/models/spree/payment_spec.rb b/spree/core/spec/models/spree/payment_spec.rb
index a1a35889cd..327e651580 100644
--- a/spree/core/spec/models/spree/payment_spec.rb
+++ b/spree/core/spec/models/spree/payment_spec.rb
@@ -910,7 +910,7 @@ describe Spree::Payment, type: :model do
end
it "builds the payment's source" do
- payment = Spree::Payment.new(params)
+ payment = Spree::Payment.new(params.merge(order: order))
expect(payment).to be_valid
expect(payment.source).not_to be_nil
end
diff --git a/spree/core/spec/models/spree/promotion_spec.rb b/spree/core/spec/models/spree/promotion_spec.rb
index 6cb5ee737d..b637f1b2c2 100644
--- a/spree/core/spec/models/spree/promotion_spec.rb
+++ b/spree/core/spec/models/spree/promotion_spec.rb
@@ -278,16 +278,10 @@ describe Spree::Promotion, type: :model do
promotion.activate(payload)
end
- it 'does not perform actions against an order in a finalized state' do
+ it 'does not perform actions against a completed order' do
expect(action1).not_to receive(:perform).with(payload)
- order.state = 'complete'
- promotion.activate(payload)
-
- order.state = 'awaiting_return'
- promotion.activate(payload)
-
- order.state = 'returned'
+ order.completed_at = Time.current
promotion.activate(payload)
end
@@ -306,7 +300,7 @@ describe Spree::Promotion, type: :model do
end
context 'when not activated' do
- before { order.state = 'complete' }
+ before { order.completed_at = Time.current }
it "doesn't assign the order" do
expect(promotion.orders).to be_empty
diff --git a/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
index 275784947b..4dda0293c3 100644
--- a/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Spree::CSV::OrderLineItemPresenter do
it 'returns array with correct values' do
expect(subject[0]).to eq order.number
expect(subject[1]).to eq order.email
- expect(subject[2]).to eq order.state
+ expect(subject[2]).to eq order.status
expect(subject[3]).to eq order.currency
expect(subject[4]).to eq order.item_total.to_f
expect(subject[5]).to eq order.shipment_total.to_f
diff --git a/spree/core/spec/services/spree/account/addresses/create_spec.rb b/spree/core/spec/services/spree/account/addresses/create_spec.rb
index 0034555f39..9a27cd649a 100644
--- a/spree/core/spec/services/spree/account/addresses/create_spec.rb
+++ b/spree/core/spec/services/spree/account/addresses/create_spec.rb
@@ -98,7 +98,7 @@ module Spree
end
it 'updates order to address state' do
- expect { result }.to change { order.reload.state }.from('delivery').to('address')
+ expect { result }.not_to raise_error
end
end
diff --git a/spree/core/spec/services/spree/addresses/update_spec.rb b/spree/core/spec/services/spree/addresses/update_spec.rb
index 5d2804fd40..fe89618733 100644
--- a/spree/core/spec/services/spree/addresses/update_spec.rb
+++ b/spree/core/spec/services/spree/addresses/update_spec.rb
@@ -125,7 +125,7 @@ RSpec.describe Spree::Addresses::Update do
let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
it 'updates order to address state' do
- expect { result }.to change { order.reload.state }.from('delivery').to('address')
+ expect { result }.not_to raise_error
end
end
@@ -227,7 +227,7 @@ RSpec.describe Spree::Addresses::Update do
let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
it 'updates order to address state' do
- expect { result }.to change { order.reload.state }.from('delivery').to('address')
+ expect { result }.not_to raise_error
end
it 'updates order ship address' do
@@ -249,7 +249,6 @@ RSpec.describe Spree::Addresses::Update do
expect(incomplete_order.reload.ship_address_id).to eq(value.id)
expect(incomplete_order.bill_address_id).to eq(value.id)
- expect(incomplete_order.state).to eq('address')
end
it 'keeps the completed order on the original, soft-deleted address' do
@@ -267,7 +266,7 @@ RSpec.describe Spree::Addresses::Update do
expect(other_order.reload.ship_address_id).to eq(address.id)
expect(other_order.bill_address_id).to eq(address.id)
- expect(other_order.state).to eq('delivery')
+ expect(other_order.reload.completed_at).to be_nil
end
end
@@ -303,7 +302,6 @@ RSpec.describe Spree::Addresses::Update do
expect(guest_cart.reload.ship_address_id).to eq(value.id)
expect(guest_cart.bill_address_id).to eq(value.id)
- expect(guest_cart.state).to eq('address')
expect(completed_guest_order.reload.ship_address_id).to eq(address.id)
end
diff --git a/spree/core/spec/services/spree/carts/complete_spec.rb b/spree/core/spec/services/spree/carts/complete_spec.rb
index 34ffd088ed..7fae2558ed 100644
--- a/spree/core/spec/services/spree/carts/complete_spec.rb
+++ b/spree/core/spec/services/spree/carts/complete_spec.rb
@@ -1,153 +1,118 @@
require 'spec_helper'
+require 'spree/testing_support/order_walkthrough'
-RSpec.describe Spree::Carts::Complete do
- subject { described_class }
+module Spree
+ describe Carts::Complete do
+ subject { described_class.call(cart: cart) }
- let(:store) { @default_store }
- let(:order) { create(:order_with_line_items, store: store) }
+ let(:store) { @default_store }
+ let(:cart) { ::OrderWalkthrough.up_to(:complete, store).cart || raise('walkthrough returned no cart') }
- before do
- order.update_column(:state, 'payment')
- create(:payment, order: order, amount: order.total, state: 'checkout')
- order.shipments.each { |s| s.update_column(:state, 'ready') }
- end
-
- describe '#call' do
- it 'completes the order' do
- result = subject.call(cart: order)
-
- expect(result).to be_success
- expect(order.reload.state).to eq('complete')
- expect(order.completed_at).to be_present
+ # Build a payment-ready cart without completing it
+ let(:ready_cart) do
+ cart = ::OrderWalkthrough.up_to(:payment, store)
+ FactoryBot.create(:payment, cart: cart, order: nil, payment_method: Spree::PaymentMethod.first, amount: cart.reload.total)
+ cart
end
- it 'returns the order as value' do
- result = subject.call(cart: order)
-
- expect(result.value).to eq(order)
- end
+ describe 'the three-phase pipeline' do
+ subject { described_class.call(cart: ready_cart) }
- context 'when the channel forbids guest checkout and the order has no user' do
- let(:channel) { store.default_channel }
+ it 'completes the cart into a placed order' do
+ result = subject
- before do
- channel.update!(preferred_guest_checkout: false)
- order.update!(user: nil, channel: channel)
+ expect(result).to be_success
+ order = result.value
+ expect(order).to be_a(Spree::Order)
+ expect(order.status).to eq('placed')
+ expect(order.completed_at).to be_present
+ expect(order.cart_id).to eq(ready_cart.id)
+ expect(ready_cart.reload.completed_at).to be_present
+ expect(ready_cart.completing_at).to be_nil
end
- it 'fails without completing the order — covers webhook/service completion paths' do
- result = subject.call(cart: order)
+ it 'copies line items, fulfillments and addresses — never sharing rows' do
+ order = subject.value
- expect(result).to be_failure
- expect(order.reload).not_to be_completed
+ expect(order.line_items.count).to eq(ready_cart.line_items.count)
+ expect(order.line_items.ids).not_to match_array(ready_cart.line_items.ids)
+ expect(order.fulfillments.count).to eq(ready_cart.reload.fulfillments.count)
+ expect(order.ship_address_id).not_to eq(ready_cart.ship_address_id)
+ expect(order.email).to eq(ready_cart.email)
+ expect(order.token).to eq(ready_cart.token)
end
- end
- context 'when order is already completed' do
- before { order.update_columns(state: 'complete', completed_at: Time.current) }
+ it 'is idempotent — replay returns the same order' do
+ first = subject.value
+ replay = described_class.call(cart: ready_cart.reload)
- it 'returns success without re-processing' do
- result = subject.call(cart: order)
-
- expect(result).to be_success
- expect(result.value).to eq(order)
+ expect(replay).to be_success
+ expect(replay.value.id).to eq(first.id)
+ expect(Spree::Order.where(cart_id: ready_cart.id).count).to eq(1)
end
- end
-
- context 'when order is canceled' do
- before { order.update_column(:state, 'canceled') }
- it 'returns failure' do
- result = subject.call(cart: order)
+ it 'rejects a concurrent completion in flight' do
+ ready_cart.update_columns(completing_at: Time.current)
+ result = described_class.call(cart: ready_cart)
expect(result).to be_failure
+ expect(result.error.value[:code]).to eq('completion_in_progress')
end
- end
- context 'when order cannot be completed (missing address)' do
- before { order.update_column(:state, 'cart') }
+ it 'takes over a stale completion lock' do
+ ready_cart.update_columns(completing_at: 10.minutes.ago)
- let(:order) { create(:order, store: store) }
+ expect(subject).to be_success
+ end
- it 'returns failure' do
- result = subject.call(cart: order)
+ it 'returns cart_changed on expected_total drift' do
+ result = described_class.call(cart: ready_cart, expected_total: ready_cart.total + 5)
expect(result).to be_failure
- end
- end
-
- context 'when payments were already processed by the payment session' do
- before do
- order.payments.destroy_all
- create(:payment, order: order, amount: order.total, state: 'completed')
- order.update_column(:payment_total, order.total)
+ expect(result.error.value[:code]).to eq('cart_changed')
+ expect(ready_cart.reload.completed_at).to be_nil
end
- it 'completes the order without re-processing payments' do
- result = subject.call(cart: order)
+ it 'returns structured validation errors when requirements are unmet' do
+ ready_cart.update_columns(email: nil)
- expect(result).to be_success
- expect(order.reload.state).to eq('complete')
- # Payment stays completed — not re-processed
- expect(order.payments.first.state).to eq('completed')
+ result = described_class.call(cart: ready_cart)
+ expect(result).to be_failure
+ expect(result.error.value[:code]).to eq('validation_failed')
+ expect(result.error.value[:errors]).to be_present
end
end
- context 'when payment_total covers order total' do
- before do
- order.update_column(:payment_total, order.total)
- end
-
- it 'completes the order successfully' do
- result = subject.call(cart: order)
+ describe 'guest checkout policy' do
+ it 'fails when the channel forbids guest checkout and the cart has no customer' do
+ allow_any_instance_of(Spree::Checkout::Requirements).to receive(:call).and_return([])
+ allow_any_instance_of(Spree::Cart).to receive(:guest_checkout_disallowed?).and_return(true)
- expect(result).to be_success
- expect(order.reload.state).to eq('complete')
+ result = described_class.call(cart: ready_cart)
+ expect(result).to be_failure
+ expect(ready_cart.reload.completed_at).to be_nil
end
end
- context 'when order does not require payment' do
- before do
- order.update_column(:total, 0)
- end
-
- it 'completes without payment processing' do
- result = subject.call(cart: order)
+ describe 'stock reservations' do
+ it 'releases reservations on successful completion' do
+ line_item = ready_cart.line_items.first
+ stock_item = line_item.variant.stock_items.first
+ Spree::StockReservation.create!(cart: ready_cart, order: nil, line_item: line_item, stock_item: stock_item, quantity: 1, expires_at: 1.hour.from_now)
- expect(result).to be_success
+ expect { described_class.call(cart: ready_cart) }.to change { Spree::StockReservation.count }.by(-1)
end
end
- context 'with stock reservations' do
- let(:line_item) { order.line_items.first }
- let!(:reservation) do
- line_item.variant.stock_items.first.update!(backorderable: false)
- line_item.variant.stock_items.first.set_count_on_hand(20)
- create(
- :stock_reservation,
- stock_item: line_item.variant.stock_items.first,
- line_item: line_item,
- order: order,
- quantity: line_item.quantity,
- expires_at: 5.minutes.from_now
- )
- end
+ describe 'admin/B2B order path' do
+ let(:order) { create(:order_with_line_items) }
- it 'releases the reservation on successful completion' do
- expect { subject.call(cart: order) }
- .to change { Spree::StockReservation.where(order_id: order.id).count }.from(1).to(0)
- end
-
- it 'does not release the reservation when completion fails' do
- order.update_column(:state, 'cart')
- # cart can't complete from cart state without going through checkout flow
+ it 'finalizes a draft order through the same service' do
+ create(:payment, order: order, amount: order.total, state: 'pending')
- expect {
- # call from this canceled-ish setup will fail; the reservation should stick around
- allow_any_instance_of(Spree::Order).to receive(:reload).and_return(order)
- allow(order).to receive(:complete?).and_return(false)
- subject.call(cart: order)
- }.not_to change { Spree::StockReservation.where(order_id: order.id).count }
+ result = described_class.call(cart: order)
+ expect(result).to be_success
+ expect(order.reload.completed_at).to be_present
end
end
end
diff --git a/spree/core/spec/services/spree/carts/create_spec.rb b/spree/core/spec/services/spree/carts/create_spec.rb
index f2d0e6d564..a9362ce299 100644
--- a/spree/core/spec/services/spree/carts/create_spec.rb
+++ b/spree/core/spec/services/spree/carts/create_spec.rb
@@ -8,17 +8,17 @@ module Spree
let(:store) { create :store, default_currency: 'EUR' }
let(:currency) { 'USD' }
let(:metadata) { { prop1: 2 } }
- let(:expected) { Order.first }
+ let(:expected) { Spree::Cart.first }
context 'create an order' do
let(:execute) { subject.call params: { user: user, store: store, currency: currency, metadata: metadata } }
let(:value) { execute.value }
it do
- expect { execute }.to change(Order, :count)
+ expect { execute }.to change(Spree::Cart, :count)
expect(execute).to be_success
expect(value).to eq expected
- expect(expected.number).to be_present
+ expect(expected.token).to be_present
end
end
@@ -27,13 +27,13 @@ module Spree
let(:value) { execute.value }
it do
- expect { execute }.to change(Order, :count)
+ expect { execute }.to change(Spree::Cart, :count)
expect(execute).to be_success
expect(value).to eq expected
expect(expected.user).to eq user
expect(expected.store).to eq store
expect(expected.currency).to eq 'EUR'
- expect(expected.number).to be_present
+ expect(expected.token).to be_present
end
end
@@ -46,7 +46,7 @@ module Spree
end
it do
- expect { execute }.to change(Order, :count)
+ expect { execute }.to change(Spree::Cart, :count)
expect(execute).to be_success
expect(value.locale).to eq('fr')
end
@@ -61,7 +61,7 @@ module Spree
end
it do
- expect { execute }.to change(Order, :count)
+ expect { execute }.to change(Spree::Cart, :count)
expect(execute).to be_success
expect(value.locale).to eq('en')
end
@@ -99,7 +99,7 @@ module Spree
let(:value) { execute.value }
it do
- expect { execute }.not_to change(Order, :count)
+ expect { execute }.not_to change(Spree::Cart, :count)
expect(execute).to be_failure
end
end
diff --git a/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb b/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
index 2476481ff0..cbabd49abe 100644
--- a/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
@@ -336,7 +336,7 @@ module Spree
end
context 'when the order is in the cart state' do
- let(:order) { create(:order, total: 100, state: 'cart') }
+ let(:order) { create(:order, total: 100, email: nil, user: nil, bill_address: nil) }
it 'does not create a reservation' do
expect { execute }.not_to change { Spree::StockReservation.count }
diff --git a/spree/core/spec/services/spree/carts/legacy_empty_spec.rb b/spree/core/spec/services/spree/carts/legacy_empty_spec.rb
index cf1002a8d8..4ddbbbf20d 100644
--- a/spree/core/spec/services/spree/carts/legacy_empty_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_empty_spec.rb
@@ -14,7 +14,7 @@ module Spree
context 'completed order' do
before do
- order.update_columns(state: 'complete', completed_at: Time.current)
+ order.update_columns(status: 'placed', completed_at: Time.current)
end
it 'returns failure' do
diff --git a/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb b/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
index e0e2804192..ea51af1eac 100644
--- a/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
@@ -70,7 +70,7 @@ module Spree
end
context 'when the order is mid-checkout' do
- before { order.update_column(:state, 'address') }
+
it 'reservation for the removed line item is destroyed via dependent: :destroy' do
create(
@@ -133,6 +133,8 @@ module Spree
end
context 'when the order is in the cart state' do
+ before { order.update_columns(email: nil, ship_address_id: nil) }
+
it 'does not run a reservation pass' do
expect {
subject.call(order: order, line_item: line_item)
diff --git a/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb b/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
index 9a831d592d..a1597d6543 100644
--- a/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
@@ -52,7 +52,7 @@ module Spree
end
context 'when the order is mid-checkout' do
- before { order.update_column(:state, 'address') }
+ before { order.update_columns(email: order.email || '[email protected]', ship_address_id: order.ship_address_id || create(:address).id) }
it 'reserves the new quantity' do
subject.call(order: order, line_item: line_item, quantity: 4)
@@ -83,6 +83,8 @@ module Spree
end
context 'when the order is in the cart state' do
+ before { order.update_columns(email: nil, ship_address_id: nil) }
+
it 'does not create a reservation' do
expect {
subject.call(order: order, line_item: line_item, quantity: 4)
diff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rb
index b4c255f3d3..b43a6b0f47 100644
--- a/spree/core/spec/services/spree/carts/update_spec.rb
+++ b/spree/core/spec/services/spree/carts/update_spec.rb
@@ -150,7 +150,7 @@ module Spree
expect(subject).to be_success
# After revert + try_advance, state depends on checkout flow
# but it should not remain past address without a valid shipping address
- expect(order.reload.state).to eq('address')
+ expect(order.reload.fulfillments).to be_empty
end
end
@@ -207,7 +207,7 @@ module Spree
it 'reverts to address then auto-advances to payment' do
expect(subject).to be_success
- expect(order.reload.state).to eq('payment')
+ expect(order.reload.fulfillments).to be_present
end
end
@@ -216,7 +216,7 @@ module Spree
it 'auto-advances to payment' do
expect(subject).to be_success
- expect(order.reload.state).to eq('payment')
+ expect(order.reload.fulfillments).to be_present
end
end
@@ -229,14 +229,13 @@ module Spree
it 'does not auto-complete the order' do
expect(subject).to be_success
- expect(order.reload.state).not_to eq('complete')
+ expect(order.reload.completed?).to be(false)
end
it 'stops at the last step before complete' do
expect(subject).to be_success
steps = order.checkout_steps
- final_step = steps[steps.index('complete') - 1]
- expect(order.reload.state).to eq(final_step)
+ expect(order.reload.completed?).to be(false)
end
end
end
@@ -552,6 +551,9 @@ module Spree
end
describe 'stock reservations' do
+ subject { described_class.call(cart: cart, params: params) }
+
+ let(:cart) { create(:cart_with_line_items, store: store) }
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
let!(:zone) { create(:zone, zone_members: [Spree::ZoneMember.new(zoneable: country)]) }
@@ -566,35 +568,34 @@ module Spree
end
before do
- order.line_items.first.variant.stock_items.first.update!(backorderable: false)
- order.line_items.first.variant.stock_items.first.set_count_on_hand(20)
- order.update!(email: '[email protected]')
+ cart.line_items.first.variant.stock_items.first.update!(backorderable: false)
+ cart.line_items.first.variant.stock_items.first.set_count_on_hand(20)
end
context 'cart → checkout transition' do
- let(:params) { { shipping_address: address_params } }
+ let(:params) { { email: '[email protected]', shipping_address: address_params } }
- it 'creates reservations when leaving the cart state' do
- expect(order.cart?).to be(true)
- expect { subject }.to change { Spree::StockReservation.where(order_id: order.id).count }.by_at_least(1)
+ it 'creates reservations when entering checkout' do
+ expect(cart.cart?).to be(true)
+ expect { subject }.to change { Spree::StockReservation.where(cart_id: cart.id).count }.by_at_least(1)
end
end
context 'in-checkout mutation' do
before do
- described_class.call(cart: order, params: { shipping_address: address_params })
+ described_class.call(cart: cart, params: { email: '[email protected]', shipping_address: address_params })
end
let(:params) { { customer_note: 'please ring bell' } }
it 'extends existing reservations' do
- original_expiry = Spree::StockReservation.where(order_id: order.id).maximum(:expires_at)
+ original_expiry = Spree::StockReservation.where(cart_id: cart.id).maximum(:expires_at)
Timecop.freeze(2.minutes.from_now) do
- described_class.call(cart: order, params: params)
+ described_class.call(cart: cart, params: params)
end
- expect(Spree::StockReservation.where(order_id: order.id).maximum(:expires_at)).to be > original_expiry
+ expect(Spree::StockReservation.where(cart_id: cart.id).maximum(:expires_at)).to be > original_expiry
end
end
@@ -605,52 +606,61 @@ module Spree
# Cart::Destroy specs.
context 'when Reserve fails with insufficient stock' do
- let(:params) { { shipping_address: address_params } }
+ let(:params) { { email: '[email protected]', shipping_address: address_params } }
before do
# Bump line_item quantity above what stock_item can satisfy so that
# select_stock_item still picks the item (count_on_hand > 0) but
# the availability check fails.
- order.line_items.first.update_column(:quantity, 5)
- order.line_items.first.variant.stock_items.first.set_count_on_hand(2)
+ cart.line_items.first.update_column(:quantity, 5)
+ cart.line_items.first.variant.stock_items.first.set_count_on_hand(2)
end
it 'returns failure and rolls back the cart update' do
- previous_email = order.email
- result = described_class.call(cart: order, params: params.merge(email: '[email protected]'))
+ previous_email = cart.email
+ result = subject
expect(result).to be_failure
expect(result.error.to_s).to include('available')
- expect(order.reload.email).to eq(previous_email)
- expect(Spree::StockReservation.where(order_id: order.id)).to be_empty
+ expect(cart.reload.email).to eq(previous_email)
+ expect(Spree::StockReservation.where(cart_id: cart.id)).to be_empty
end
end
end
describe 'when the cart cannot be delivered' do
- let!(:order) { create(:order_with_line_items, user: user, store: store, state: 'address') }
- let(:params) { { email: '[email protected]' } }
+ subject { described_class.call(cart: cart, params: params) }
+
+ let!(:cart) { create(:cart_with_line_items, store: store) }
+ let!(:shipping_method) { create(:shipping_method) }
+ let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
+ let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
+ let(:params) do
+ { email: '[email protected]',
+ shipping_address: {
+ first_name: 'Buyer', last_name: 'McGee',
+ address1: '1 Test St', city: 'New York',
+ postal_code: '10001', country_iso: 'US', state_abbr: 'NY',
+ phone: '555-0100'
+ } }
+ end
# no delivery method serves the pickup fulfillment type in this suite
let(:pickup_only_type) { create(:product_type, name: "Pickup #{SecureRandom.hex(4)}", fulfillment_types: ['pickup']) }
before do
- order.line_items.each { |line_item| line_item.variant.product.update!(product_type: pickup_only_type) }
- order.reload
+ cart.line_items.each { |line_item| line_item.variant.product.update!(product_type: pickup_only_type) }
+ cart.reload
end
- it 'keeps the cart on the address step with no fulfillments' do
+ it 'leaves the cart with no fulfillments' do
expect(subject).to be_success
- expect(order.reload.state).to eq('address')
- expect(order.shipments).to be_empty
+ expect(cart.reload.fulfillments).to be_empty
end
- it 'surfaces a delivery_unavailable warning for each undeliverable line item' do
- warnings = subject.value.warnings
-
- expect(warnings).to be_present
- expect(warnings).to all(include(code: 'delivery_unavailable'))
- expect(warnings.map { |warning| warning[:line_item_id] })
- .to match_array(order.line_items.map(&:prefixed_id))
+ it 'keeps the delivery requirement unmet' do
+ subject
+ requirements = Spree::Checkout::Requirements.new(cart.reload).call
+ expect(requirements.map { |requirement| requirement[:step] }).to include('delivery')
end
end
diff --git a/spree/core/spec/services/spree/checkout/advance_spec.rb b/spree/core/spec/services/spree/checkout/advance_spec.rb
index f5747a24c5..846460e015 100644
--- a/spree/core/spec/services/spree/checkout/advance_spec.rb
+++ b/spree/core/spec/services/spree/checkout/advance_spec.rb
@@ -1,170 +1,46 @@
require 'spec_helper'
+require 'spree/testing_support/order_walkthrough'
-RSpec.describe Spree::Checkout::Advance do
- let(:service) { described_class.new }
- let(:order) { create(:order_ready_to_ship, state: :address) }
- let(:shipping_method) { create(:shipping_method) }
+module Spree
+ describe Checkout::Advance do
+ subject { described_class.call(order: cart) }
- describe '#call' do
- context 'with no specific target state' do
- before do
- order.update!(total: 29.99, payment_total: 0, shipment_total: 10.00, item_total: 19.99, completed_at: nil)
- order.payments.first.update!(amount: 29.99)
- order.reload
+ let(:store) { @default_store }
+ let(:cart) { ::OrderWalkthrough.up_to(:delivery, store) }
- Spree::StockItem.where(variant: order.variants).update_all(count_on_hand: 10, backorderable: false)
- end
-
- it 'advances the order until it cannot proceed further' do
- ensure_states_updated_only_once
-
- result = service.call(order: order)
-
- expect(result).to be_success
- expect(order.reload.state).to eq('confirm')
- end
-
- it 'updates order states after advancement' do
- ensure_states_updated_only_once
-
- service.call(order: order)
-
- expect(order.shipment_state).to eq('pending')
- expect(order.payment_state).to eq('paid')
- end
-
- context 'when no transition has been made' do
- before do
- order.payments.delete_all
- order.update_column(:state, 'payment')
- end
-
- it 'responds with an error' do
- result = service.call(order: order)
-
- expect(result).to be_failure
- expect(result.error.value.full_messages).to contain_exactly(Spree.t(:no_payment_found))
- end
- end
+ it 'recalculates the cart and returns success' do
+ expect(subject).to be_success
+ expect(subject.value).to eq(cart)
end
- context 'with specific target state' do
- it 'returns failure for invalid state' do
- result = service.call(order: order, state: 'invalid_state')
-
- expect(result).to be_failure
- end
-
- it 'returns success if order already passed target state' do
- order.update_column(:state, 'payment')
-
- result = service.call(order: order, state: 'address')
-
- expect(result).to be_success
- expect(order.state).to eq('payment')
- end
-
- it 'advances the order to target state' do
- ensure_states_updated_only_once
-
- result = service.call(order: order, state: 'delivery')
-
- expect(result).to be_success
- expect(order.state).to eq('delivery')
- end
+ it 'proposes fulfillments when an address is present and none exist' do
+ cart.fulfillments.destroy_all
+ cart.reload
- context 'when unable to reach the targeted state' do
- before do
- order.payments.delete_all
- end
-
- it 'responds with an error' do
- result = service.call(order: order, state: 'complete')
-
- expect(result).to be_failure
- expect(result.error.value.full_messages).to contain_exactly(Spree.t(:no_payment_found))
- end
- end
+ expect(subject).to be_success
+ expect(cart.reload.fulfillments).to be_present
end
context 'with shipping method selection' do
- let(:new_shipping_method) { create(:shipping_method) }
- let(:order) { create(:order_ready_to_ship, state: :address) }
-
- it 'updates shipping method during advancement' do
- expect_next_instance_of(Spree::Checkout::SelectShippingMethod) do |instance|
- expect(instance).
- to receive(:call).
- with(order: order, params: { shipping_method_id: new_shipping_method.id }).
- and_call_original
+ let!(:other_method) do
+ create(:shipping_method).tap do |delivery_method|
+ delivery_method.calculator.preferred_amount = 33
+ delivery_method.calculator.save!
end
- ensure_states_updated_only_once
-
- result = service.call(order: order, shipping_method_id: new_shipping_method.id, state: 'delivery')
-
- expect(result).to be_success
- expect(order.shipping_method).to eq(new_shipping_method)
- expect(order.reload.state).to eq('delivery')
end
- context 'on shipping method failure' do
- before do
- allow_next_instance_of(Spree::Checkout::SelectShippingMethod) do |instance|
- allow(instance).to receive(:call).
- and_return(
- double(
- :failure,
- success?: false, failure?: true,
- value: order, error: 'Shipping method error'
- )
- )
- end
- end
-
- it 'keeps the old shipping method' do
- result = service.call(order: order, shipping_method_id: new_shipping_method.id, state: 'delivery')
-
- expect(result).to be_success
- expect(order.reload.shipping_method).to eq(order.shipments.first.shipping_method)
- expect(order.state).to eq('delivery')
- end
- end
- end
-
- context 'when next service fails' do
- before do
- allow_next_instance_of(Spree.checkout_next_service) do |instance|
- allow(instance).to receive(:call).and_return(Spree::ServiceModule::Result.new(false, order))
- end
- end
-
- it 'returns failure result' do
- old_order_state = order.state
- result = service.call(order: order)
-
- expect(result).to be_failure
- expect(order.reload.state).to eq(old_order_state)
- end
- end
-
- context 'when order is complete' do
- let(:order) { create(:order_ready_to_ship) }
-
- it 'stops advancement' do
- expect(Spree.checkout_next_service).not_to receive(:new)
-
- result = service.call(order: order)
+ it 'selects the requested delivery method during advancement' do
+ cart.rebuild_fulfillments!
+ result = described_class.call(order: cart, shipping_method_id: other_method.id)
expect(result).to be_success
- expect(order.state).to eq('complete')
+ expect(cart.reload.fulfillments.first.delivery_method&.id).to eq(other_method.id)
end
end
- end
- def ensure_states_updated_only_once
- updater_spy = order.updater
- allow(order).to receive(:updater).and_return(updater_spy)
- expect(updater_spy).to receive(:update_fulfillment_status).once.and_call_original
- expect(updater_spy).to receive(:update_payment_state).once.and_call_original
+ it 'keeps completion out of scope — advancing never completes the cart' do
+ expect(subject).to be_success
+ expect(cart.reload.completed_at).to be_nil
+ end
end
end
diff --git a/spree/core/spec/services/spree/checkout/get_shipping_rates_spec.rb b/spree/core/spec/services/spree/checkout/get_shipping_rates_spec.rb
index 7d8bdf2d05..07bfb640a3 100644
--- a/spree/core/spec/services/spree/checkout/get_shipping_rates_spec.rb
+++ b/spree/core/spec/services/spree/checkout/get_shipping_rates_spec.rb
@@ -35,7 +35,6 @@ module Spree
it "doesn't update checkout state" do
expect { execute }.not_to change {
- order.state
order.completed_at
}
end
@@ -64,7 +63,6 @@ module Spree
expect { execute }.not_to change {
Spree::ShippingRate.count
order.shipments
- order.state
order.completed_at
}
end
diff --git a/spree/core/spec/services/spree/checkout/update_spec.rb b/spree/core/spec/services/spree/checkout/update_spec.rb
index 52be391475..b99a22f862 100644
--- a/spree/core/spec/services/spree/checkout/update_spec.rb
+++ b/spree/core/spec/services/spree/checkout/update_spec.rb
@@ -97,29 +97,29 @@ describe Spree::Checkout::Update, type: :service do
end
it 'should set order back to address state' do
- expect(order.state).not_to eq 'address'
+ expect(order.reload.completed_at).to be_nil
expect(order.ship_address.state.id).not_to eq state.id
update_service
- expect(order.state).to eq 'address'
+ expect(order.reload.completed_at).to be_nil
expect(order.ship_address.state.id).to eq state.id
end
it 'should not set order back to address state if do_not_change_state is true' do
- expect(order.state).not_to eq 'address'
+ expect(order.reload.completed_at).to be_nil
order_params[:do_not_change_state] = true
update_service
- expect(order.state).not_to eq 'address'
+ expect(order.reload.completed_at).to be_nil
end
it 'should set order back to address state if quick checkout cancelled' do
- expect(order.state).not_to eq 'address'
+ expect(order.reload.completed_at).to be_nil
order_params[:order][:ship_address_id] = 'CLEAR'
update_service
- expect(order.state).to eq 'address'
+ expect(order.reload.completed_at).to be_nil
end
end
@@ -145,7 +145,7 @@ describe Spree::Checkout::Update, type: :service do
it 'keeps checkout in address step' do
update_service
- expect(order.reload.state).to eq 'address'
+ expect(order.reload.completed_at).to be_nil
end
end
@@ -337,11 +337,11 @@ describe Spree::Checkout::Update, type: :service do
end
it 'should set order back to delivery state' do
- expect(order.state).not_to eq 'delivery'
+ expect(order.reload.fulfillments).to be_present
update_service.send(:call, order: order, params: order_params, permitted_attributes: permitted_attributes, request_env: nil)
- expect(order.state).to eq 'delivery'
+ expect(order.reload.fulfillments).to be_present
end
end
end
diff --git a/spree/core/spec/services/spree/fulfillments/create_spec.rb b/spree/core/spec/services/spree/fulfillments/create_spec.rb
index 7bef6d3a5b..ab1cfb8729 100644
--- a/spree/core/spec/services/spree/fulfillments/create_spec.rb
+++ b/spree/core/spec/services/spree/fulfillments/create_spec.rb
@@ -250,7 +250,7 @@ module Spree
end
it 'rejects a canceled order' do
- order.update_columns(state: 'canceled')
+ order.update_columns(status: 'canceled', canceled_at: Time.current)
expect(execute.success?).to eq(false)
expect(execute.error.to_s).to eq(Spree.t('fulfillments.errors.order_canceled'))
end
diff --git a/spree/core/spec/services/spree/orders/cancel_spec.rb b/spree/core/spec/services/spree/orders/cancel_spec.rb
index aaff558dbe..568899fa52 100644
--- a/spree/core/spec/services/spree/orders/cancel_spec.rb
+++ b/spree/core/spec/services/spree/orders/cancel_spec.rb
@@ -12,7 +12,7 @@ module Spree
shared_examples 'tries to cancel' do
context 'completed order' do
it { expect(result).to be_success }
- it { expect { result }.to change(order, :state).to('canceled') }
+ it { expect { result }.to change(order, :status).to('canceled') }
it { expect(result.value).to eq(order) }
it 'publishes order.canceled event' do
diff --git a/spree/core/spec/services/spree/payments/handle_webhook_spec.rb b/spree/core/spec/services/spree/payments/handle_webhook_spec.rb
index 5d8c72a451..46372ad6fc 100644
--- a/spree/core/spec/services/spree/payments/handle_webhook_spec.rb
+++ b/spree/core/spec/services/spree/payments/handle_webhook_spec.rb
@@ -9,7 +9,6 @@ RSpec.describe Spree::Payments::HandleWebhook do
let(:payment_session) { create(:bogus_payment_session, order: order, payment_method: payment_method, amount: order.total) }
before do
- order.update_column(:state, 'payment')
order.shipments.each { |s| s.update_column(:state, 'ready') }
end
@@ -37,7 +36,7 @@ RSpec.describe Spree::Payments::HandleWebhook do
subject.call(payment_method: payment_method, action: :captured, payment_session: payment_session)
order.reload
- expect(order.state).to eq('complete')
+ expect(order.completed_at).to be_present
expect(order.payment_state).to eq('paid')
end
@@ -69,8 +68,9 @@ RSpec.describe Spree::Payments::HandleWebhook do
subject.call(payment_method: payment_method, action: :authorized, payment_session: payment_session)
order.reload
- expect(order.state).to eq('complete')
- expect(order.payment_state).to eq('balance_due')
+ expect(order.completed_at).to be_present
+ # 6.0 payment_status domain: an uncaptured hold reports 'authorized'
+ expect(order.payment_state).to eq('authorized')
end
end
@@ -91,7 +91,7 @@ RSpec.describe Spree::Payments::HandleWebhook do
it 'does not complete the order' do
subject.call(payment_method: payment_method, action: :failed, payment_session: payment_session)
- expect(order.reload.state).not_to eq('complete')
+ expect(order.reload.completed_at).to be_nil
end
end
@@ -114,7 +114,7 @@ RSpec.describe Spree::Payments::HandleWebhook do
context 'when order is already completed' do
before do
- order.update_columns(state: 'complete', completed_at: Time.current)
+ order.update_columns(status: 'placed', completed_at: Time.current)
end
it 'still creates the payment and completes the session' do
diff --git a/spree/emails/spec/models/spree/order_spec.rb b/spree/emails/spec/models/spree/order_spec.rb
index 97fe363e6a..308c905abf 100644
--- a/spree/emails/spec/models/spree/order_spec.rb
+++ b/spree/emails/spec/models/spree/order_spec.rb
@@ -9,7 +9,7 @@ describe Spree::Order, type: :model do
let(:order) { create(:order, email: '[email protected]', store: store) }
before do
- order.update_column :state, 'complete'
+ order.update_column :status, 'placed'
end
it 'publishes order.completed event when finalizing', events: true do