From 0abb74bb13f42e46f6597722c61221138bd58d90 Mon Sep 17 00:00:00 2001 From: "shawn.wang" Date: Mon, 4 May 2026 14:13:34 +1000 Subject: [PATCH 1/3] feat(orders): BACK-508 Render backorder prompts on Storefront "Your orders" page (My Account section for a logged in user) --- .../components/stencil/account/_account.scss | 16 ++++++++++++++++ package-lock.json | 2 +- templates/components/account/order-contents.html | 9 +++++++++ templates/pages/account/orders/details.html | 6 ++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/assets/scss/components/stencil/account/_account.scss b/assets/scss/components/stencil/account/_account.scss index 87b5a0bab3..e4370dfb60 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-message { + 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..0296e0ee46 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}} + {{#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}} + {{#if backorder_message}} +

{{backorder_message}}

+ {{/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}} From 6ecfceacf5b74421691c5480a81ad2e6c8c4d784 Mon Sep 17 00:00:00 2001 From: "shawn.wang" Date: Fri, 8 May 2026 10:14:01 +1000 Subject: [PATCH 2/3] feat(orders): BACK-508 Render backorder prompts on Storefront "Your orders" page (My Account section for a logged in user) - improve style and logic --- assets/scss/components/stencil/account/_account.scss | 2 +- templates/components/account/order-contents.html | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/scss/components/stencil/account/_account.scss b/assets/scss/components/stencil/account/_account.scss index e4370dfb60..4c6e9d3a6d 100644 --- a/assets/scss/components/stencil/account/_account.scss +++ b/assets/scss/components/stencil/account/_account.scss @@ -149,7 +149,7 @@ margin-bottom: 0; } -.account-product-backorder-message { +.account-product-backorder-prompts { font-size: fontSize("smaller"); margin-bottom: spacing("quarter"); diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html index 0296e0ee46..50b72cad15 100644 --- a/templates/components/account/order-contents.html +++ b/templates/components/account/order-contents.html @@ -83,14 +83,14 @@
    {{brand.name}}
    {{/if}} - {{#if quantity_backordered}} + {{#if quantity_backordered '>' 0}} {{#if (subtract quantity quantity_backordered) '>' 0}} - + + {{/if}} + + {{#if backorder_message}} + {{/if}} - - {{/if}} - {{#if backorder_message}} - {{/if}} {{#if refunded}} From 543f6f931df93e07ac10d61f62555977b75eeac1 Mon Sep 17 00:00:00 2001 From: "shawn.wang" Date: Mon, 11 May 2026 09:00:39 +1000 Subject: [PATCH 3/3] feat(orders): BACK-508 Render backorder prompts on Storefront "Your orders" page (My Account section for a logged in user) - changed CHANGELOG.md # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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)