portage-ucp-magento 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea401b98661b2c2e96586cf55bf37ee69a8287f39399a4131396d96d2cdfd13d
-  data.tar.gz: a646cb0522acba00f521255af96a7e7d0c7a6c2294536c21b1cb8d728c61a5b3
+  metadata.gz: 7a3583ce532646dc6ddf40dc3b43dee13f687130cfdc36537a0bf1b831863b7c
+  data.tar.gz: 6c672de6a1b8f492e163a515f6fef183411bf3708b41db8a32e5e5b43b44c0e6
 SHA512:
-  metadata.gz: 40ced25b368ea1b9ef46d8fd5e2130971d504b387ea7c7b333290b368eb9d228f73588639640c64352df7d712fc92ac893d4d3237eeaa16870fab27e64762ee2
-  data.tar.gz: a4ca4a63d937ffbaefb0829845ce38b3d5c3eed397bc33e07953f2484534b86c07a1a08d1c7a76c21dead3da2a056464a831b4ce524261415c4a3c721b59aafd
+  metadata.gz: bd726a0a6bd8d7c2d7cacf295a937b381a8e7eb6c6a5760ed4361f338f67608fed98e2221608b6f488d3a14e8f39859f5710bcc54b93f300e2358e56df50acaa
+  data.tar.gz: ac8100b5ee1689328aca7b86b68670d25cb5b62d42c14049aae2bc18425aa97f3330d09aa44a11c15abbdd17d89e8deee146f432f03ed7e22882e26d4186f29f

data/CHANGELOG.md

@@ -6,6 +6,10 @@ pre-1.0, so APIs may still shift between minor versions.
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-10-07
+
+- **Fixed: a checkout the shopper paid for in the browser now reads as `completed` from a new process.** Status lived only in the creating process, so `portage orders reconcile` always saw `incomplete`, or an error once Magento deactivated the quote. `#get_checkout` now resolves the masked cart id to its quote id (`GET /V1/guest-carts/{cartId}`, which still answers for an inactive quote), searches admin orders by `quote_id`, and reports `completed` with the `order` confirmation when one is `processing`, `complete` or `closed`, rebuilding the checkout from that order if the cart can no longer be read. The order search needs `admin_token`. No order, or a failed lookup, keeps `incomplete`; a cart that 404s with no order now returns nil instead of raising `ApiError`, like the other reads. Needs `portage-ucp` 0.13.0 for the `CheckoutState` platform hook, so the gem now requires `portage-ucp` `~> 0.13`. Patch-level.
+
 ## [0.2.0] - 2026-10-05
 
 - **Removed the unused `Client#admin_post`.** Nothing in the gem called it. It was public on the client class, so this is **breaking** for any caller using it directly; minor-level for a pre-1.0 gem.

data/lib/portage/ucp/magento/adapter.rb

@@ -46,6 +46,13 @@ module Portage
         # rather than an empty body, which UCP's reads report as nil.
         include Portage::Ucp::Support::NotFound
 
+        # Order states that mean the order was placed and paid
+        # (https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/order-management/orders/order-status):
+        # `processing` (invoiced), `complete` ("created, paid, and shipped")
+        # and `closed` (paid, then refunded). Left out: `new` (no invoice
+        # yet), `pending_payment`, `payment_review`, `holded`, `canceled`.
+        PLACED_ORDER_STATES = %w[processing complete closed].freeze
+
         def initialize(client:, currency:, site_url: nil, payment_method: nil, payment_data_key: "cc_token",
                        default_address: nil)
           super()
@@ -125,10 +132,16 @@ module Portage
           end
         end
 
+        # Placing an order deactivates the guest cart's quote, and the
+        # items/totals endpoints only read an active quote (404 after that),
+        # so a not-found here falls back to the order Magento placed from it,
+        # if any (see #platform_checkout_order).
         def get_checkout(checkout_id:)
-          items, currency = cart_snapshot(checkout_id)
+          items, currency = nil_on_not_found { cart_snapshot(checkout_id) }
+          return checkout_from_platform_order(checkout_id) unless items
+
           Mapper.checkout(items, id: checkout_id, currency: currency,
-                                 status: checkout_status(checkout_id))
+                                 status: checkout_status(checkout_id), order: checkout_order(checkout_id))
         end
 
         # Full replacement, same rationale as #update_cart.
@@ -167,6 +180,27 @@ module Portage
 
         private
 
+        # Support::CheckoutState's platform hook. The masked guest-cart id
+        # never appears on an order, but `GET /V1/guest-carts/{cartId}`
+        # resolves it to the quote's own `id` even after the quote went
+        # inactive (GuestCartRepository#get loads it with
+        # QuoteRepository#get, not #getActive:
+        # https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php),
+        # and an order's `quote_id` is that id, searchable through the admin
+        # orders endpoint's searchCriteria
+        # (https://developer.adobe.com/commerce/webapi/rest/use-rest/performing-searches/).
+        def platform_checkout_order(checkout_id)
+          quote_id = @client.guest_get("/guest-carts/#{checkout_id}")["id"]
+          return nil unless quote_id
+
+          params = { "searchCriteria[filterGroups][0][filters][0][field]" => "quote_id",
+                     "searchCriteria[filterGroups][0][filters][0][value]" => quote_id,
+                     "searchCriteria[filterGroups][0][filters][0][conditionType]" => "eq" }
+          orders = @client.admin_get("/orders?#{URI.encode_www_form(params)}")["items"] || []
+          placed = orders.find { |o| PLACED_ORDER_STATES.include?(o["state"]) }
+          placed && Mapper.order(placed, checkout_id: checkout_id)
+        end
+
         # Merges the guest-cart `items` resource (sku/name/qty/price) with
         # the `totals` resource (row_total/tax_amount/quote_currency_code)
         # by `item_id` — see Mapper.cart's comment on why Magento needs this

data/lib/portage/ucp/magento/version.rb

@@ -1,7 +1,7 @@
 module Portage
   module Ucp
     module Magento
-      VERSION = "0.2.0".freeze
+      VERSION = "0.2.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portage-ucp-magento
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tom Whitbread
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: portage-ucp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement