amazon-orders 4.4.2__tar.gz → 4.4.4__tar.gz

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/CHANGELOG.md

@@ -4,17 +4,38 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.4.2...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.4.4...HEAD)
+
+## [4.4.4](https://github.com/alexdlaird/amazon-orders/compare/4.4.3...4.4.4) - 2026-07-07
+
+### Added
+
+- `Order.is_whole_foods`, identifying Whole Foods Market in-store and receipt orders.
+- `Order.item_count`, for orders where Amazon shows an item count rather than a line-item list (e.g. Whole Foods Market, eGift orders).
+- Full-details parsing for Whole Foods Market in-store (FOPO) orders via their dedicated `/fopo/order-details` page, populating `items`, `subtotal`, `estimated_tax`, and `payment_method`.
+- `Item.asin`, the product ASIN parsed from `Item.link` (`None` when the link is not a product page).
+
+### Changed
+
+- `Order.grand_total` now populated for Whole Foods Market orders (previously skipped as unsupported).
+- `Item.link` is now `Optional[str]` (`None` for items without an Amazon detail page).
+
+## [4.4.3](https://github.com/alexdlaird/amazon-orders/compare/4.4.2...4.4.3) - 2026-07-06
 
 ## [4.4.2](https://github.com/alexdlaird/amazon-orders/compare/4.4.1...4.4.2) - 2026-07-05
 
 ### Added
 
 - `request_timeout` config key (defaults to `None`) controlling the timeout passed to each HTTP request.
+- `Order.is_whole_foods`, identifying Whole Foods Market purchases (in-store/FOPO purchases and Whole Foods receipt orders).
+- `Order.item_count`, the number of items in a purchase when Amazon summarizes the count instead of listing the items (e.g. Whole Foods Market and eGift orders).
+- Full-details support for Whole Foods Market in-store purchases: when `full_details=True`, these orders are fetched from their dedicated `/fopo/order-details` page (which the standard order-details endpoint does not serve) and populate `items` (title, price, image, link, and whole-unit `quantity`), `subtotal`, `estimated_tax`, `payment_method`, and `payment_method_last_4`.
 
 ### Changed
 
 - `Order.order_number` now uses the caller-supplied value as a fallback when the order number cannot be parsed from the details page; previously documented but unintuitive behavior.
+- `Order.grand_total` is now populated for Whole Foods Market orders from the order history page (previously skipped as an unsupported order type).
+- `Item.link` is now optional (`None` for line items without an Amazon detail page, such as ASINLESS Whole Foods Market items) rather than raising when no link is present.
 
 ## [4.4.1](https://github.com/alexdlaird/amazon-orders/compare/4.4.0...4.4.1) - 2026-07-04
 

