Skip to content

Commit

Permalink
Merge pull request #1343 from sacr3dc0w/order-link
Browse files Browse the repository at this point in the history
Add link to order status in account menu when viewing order
  • Loading branch information
junedkazi authored Sep 9, 2018
2 parents f19db83 + 68bea18 commit 29def1e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Fix encoding issues on Account Signup Form ("'" characters showing in country name)[#1341] (https://github.com/bigcommerce/cornerstone/pull/1341)
- Require Webpack config only when used (reduce time to be ready for receiving messages from stencil-cli). [#1334](https://github.com/bigcommerce/cornerstone/pull/1334)
- Fixed amp page error related to store logo [#1323](https://github.com/bigcommerce/cornerstone/pull/1323)
- Add link to order status in account menu when viewing order [#1343](https://github.com/bigcommerce/cornerstone/pull/1343)

## 2.3.2 (2018-08-17)
- Fix zoom behavior for small images in gallery (turn off zoom if image is too small). [#1325](https://github.com/bigcommerce/cornerstone/pull/1325)
Expand Down
8 changes: 7 additions & 1 deletion templates/components/account/navigation.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<nav class="navBar navBar--sub navBar--account">
<ul class="navBar-section">
{{#if account_page '===' 'orders'}}
<li class="navBar-item is-active">{{lang 'account.nav.orders'}}</li>
{{#if page_type '===' 'account_order'}}
<li class="navBar-item is-active">
<a class="navBar-action" href="{{urls.account.orders.all}}">{{lang 'account.nav.orders'}}</a>
</li>
{{else}}
<li class="navBar-item is-active">{{lang 'account.nav.orders'}}</li>
{{/if}}
{{else}}
<li class="navBar-item">
<a class="navBar-action" href="{{urls.account.orders.all}}">{{lang 'account.nav.orders'}}</a>
Expand Down

0 comments on commit 29def1e

Please sign in to comment.