Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Resolve store orders by their cart handle
Damian Legawiec18bc4a445d43
diff --git a/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb b/spree/api/app/controllers/spree/api/v3/store/orders_controller.rbindex c9a86d385a..d7fe079629 100644--- a/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb@@ -13,8 +13,12 @@ module Spreeprivate+ # The cart's prefixed id stays the client's stable checkout handle:+ # after completion it resolves here to the order created from that+ # cart (Order#cart_id is unique; the order copies the cart token).def find_order!- @order = scope.find_by_prefix_id!(params[:id])+ cart_pk = Spree::Cart.decode_own_prefixed_id(params[:id])+ @order = cart_pk ? scope.find_by!(cart_id: cart_pk) : scope.find_by_prefix_id!(params[:id])authorize!(:show, @order, order_token)enddiff --git a/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rbindex 733a5155f8..69f89fe19a 100644--- a/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb@@ -32,6 +32,35 @@ RSpec.describe Spree::Api::V3::Store::OrdersController, type: :controller doendend+ context 'with the cart handle after completion' do+ let(:cart) { create(:cart_with_line_items, store: store) }+ let!(:completed_order) do+ create(:completed_order_with_totals, user: nil, store: store, cart_id: cart.id, token: cart.token)+ end++ before { cart.update_columns(completed_at: Time.current) }++ # The storefront keeps the cart id through checkout; after completion+ # the same handle + cart token must resolve the resulting order.+ it 'resolves the order created from that cart' do+ request.headers['x-spree-token'] = cart.token++ get :show, params: { id: cart.prefixed_id }++ expect(response).to have_http_status(:ok)+ expect(json_response['id']).to eq(completed_order.prefixed_id)+ expect(json_response['number']).to eq(completed_order.number)+ end++ it 'returns not found without the matching token' do+ request.headers['x-spree-token'] = 'wrong-token'++ get :show, params: { id: cart.prefixed_id }++ expect(response).to have_http_status(:not_found)+ end+ end+context 'with spree token' dolet(:guest_order) { create(:completed_order_with_totals, user: nil, store: store) }