Commits · a03634096c49425bc95f60fdd443cb8be846b2fb · Ascend / ecommerce-maven · GitLab

13 May, 2021 10 commits
- settled merge conflicts · a0363409
  Christopher Cottier authored May 13, 2021
  
  a0363409
- Merge branch 'AFP68-pipeline-user-session-place-order' into 'Dev' · 91cbb5a3
  Christopher Cottier authored May 13, 2021
```
Afp68 pipeline user session place order

See merge request !24
```
  91cbb5a3
- All done · 9148032f
  Kyle Muldoon authored May 13, 2021
  
  9148032f
- All done · ec73ed49
  Kyle Muldoon authored May 13, 2021
  
  ec73ed49
- politely ask user to login to view order history · f0176d4a
  Christopher Cottier authored May 13, 2021
  
  f0176d4a
- added return to market button on order confirmation page · 4837a997
  Christopher Cottier authored May 13, 2021
  
  4837a997
- redirect to order confirmation upon order submission · 87f18bac
  Christopher Cottier authored May 13, 2021
  
  87f18bac
- protect place order button if user not logged in · 1240e5af
  Christopher Cottier authored May 13, 2021
  
  1240e5af
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into... · 762f9031
  Christopher Cottier authored May 13, 2021
```
Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-46/order-confirmation-page
```
  762f9031
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into... · c7e9eb4f
  Kyle Muldoon authored May 13, 2021
```
Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP68-pipeline-user-session-place-order
```
  c7e9eb4f
12 May, 2021 30 commits
- Order formatted according to spec provided, getting error from backend. almost done · 2fed9e4d
  Kyle Muldoon authored May 13, 2021
  
  2fed9e4d
- Like half way through moving logic to utils / reducers. Order placement so... · f799f576
  Kyle Muldoon authored May 13, 2021
```
Like half way through moving logic to utils / reducers. Order placement so close to working. Backend issue is ocurring
```
  f799f576
- Merge branch 'application-url-config' into 'Dev' · 7ba895fe
  Kyle Muldoon authored May 13, 2021
```
Application url config

See merge request !23
```
  7ba895fe
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into application-url-config · f51e106c
  Christopher Cottier authored May 12, 2021
  
  f51e106c
- Services updated to use values from properties file · 2809ab4e
  Christopher Cottier authored May 12, 2021
  
  2809ab4e
- refactored app configuration to read external service urls from application properties · 38a921c1
  Christopher Cottier authored May 12, 2021
  
  38a921c1
- committing package lock changes from npm installation · 258280dc
  Kyle Muldoon authored May 12, 2021
  
  258280dc
- Merge branch 'AFP45-Display-User-Cart-And-Update-Items-Within' into 'Dev' · ff68d617
  Christopher Cottier authored May 12, 2021
```
Afp45 display user cart and update items within

See merge request !22
```
  ff68d617
- Merge branch 'AFP45-Display-User-Cart-And-Update-Items-Within' of... · abb83311
  Christopher Cottier authored May 12, 2021
```
Merge branch 'AFP45-Display-User-Cart-And-Update-Items-Within' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP45-Display-User-Cart-And-Update-Items-Within
```
  abb83311
- user cannot access cart if not logged in · b9273ddd
  Christopher Cottier authored May 12, 2021
  
  b9273ddd
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into... · 239c8505
  Kyle Muldoon authored May 12, 2021
```
Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP45-Display-User-Cart-And-Update-Items-Within
```
  239c8505
- config adjustments · 3cdd2228
  Christopher Cottier authored May 12, 2021
  
  3cdd2228
- Done with ticket for now · 6994d175
  Kyle Muldoon authored May 12, 2021
  
  6994d175
- injecting url values from properties, in progress · d89cbfd8
  Christopher Cottier authored May 12, 2021
  
  d89cbfd8
- removed dummy data from order reducer, installed dependencies · 86035de0
  Christopher Cottier authored May 12, 2021
  
  86035de0
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into... · dd3491f5
  Christopher Cottier authored May 12, 2021
```
Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-46/order-confirmation-page
```
  dd3491f5
- Merge branch 'AFP-80-Header-nav-links' into 'Dev' · 16fff575
  Christopher Cottier authored May 12, 2021
```
AFP 80 fixed header nav links bug

See merge request !18
```
  16fff575
- Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into... · bace6a5f
  Christopher Cottier authored May 12, 2021
```
Merge branch 'Dev' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP-46/order-confirmation-page
```
  bace6a5f
- 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
- Merge branch 'AFP-80-Header-nav-links' of... · 540ad024
  Kyle Muldoon authored May 12, 2021
```
Merge branch 'AFP-80-Header-nav-links' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP45-Display-User-Cart-And-Update-Items-Within
```
  540ad024
- messing with nav links · 267d5e1b
  Kyle Muldoon authored May 12, 2021
  
  267d5e1b
- AFP 80 fixed header nav links bug · 94a569bb
  Xiyang Lu authored May 12, 2021
  
  94a569bb
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 681d911d
  Kyle Muldoon authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP45-Display-User-Cart-And-Update-Items-Within
```
  681d911d
- Update deployment.yaml · 8ef8acc9
  Veera Venkata Siva S Villa authored May 12, 2021
  
  8ef8acc9
- Update deployment.yaml · 72fe20ec
  Veera Venkata Siva S Villa authored May 12, 2021
  
  72fe20ec
- [nmoosapet]Changes in YML for ecom web configuration · 04083fed
  Nikitha Moosapet authored May 12, 2021
  
  04083fed
- Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven... · 5eb2e522
  Kyle Muldoon authored May 12, 2021
```
Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into AFP45-Display-User-Cart-And-Update-Items-Within

Pulling UI changes into this branch
```
  5eb2e522
- Delete item from cart updates backend and componenet, not redux state though.... · 59ca132e
  Kyle Muldoon authored May 12, 2021
```
Delete item from cart updates backend and componenet, not redux state though. Also cleaned up debug code in checkout component
```
  59ca132e
- Update deployment.yaml · 40e8df70
  Nikitha Moosapet authored May 12, 2021
  
  40e8df70