Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ecommerce-maven
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
ecommerce-maven
Commits
da9a9de0
Commit
da9a9de0
authored
May 11, 2021
by
Christopher Cottier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error handling for navigating to order history with no user
parent
77ba1f47
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
OrderService.java
...main/java/com/nisum/ecomservice/service/OrderService.java
+1
-0
order-history.css
ecom-web/src/components/order-history/order-history.css
+6
-0
order-history.jsx
ecom-web/src/components/order-history/order-history.jsx
+5
-3
No files found.
ecom-service/src/main/java/com/nisum/ecomservice/service/OrderService.java
View file @
da9a9de0
...
...
@@ -25,6 +25,7 @@ public class OrderService {
Address
address
=
orderRequest
.
getAddress
();
CartPostDTO
cart
=
orderRequest
.
getCart
();
//for each item grab product details from products API
List
<
Mono
<
Product
>>
productsToOrder
=
cart
.
getCartItems
().
stream
()
.
map
(
cartItem
->
cartItem
.
getProductRef
().
getSku
())
...
...
ecom-web/src/components/order-history/order-history.css
View file @
da9a9de0
...
...
@@ -23,3 +23,9 @@ main {
.order-field
{
font-weight
:
600
;
}
#order-history-header
{
font-size
:
40px
;
text-align
:
center
;
padding
:
10px
;
}
ecom-web/src/components/order-history/order-history.jsx
View file @
da9a9de0
...
...
@@ -13,7 +13,7 @@ const OrderHistory = () => {
const
{
currentUser
}
=
useSelector
(
state
=>
state
.
user
);
useEffect
(
async
()
=>
{
if
(
callMade
)
return
;
if
(
callMade
||
currentUser
===
null
)
return
;
const
userHistory
=
await
getOrderHistory
(
currentUser
.
userId
);
//insert user id from user details stored in redux
setOrderHistory
(
userHistory
);
setCallMade
(
true
);
...
...
@@ -21,8 +21,10 @@ const OrderHistory = () => {
return
(
<
main
>
<
h1
>
Order History
</
h1
>
<
h1
id=
"order-history-header"
>
Order History
</
h1
>
{
currentUser
===
null
?
(
<
div
>
Please login to place orders!
</
div
>
)
:
null
}
<
div
id=
"orders"
>
{
orderHistory
.
map
(
order
=>
{
return
<
Order
order=
{
order
}
/>;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment