diff --git a/CHANGELOG.md b/CHANGELOG.md index e74c48430f..51972410b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Draft - Fix shipment info showing for cancelled orders [#2654](https://github.com/bigcommerce/cornerstone/pull/2654) +- Render backorder prompts on My Account "Your orders" page [#2650](https://github.com/bigcommerce/cornerstone/pull/2650) ## 6.19.1 (04-09-2026) - Update stencil-utils versionto 6.23.0 [#2638](https://github.com/bigcommerce/cornerstone/pull/2638) diff --git a/assets/scss/components/stencil/account/_account.scss b/assets/scss/components/stencil/account/_account.scss index 87b5a0bab3..4c6e9d3a6d 100644 --- a/assets/scss/components/stencil/account/_account.scss +++ b/assets/scss/components/stencil/account/_account.scss @@ -149,6 +149,22 @@ margin-bottom: 0; } +.account-product-backorder-prompts { + font-size: fontSize("smaller"); + margin-bottom: spacing("quarter"); + + &:last-of-type { + margin-bottom: 0; + } +} + +.account-order-backorder-expectation { + color: color("greys", "light"); + font-size: fontSize("smaller"); + margin-bottom: 0; + margin-top: spacing("base"); +} + .account-product-details { @include grid-row($behavior: "nest"); } diff --git a/package-lock.json b/package-lock.json index 13d38eee83..6c6bd63f43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "bigcommerce-cornerstone", - "version": "6.19.0", + "version": "6.19.1", "license": "MIT", "dependencies": { "@bigcommerce/stencil-utils": "6.23.0", diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html index 411e9e0e4b..50b72cad15 100644 --- a/templates/components/account/order-contents.html +++ b/templates/components/account/order-contents.html @@ -83,6 +83,15 @@
{{brand.name}}
{{/if}} + {{#if quantity_backordered '>' 0}} + {{#if (subtract quantity quantity_backordered) '>' 0}} +

{{lang 'products.quantity_on_hand' quantity=(subtract quantity quantity_backordered)}}

+ {{/if}} +

{{lang 'products.quantity_backordered' quantity=quantity_backordered}}

+ {{#if backorder_message}} +

{{backorder_message}}

+ {{/if}} + {{/if}} {{#if refunded}}

{{lang 'account.orders.refunded_quantity' qty=refunded_qty}}

{{else}} diff --git a/templates/pages/account/orders/details.html b/templates/pages/account/orders/details.html index 8d7e752f9c..c669ad5627 100644 --- a/templates/pages/account/orders/details.html +++ b/templates/pages/account/orders/details.html @@ -69,6 +69,9 @@

{{lang 'account.orders.details.ship_to'}}

  • {{{ sanitize order.shipping_address.city}}}, {{{ sanitize order.shipping_address.state}}} {{{ sanitize order.shipping_address.zip}}}
  • {{{ sanitize order.shipping_address.country}}}
  • + {{#if order.backorder_shipping_expectation_message}} +

    {{order.backorder_shipping_expectation_message}}

    + {{/if}} {{/if}} {{#if order.pickup_addresses}} @@ -112,6 +115,9 @@

    {{lang 'account.orders.details.ship_to'}}

    {{lang 'account.orders.details.ship_to_multi_text'}}
    + {{#if order.backorder_shipping_expectation_message}} +

    {{order.backorder_shipping_expectation_message}}

    + {{/if}} {{/if}} {{/if}}