{amazon_orders-4.4.2/amazon_orders.egg-info → amazon_orders-4.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.2
+Version: 4.4.4
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>

{amazon_orders-4.4.2 → amazon_orders-4.4.4/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.2
+Version: 4.4.4
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/__init__.py

@@ -1,3 +1,3 @@
 __copyright__ = "Copyright (c) 2024-2025 Alex Laird"
 __license__ = "MIT"
-__version__ = "4.4.2"
+__version__ = "4.4.4"

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/cli.py

@@ -126,6 +126,8 @@ def amazon_orders_cli(ctx: Context,
 @click.option("--full-details", is_flag=True, default=False,
               help="Get the full details for each Order in the history. "
                    "This will execute an additional request per Order.")
+@click.option("--order-filter", "order_filter", default=None,
+              help="The order type filter to use.")
 def history(ctx: Context,
             **kwargs: Any) -> None:
     """
@@ -142,6 +144,7 @@ def history(ctx: Context,
         start_index = kwargs["start_index"]
         single_page = kwargs["single_page"]
         full_details = kwargs["full_details"]
+        order_filter = kwargs["order_filter"]
 
         exclusive_flags = [year, last_3_months, last_30_days]
         if not all(not item for item in exclusive_flags) and sum(exclusive_flags) == 1:
@@ -180,7 +183,8 @@ Order History for {filter_description}{optional_start_index}{optional_full_detai
                                                  start_index=start_index,
                                                  full_details=full_details,
                                                  keep_paging=not single_page,
-                                                 time_filter=time_filter):
+                                                 time_filter=time_filter,
+                                                 order_filter=order_filter):
             click.echo(f"{_order_output(o, config)}\n")
             total += 1
         end_time = time.time()
@@ -222,6 +226,67 @@ def order(ctx: Context,
         ctx.fail(str(e))
 
 
+@amazon_orders_cli.command()
+@click.pass_context
+@click.argument("order_id")
+def invoice(ctx: Context,
+            order_id: str) -> None:
+    """
+    Get the invoice for a given Amazon Order ID.
+    """
+    amazon_session = ctx.obj["amazon_session"]
+
+    try:
+        _authenticate(amazon_session)
+
+        config = ctx.obj["conf"]
+        amazon_orders = AmazonOrders(amazon_session,
+                                     config=config)
+
+        invoice_response = amazon_orders.get_invoice(order_id)
+
+        click.echo(invoice_response.response.text)
+    except AmazonOrdersAuthRedirectError:
+        _prompt_to_reauth_flow()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+
+@amazon_orders_cli.command("order-transactions")
+@click.pass_context
+@click.argument("order_id")
+def order_transactions(ctx: Context,
+                       order_id: str) -> None:
+    """
+    Get the Transactions for a given Amazon Order ID.
+    """
+    amazon_session = ctx.obj["amazon_session"]
+
+    try:
+        _authenticate(amazon_session)
+
+        config = ctx.obj["conf"]
+        amazon_transactions = AmazonTransactions(amazon_session,
+                                                 config=config)
+
+        start_time = time.time()
+        total = 0
+        for t in amazon_transactions.get_transactions(order_id=order_id):
+            click.echo(f"{_transaction_output(t, config)}\n")
+            total += 1
+        end_time = time.time()
+
+        click.echo(
+            "... {total} Transactions parsed in {time} seconds.\n".format(total=total,
+                                                                          time=int(end_time - start_time)))
+    except AmazonOrdersAuthRedirectError:
+        _prompt_to_reauth_flow()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+
 @amazon_orders_cli.command()
 @click.pass_context
 @click.option("--days", default=365,

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/constants.py

@@ -112,6 +112,7 @@ class Constants:
     ORDER_DETAILS_URL = f"{BASE_URL}/gp/your-account/order-details"
     ORDER_INVOICE_URL = f"{BASE_URL}/gp/css/summary/print.html"
     HISTORY_FILTER_QUERY_PARAM = "timeFilter"
+    ORDER_FILTER_QUERY_PARAM = "orderFilter"
 
     ##########################################################################
     # URLs for Transactions

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/entity/item.py

@@ -2,11 +2,13 @@ __copyright__ = "Copyright (c) 2024-2025 Alex Laird"
 __license__ = "MIT"
 
 import logging
+import re
 from datetime import date
 from typing import Optional, TypeVar
 
 from bs4 import Tag
 
+from amazonorders import util
 from amazonorders.conf import AmazonOrdersConfig
 from amazonorders.entity.parsable import Parsable
 from amazonorders.entity.seller import Seller
@@ -32,9 +34,12 @@ class Item(Parsable):
         #: The Item title.
         self.title: str = self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_TITLE_SELECTOR,
                                                  required=True)
-        #: The Item link.
-        self.link: str = self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_LINK_SELECTOR,
-                                                attr_name="href", required=True)
+        #: The Item link. ``None`` for items without an Amazon detail page (e.g. ASINLESS Whole Foods
+        #: Market line items).
+        self.link: Optional[str] = self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_LINK_SELECTOR,
+                                                          attr_name="href")
+        #: The product ASIN, derived from :attr:`link`; ``None`` when the link is not a product page.
+        self.asin: Optional[str] = self.safe_parse(self._parse_asin)
         #: The Item price.
         self.price: Optional[float] = self.to_currency(
             self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_PRICE_SELECTOR)
@@ -57,9 +62,8 @@ class Item(Parsable):
         self.image_link: Optional[str] = self.safe_simple_parse(
             selector=self.config.selectors.FIELD_ITEM_IMG_LINK_SELECTOR,
             attr_name="src")
-        #: The Item quantity.
-        self.quantity: Optional[int] = self.safe_simple_parse(
-            selector=self.config.selectors.FIELD_ITEM_QUANTITY_SELECTOR)
+        #: The Item quantity. ``None`` for items sold by weight (e.g. Whole Foods), which have no whole-unit count.
+        self.quantity: Optional[int] = self.safe_parse(self._parse_quantity)
 
     def __repr__(self) -> str:
         return f"<Item: \"{self.title}\">"
@@ -70,3 +74,24 @@ class Item(Parsable):
     def __lt__(self,
                other: ItemEntity) -> bool:
         return self.title < other.title
+
+    def _parse_asin(self) -> Optional[str]:
+        if not self.link:
+            return None
+        # ASIN only appears in the product URL path (/dp/, /gp/product/); no keyed attribute exists on order pages.
+        match = re.search(r"/(?:dp|gp/product|product)/([A-Z0-9]{10})(?:[/?]|$)", self.link)
+        return match.group(1) if match else None
+
+    def _parse_quantity(self) -> Optional[int]:
+        value = self.simple_parse(self.config.selectors.FIELD_ITEM_QUANTITY_SELECTOR)
+        if isinstance(value, int):
+            return value
+
+        # Whole Foods Market line items render quantity as "Qty: 1" (a whole count) or "Qty: 0.31 lb"
+        # (sold by weight, which has no integer quantity).
+        for tag in util.select(self.parsed, self.config.selectors.FIELD_ITEM_WHOLE_FOODS_QUANTITY_SELECTOR):
+            match = re.fullmatch(r"Qty:\s*(\d+)", tag.get_text(strip=True))
+            if match:
+                return int(match.group(1))
+
+        return None

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/entity/order.py

@@ -3,6 +3,7 @@ __license__ = "MIT"
 
 import json
 import logging
+import re
 from datetime import date
 from typing import Any, List, Optional, TypeVar, Union
 
@@ -52,6 +53,12 @@ class Order(Parsable):
         self.cancelled: bool = clone.cancelled if clone else bool(
             self.parsed and util.select(self.parsed, self.config.selectors.ORDER_SKIP_TOTALS))
 
+        #: ``True`` if this is a Whole Foods Market purchase (an in-store/FOPO purchase or a Whole Foods receipt
+        #: order). Unlike other unsupported order types, these expose a :attr:`grand_total` and (often) an
+        #: :attr:`item_count` on the history page, so those fields are populated.
+        self.is_whole_foods: bool = clone.is_whole_foods if clone else bool(
+            self.parsed and util.select(self.parsed, self.config.selectors.ORDER_WHOLE_FOODS))
+
         #: The Order Shipments.
         self.shipments: List[Shipment] = clone.shipments if clone else self._parse_shipments()
         #: The Order Items.
@@ -82,19 +89,19 @@ class Order(Parsable):
             parse_date=True)
         #: The Order Recipients.
         self.recipient: Recipient = clone.recipient if clone else self.safe_parse(self._parse_recipient)
+        #: The number of items in the purchase, when Amazon summarizes the count instead of listing the items
+        #: (e.g. Whole Foods Market orders show "N items in this purchase"). ``None`` when no such summary is shown.
+        self.item_count: Optional[int] = clone.item_count if clone else self.safe_parse(self._parse_item_count)
 
         # Fields below this point are only populated if `full_details` is True
 
-        #: The Order payment method. Only populated when ``full_details`` is ``True``.
-        self.payment_method: Optional[str] = self._if_full_details(
-            self.safe_simple_parse(selector=self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_SELECTOR,
-                                   attr_name="alt"))
+        #: The Order payment method. Only populated when ``full_details`` is ``True``. For Whole Foods Market
+        #: orders this is the card brand of the first payment method on the receipt (e.g. "Visa").
+        self.payment_method: Optional[str] = self._if_full_details(self._parse_payment_method())
         #: The Order payment method's last 4 digits. Only populated when ``full_details`` is ``True``.
-        self.payment_method_last_4: Optional[int] = self._if_full_details(
-            self.safe_simple_parse(selector=self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_LAST_4_SELECTOR,
-                                   prefix_split="ending in"))
+        self.payment_method_last_4: Optional[int] = self._if_full_details(self._parse_payment_method_last_4())
         #: The Order subtotal. Only populated when ``full_details`` is ``True``.
-        self.subtotal: Optional[float] = self._if_full_details(self._parse_currency("subtotal"))
+        self.subtotal: Optional[float] = self._if_full_details(self._parse_subtotal())
         #: The Order shipping total. Only populated when ``full_details`` is ``True``.
         self.shipping_total: Optional[float] = self._if_full_details(self._parse_currency("shipping"))
         #: The Order free shipping. Only populated when ``full_details`` is ``True``.
@@ -115,8 +122,9 @@ class Order(Parsable):
             else subscription_discount
         #: The Order total before tax. Only populated when ``full_details`` is ``True``.
         self.total_before_tax: Optional[float] = self._if_full_details(self._parse_currency("before tax"))
-        #: The Order estimated tax. Only populated when ``full_details`` is ``True``.
-        self.estimated_tax: Optional[float] = self._if_full_details(self._parse_currency("estimated tax"))
+        #: The Order estimated tax. Only populated when ``full_details`` is ``True``. For Whole Foods Market
+        #: orders this is the "Tax and Fees" total from the receipt.
+        self.estimated_tax: Optional[float] = self._if_full_details(self._parse_estimated_tax())
         #: The Order refund total. Only populated when ``full_details`` is ``True``.
         self.refund_total: Optional[float] = self._if_full_details(self._parse_currency("refund total"))
         #: The Multibuy discount. Only populated when ``full_details`` is ``True``.
@@ -167,8 +175,9 @@ class Order(Parsable):
         if len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_TOTALS)) > 0:
             return None
 
-        # Skip totals parsing for unsupported order types (Fresh, Whole Foods, physical stores)
-        if len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
+        # Skip totals parsing for unsupported order types (Amazon Fresh, physical stores). Whole Foods Market
+        # orders also match ORDER_SKIP_ITEMS, but they expose a grand total on the history page, so parse it.
+        if not self.is_whole_foods and len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
             return None
 
         value = self.simple_parse(self.config.selectors.FIELD_ORDER_GRAND_TOTAL_SELECTOR)
@@ -193,6 +202,42 @@ class Order(Parsable):
 
         return value
 
+    def _parse_whole_foods_amount(self,
+                                  selector: str) -> Optional[float]:
+        return self.to_currency(self.simple_parse(selector))
+
+    def _parse_payment_method(self) -> Optional[str]:
+        if self.is_whole_foods:
+            return self.safe_simple_parse(
+                selector=self.config.selectors.FIELD_ORDER_WHOLE_FOODS_PAYMENT_METHOD_SELECTOR)
+        return self.safe_simple_parse(selector=self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_SELECTOR,
+                                      attr_name="alt")
+
+    def _parse_payment_method_last_4(self) -> Optional[int]:
+        if self.is_whole_foods:
+            return self.safe_simple_parse(
+                selector=self.config.selectors.FIELD_ORDER_WHOLE_FOODS_PAYMENT_LAST_4_SELECTOR, prefix_split="*")
+        return self.safe_simple_parse(selector=self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_LAST_4_SELECTOR,
+                                      prefix_split="ending in")
+
+    def _parse_subtotal(self) -> Optional[float]:
+        if self.is_whole_foods:
+            return self._parse_whole_foods_amount(self.config.selectors.FIELD_ORDER_WHOLE_FOODS_SUBTOTAL_SELECTOR)
+        return self._parse_currency("subtotal")
+
+    def _parse_estimated_tax(self) -> Optional[float]:
+        if self.is_whole_foods:
+            return self._parse_whole_foods_amount(self.config.selectors.FIELD_ORDER_WHOLE_FOODS_TAX_SELECTOR)
+        return self._parse_currency("estimated tax")
+
+    def _parse_item_count(self) -> Optional[int]:
+        for tag in util.select(self.parsed, self.config.selectors.FIELD_ORDER_ITEM_COUNT_SELECTOR):
+            match = re.search(r"(\d+)\s+items?\s+in this purchase", tag.text)
+            if match:
+                return int(match.group(1))
+
+        return None
+
     def _parse_recipient(self) -> Optional[Recipient]:
         # At least for now, we don't populate Recipient data for digital orders
         if util.select_one(self.parsed, self.config.selectors.FIELD_ORDER_GIFT_CARD_INSTANCE_SELECTOR):

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/orders.py

@@ -6,6 +6,7 @@ import concurrent.futures
 import datetime
 import logging
 from typing import Any, Callable, List, Optional
+from urllib.parse import quote
 
 from bs4 import Tag
 
@@ -103,7 +104,8 @@ class AmazonOrders:
                           start_index: Optional[int] = None,
                           full_details: bool = False,
                           keep_paging: bool = True,
-                          time_filter: Optional[str] = None) -> List[Order]:
+                          time_filter: Optional[str] = None,
+                          order_filter: Optional[str] = None) -> List[Order]:
         """
         Get the Amazon Order history for a given time period.
 
@@ -119,6 +121,7 @@ class AmazonOrders:
         :param time_filter: The time filter to use. Supported values are ``"last30"`` (last 30 days),
             ``"months-3"`` (past 3 months), or ``"year-YYYY"`` (specific year). If provided, this takes
             precedence over the ``year`` parameter.
+        :param order_filter: The order type filter to use. If provided, appended alongside the time filter.
         :return: A list of the requested Orders.
         """
         if not self.amazon_session.is_authenticated:
@@ -144,12 +147,17 @@ class AmazonOrders:
             filter_value = f"year-{year}"
 
         optional_start_index = f"&startIndex={start_index}" if start_index else ""
+        optional_order_filter = (
+            f"&{self.config.constants.ORDER_FILTER_QUERY_PARAM}={quote(order_filter, safe='')}"
+            if order_filter else ""
+        )
         next_page: Optional[str] = (
-            "{url}?{query_param}={filter_value}{optional_start_index}"
+            "{url}?{query_param}={filter_value}{optional_order_filter}{optional_start_index}"
         ).format(
             url=self.config.constants.ORDER_HISTORY_URL,
             query_param=self.config.constants.HISTORY_FILTER_QUERY_PARAM,
             filter_value=filter_value,
+            optional_order_filter=optional_order_filter,
             optional_start_index=optional_start_index
         )
 
@@ -208,7 +216,17 @@ class AmazonOrders:
         order: Order = self.config.order_cls(order_tag, self.config, index=current_index)
 
         if full_details:
-            if len(util.select(order.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
+            if order.is_whole_foods:
+                # Whole Foods orders are served by a dedicated details page (the in-store/FOPO page or the
+                # receipt page), never the standard order-details endpoint, so only fetch full details when
+                # the history page linked us to one of those routes.
+                link = order.order_details_link or ""
+                if "/fopo/order-details" in link or "/wholefoodsmarket/receipts/order/" in link:
+                    order = self._get_whole_foods_order(order, link)
+                else:
+                    logger.warning(f"Order {order.order_number} is a Whole Foods Market order whose details "
+                                   f"page could not be located, so it was left partially populated.")
+            elif len(util.select(order.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
                 logger.warning(f"Order {order.order_number} was partially populated, "
                                f"since it is an unsupported Order type.")
             elif not order.order_number:
@@ -219,6 +237,24 @@ class AmazonOrders:
 
         return order
 
+    def _get_whole_foods_order(self,
+                               order: Order,
+                               url: str) -> Order:
+        """Fetches the WFM dedicated details page and returns the order enriched with per-item details."""
+        details_response = self.amazon_session.get(url)
+        self.amazon_session.check_response(details_response, meta={"index": order.index})
+
+        details_tag = util.select_one(details_response.parsed,
+                                      self.config.selectors.ORDER_DETAILS_ENTITY_SELECTOR)
+
+        if not details_tag:
+            logger.warning(f"Could not parse Whole Foods Market details for Order {order.order_number}, "
+                           f"so it was left partially populated.")
+            return order
+
+        return self.config.order_cls(details_tag, self.config, full_details=True, clone=order,
+                                     order_number=order.order_number)
+
     async def _async_wrapper(self,
                              func: Callable,
                              *args: Any) -> Order:

{amazon_orders-4.4.2 → amazon_orders-4.4.4}/amazonorders/selectors.py

@@ -86,23 +86,34 @@ class Selectors:
                                      "div.order"]
     ORDER_HISTORY_COUNT_SELECTOR = ".js-yo-container span.num-orders"
     ORDER_DETAILS_ENTITY_SELECTOR = ["div#orderDetails",
-                                     "div#ordersContainer"]
+                                     "div#ordersContainer",
+                                     "div#odp-main-section"]
     ITEM_ENTITY_SELECTOR = ["[data-component='purchasedItems'] .a-fixed-left-grid",
                             "div:has(> div.yohtmlc-item)",
-                            ".item-box"]
+                            ".item-box",
+                            # WFM in-store line items
+                            "div.a-row.a-spacing-base:has(img.ufpo-itemListWidget-image)"]
     SHIPMENT_ENTITY_SELECTOR = ["[data-component='orderCard'] [data-component='shipments'] .a-box",
                                 "div.shipment",
                                 "div.delivery-box"]
     # Selectors defined here mean we don't have a reliable way to parse all details in an Order, so Items and
     # Shipments will be skipped
     ORDER_SKIP_ITEMS = [
-        # Identifies an Amazon Fresh order
+        # Identifies an Amazon Fresh order (also matched by WFM in-store; distinguished via ORDER_WHOLE_FOODS)
         ".brand-info-box .brand-logo img",
-        # Identifies a Whole Foods Market order
+        # Identifies a Whole Foods Market receipt order
         "a.yohtmlc-order-details-link[href^='/wholefoodsmarket']",
         # Identifies an order from a physical Amazon store
         Selector("div.yohtmlc-shipment-status-primaryText", "Purchased at Amazon")
     ]
+    # Selectors identifying a Whole Foods Market purchase. Unlike ORDER_SKIP_ITEMS entries, WFM orders
+    # expose a grand_total (and often item_count) on the history page, so those fields are populated.
+    ORDER_WHOLE_FOODS = [
+        "a[href*='/wholefoodsmarket/receipts/order/']",
+        "a[href*='/fopo/order-details']",
+        Selector("div.yohtmlc-shipment-status-primaryText", text_contains="Whole Foods Market"),
+        "img.ufpo-itemListWidget-image"
+    ]
     # Selectors defined here mean the Order will not have parsable totals
     ORDER_SKIP_TOTALS = [
         # Identifies a cancelled order on the history page
@@ -115,19 +126,28 @@ class Selectors:
     # CSS selectors for Item fields
     #####################################
 
-    FIELD_ITEM_IMG_LINK_SELECTOR = "a img"
+    # Last entry matches WFM in-store line items
+    FIELD_ITEM_IMG_LINK_SELECTOR = ["a img",
+                                    "img.ufpo-itemListWidget-image"]
     FIELD_ITEM_QUANTITY_SELECTOR = [".od-item-view-qty",
                                     "span.item-view-qty",
                                     "span.product-image__qty"]
+    # WFM items render "Qty: N" or "Qty: 0.31 lb"; extracted in Item._parse_quantity
+    FIELD_ITEM_WHOLE_FOODS_QUANTITY_SELECTOR = ["span.a-size-small"]
     FIELD_ITEM_TITLE_SELECTOR = ["[data-component='itemTitle']",
-                                 ".yohtmlc-item a", ".yohtmlc-product-title"]
+                                 ".yohtmlc-item a", ".yohtmlc-product-title",
+                                 "div.a-column.a-span10 > a",
+                                 # ASINLESS WFM items render the title in a span rather than a link
+                                 "div.a-column.a-span10 > span"]
     FIELD_ITEM_LINK_SELECTOR = ["[data-component='itemTitle'] a",
                                 ".yohtmlc-item a",
                                 "a:has(> .yohtmlc-product-title)",
-                                ".yohtmlc-product-title a"]
+                                ".yohtmlc-product-title a",
+                                "div.a-column.a-span10 > a"]
     FIELD_ITEM_TAG_ITERATOR_SELECTOR = [".yohtmlc-item div"]
     FIELD_ITEM_PRICE_SELECTOR = ["[data-component='unitPrice'] .a-text-price :not(.a-offscreen)",
-                                 ".yohtmlc-item .a-color-price"]
+                                 ".yohtmlc-item .a-color-price",
+                                 "div.a-section.a-text-right span.a-size-small"]
     FIELD_ITEM_SELLER_SELECTOR = ["[data-component='orderedMerchant']"] + FIELD_ITEM_TAG_ITERATOR_SELECTOR
     FIELD_ITEM_RETURN_SELECTOR = ["[data-component='itemReturnEligibility']"] + FIELD_ITEM_TAG_ITERATOR_SELECTOR
 
@@ -138,7 +158,9 @@ class Selectors:
     FIELD_ORDER_DETAILS_LINK_SELECTOR = ["a.yohtmlc-order-details-link",
                                          # Would like to use this or similar, but not yet sure how consistent it is
                                          # ".order-header__header-link-list-item:first-of-type a"
-                                         ]
+                                         # WFM receipt and FOPO orders link to dedicated pages, not standard endpoint
+                                         "a[href*='/wholefoodsmarket/receipts/order/']",
+                                         "a[href*='/fopo/order-details']"]
     FIELD_ORDER_NUMBER_SELECTOR = ["[data-component='orderId']",
                                    "[data-component='briefOrderInfo'] div.a-column",
                                    ".order-date-invoice-item :is(bdi, span)[dir='ltr']",
@@ -146,7 +168,13 @@ class Selectors:
                                    ":is(bdi, span)[dir='ltr']"]
     FIELD_ORDER_GRAND_TOTAL_SELECTOR = ["div.yohtmlc-order-total span.value",
                                         "div.order-header div.a-column.a-span2",
-                                        "div.order-header div.a-col-left .a-span9"]
+                                        "div.order-header div.a-col-left .a-span9",
+                                        "#wfm-grand-total-amount"]
+    # WFM in-store (FOPO) details page amounts
+    FIELD_ORDER_WHOLE_FOODS_SUBTOTAL_SELECTOR = "#wfm-subtotal-amount"
+    FIELD_ORDER_WHOLE_FOODS_TAX_SELECTOR = "#wfm-tax-total-amount"
+    FIELD_ORDER_WHOLE_FOODS_PAYMENT_METHOD_SELECTOR = "#wfm-0-card-brand"
+    FIELD_ORDER_WHOLE_FOODS_PAYMENT_LAST_4_SELECTOR = "#wfm-0-card-tail"
     FIELD_ORDER_PLACED_DATE_SELECTOR = ["[data-component='orderDate']",
                                         "span.order-date-invoice-item",
                                         "[data-component='briefOrderInfo'] div.a-column",
@@ -162,6 +190,8 @@ class Selectors:
     FIELD_ORDER_ADDRESS_FALLBACK_1_SELECTOR = "div.recipient span.a-declarative"
     FIELD_ORDER_ADDRESS_FALLBACK_2_SELECTOR = "script[id^='shipToData']"
     FIELD_ORDER_GIFT_CARD_INSTANCE_SELECTOR = ".gift-card-instance"
+    FIELD_ORDER_ITEM_COUNT_SELECTOR = ["div.a-fixed-left-grid-col.a-col-right span",
+                                       "span"]
 
     #####################################
     # CSS selectors for Shipment fields