diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index 3a211d1..3b0c086 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -26,11 +26,11 @@ - + - - + + @@ -38,82 +38,32 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - - - + + + - - + + - - - - - - - - - + + + @@ -229,7 +179,6 @@ @@ -1038,12 +988,12 @@ - + - @@ -1144,13 +1094,6 @@ - - - - - - - @@ -1301,14 +1244,6 @@ - - - - - - - - @@ -1425,14 +1360,6 @@ - - - - - - - - @@ -1559,13 +1486,37 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java b/bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java index 7e59f6b..6a4fb5b 100644 --- a/bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java +++ b/bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java @@ -3,6 +3,7 @@ package com.bookstore.resource; import com.bookstore.domain.User; import com.bookstore.domain.UserBilling; import com.bookstore.domain.UserPayment; +import com.bookstore.domain.UserShipping; import com.bookstore.service.UserPaymentService; import com.bookstore.service.UserService; import com.bookstore.utility.USConstants; @@ -102,4 +103,14 @@ public class PaymentResource { return new ResponseEntity("Set Default Payment Successfully!", HttpStatus.OK); } + + @RequestMapping(value = "/getUserPaymentList") + public List getUserPaymentList( + Principal principal) { + User user = userService.findByUsername(principal.getName()); + + List userPaymentList = user.getUserPaymentList(); + + return userPaymentList; + } } diff --git a/bookstore-api/target/classes/com/bookstore/resource/PaymentResource.class b/bookstore-api/target/classes/com/bookstore/resource/PaymentResource.class index c40da50..81a71f5 100644 Binary files a/bookstore-api/target/classes/com/bookstore/resource/PaymentResource.class and b/bookstore-api/target/classes/com/bookstore/resource/PaymentResource.class differ diff --git a/store-front/src/app/components/order/order.component.html b/store-front/src/app/components/order/order.component.html index 31e24be..924d976 100644 --- a/store-front/src/app/components/order/order.component.html +++ b/store-front/src/app/components/order/order.component.html @@ -133,7 +133,7 @@
- +
@@ -146,7 +146,7 @@ {{userPayment.cardName}} @@ -159,7 +159,7 @@
- @@ -171,12 +171,12 @@
- +
- +
@@ -189,7 +189,7 @@
- @@ -208,7 +208,7 @@
- @@ -232,7 +232,7 @@
- +
@@ -264,7 +264,7 @@
Available Credit Card - use this address + use this address