Commits · 3662cf0e4f4f45f7ca01d29e50e6c4801b0b147b · Ascend / ecommerce-maven · GitLab

12 May, 2021 12 commits
- alternating backgrounds if more than one order in history · 3662cf0e
  Christopher Cottier authored May 12, 2021
  
  3662cf0e
- new order styling · 18b73f8d
  Christopher Cottier authored May 12, 2021
  
  18b73f8d
- added backend route to fid product by sku, now showing order item picture in order item component · af565466
  Christopher Cottier authored May 12, 2021
  
  af565466
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 91f52122
  Christopher Cottier authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-46/order-confirmation-page
```
  91f52122
- Merge branch 'AFP-80-Header-Upgrade' into 'master' · 59df5e39
  Christopher Cottier authored May 12, 2021
```
Afp 80 header upgrade

See merge request !16
```
  59df5e39
- removed debugger · fd8aca43
  Christopher Cottier authored May 12, 2021
  
  fd8aca43
- afp 80 upgrade header and push to qa · 3285a2f5
  Xiyang Lu authored May 12, 2021
  
  3285a2f5
- order confirmation page uses order component to display order details · 11683e89
  Christopher Cottier authored May 12, 2021
  
  11683e89
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 6cf009ec
  Xiyang Lu authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-80-Header-Upgrade
ly if it merges an updated upstream into a topic branch.
```
  6cf009ec
- [AFP 80] Joe header style upgrade · 0ece723c
  Xiyang Lu authored May 12, 2021
  
  0ece723c
- Merge branch 'AFP-127/add-promotions-to-post-order' into 'master' · fdecf06b
  Christopher Cottier authored May 12, 2021
```
Afp 127/add promotions to post order

See merge request !15
```
  fdecf06b
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 4b3273ec
  Christopher Cottier authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-127/add-promotions-to-post-order
```
  4b3273ec
11 May, 2021 28 commits
- Update deployment.yaml · 5e676eed
  Veera Venkata Siva S Villa authored May 12, 2021
  
  5e676eed
- Update deployment.yaml · 9473942e
  Veera Venkata Siva S Villa authored May 12, 2021
  
  9473942e
- Update deployment.yaml · 9a5d467a
  Veera Venkata Siva S Villa authored May 12, 2021
  
  9a5d467a
- Update deployment.yaml · 83adf762
  Veera Venkata Siva S Villa authored May 12, 2021
  
  83adf762
- [nmoosapet]Changes in YML configuration · 918ee39f
  Nikitha Moosapet authored May 12, 2021
  
  918ee39f
- [nmoosapet]Changes in YML configuration · 7370f84f
  Nikitha Moosapet authored May 12, 2021
  
  7370f84f
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 370b2394
  Christopher Cottier authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-127/add-promotions-to-post-order
```
  370b2394
- proper state management of order history · 8a4d479a
  Christopher Cottier authored May 12, 2021
  
  8a4d479a
- Merge branch 'AFP11Devops' into 'master' · 92f37ee0
  Nikitha Moosapet authored May 12, 2021
```
[nmoosapet]Adding new Dockerfile configuration

See merge request !14
```
  92f37ee0
- [nmoosapet]Adding new Dockerfile configuration · 4b4d2542
  Nikitha Moosapet authored May 12, 2021
  
  4b4d2542
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 0988926b
  Christopher Cottier authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-127/add-promotions-to-post-order
```
  0988926b
- promotions applied to items upon ordering · a5671314
  Christopher Cottier authored May 12, 2021
  
  a5671314
- debugging with sai · 3a54dfd3
  Christopher Cottier authored May 11, 2021
  
  3a54dfd3
- Merge branch 'AFP68-OrderPage' into 'master' · 3181467b
  Shaphen Pangburn authored May 11, 2021
```
Afp68 order page

See merge request !13
```
  3181467b
- Done with ticket · 132f13f0
  Kyle Muldoon authored May 11, 2021
  
  132f13f0
- done with AFP-68 · 8dc817c7
  Kyle Muldoon authored May 11, 2021
  
  8dc817c7
- resolve conflict in cart action js · 396c82b7
  Xiyang Lu authored May 11, 2021
  
  396c82b7
- resolve conflict · 08831eb5
  Xiyang Lu authored May 11, 2021
  
  08831eb5
- resolve pull conflict · e01ef5cd
  Xiyang Lu authored May 11, 2021
  
  e01ef5cd
- error handling for navigating to order history with no user · da9a9de0
  Christopher Cottier authored May 11, 2021
  
  da9a9de0
- [Team]: Fix Add to Cart modal form and close modal after form submission · 1f99e20f
  Shaphen Pangburn authored May 11, 2021
  
  1f99e20f
- order history page now grabbing history from get orders by id route · 77ba1f47
  Christopher Cottier authored May 11, 2021
  
  77ba1f47
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP68-OrderPage · 754319bc
  Kyle Muldoon authored May 11, 2021
  
  754319bc
- Merge branch 'product-page-users-can-add-one-or-more-item-to-cart-with-a-button' into 'master' · 1be1a354
  Kyle Muldoon authored May 11, 2021
```
Product page users can add one or more item to cart with a button

See merge request !11
```
  1be1a354
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven · 815d53c2
  Xiyang Lu authored May 11, 2021
  
  815d53c2
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 621928da
  Shaphen Pangburn authored May 11, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into product-page-users-can-add-one-or-more-item-to-cart-with-a-button
```
  621928da
- Merge branch 'AFP-128/config-api-endpoints' into 'master' · 9725c51d
  Kyle Muldoon authored May 11, 2021
```
Afp 128/config api endpoints

See merge request !10
```
  9725c51d
- [AFP-48 Shaphen Pangburn]: Clear global state cart when logging out · 198d7348
  Shaphen Pangburn authored May 11, 2021
  
  198d7348