From d9e6af412529cf2a04817f4f827fe70e587ce2ab Mon Sep 17 00:00:00 2001 From: Le Deng Date: Thu, 9 Mar 2017 08:42:58 -0500 Subject: [PATCH] latest --- bookstore-api/.idea/workspace.xml | 16 ++-- .../my-profile/my-profile.component.html | 84 ++++++++++++++++++- .../my-profile/my-profile.component.ts | 5 +- store-front/src/app/models/user-shipping.ts | 12 +++ 4 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 store-front/src/app/models/user-shipping.ts diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index cc144e0..1114214 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -134,10 +134,10 @@ - @@ -914,15 +914,15 @@ - + - - + @@ -946,7 +946,7 @@ - + diff --git a/store-front/src/app/components/my-profile/my-profile.component.html b/store-front/src/app/components/my-profile/my-profile.component.html index c612ad0..256a647 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.html +++ b/store-front/src/app/components/my-profile/my-profile.component.html @@ -74,7 +74,7 @@

Default payment set successfully!

- +
@@ -248,6 +248,88 @@ +
+
+
+

Default shipping address set successfully!

+ + + +
+ + + + + + + + + + + + + + +
DefaultShipping AddressOperations
+ + default + Shipping Address + + +
+ +
+ + +
+ + +
+

Shipping Address

+
+
+ + +
+
+ + +
+
+ +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+ + +
diff --git a/store-front/src/app/components/my-profile/my-profile.component.ts b/store-front/src/app/components/my-profile/my-profile.component.ts index a284a14..25b1e51 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.ts +++ b/store-front/src/app/components/my-profile/my-profile.component.ts @@ -7,6 +7,7 @@ import {PaymentService} from "../../services/payment.service"; import {User} from '../../models/user'; import {UserPayment} from '../../models/user-payment'; import {UserBilling} from '../../models/user-billing'; +import {UserShipping} from '../../models/user-shipping'; @Component({ selector: 'app-my-profile', @@ -35,6 +36,7 @@ export class MyProfileComponent implements OnInit { private userBilling: UserBilling = new UserBilling(); private userPaymentList: UserPayment[] = []; private stateList: string[] = []; + private userShipping: UserShipping = new UserShipping(); private selectedProfileTab:number = 0; private selectedBillingTab:number = 0; @@ -187,6 +189,7 @@ export class MyProfileComponent implements OnInit { this.userPayment.expiryYear=""; this.userPayment.userBilling = this.userBilling; this.defaultPaymentSet=false; - + + this.userShipping.userShippingState=""; } } diff --git a/store-front/src/app/models/user-shipping.ts b/store-front/src/app/models/user-shipping.ts new file mode 100644 index 0000000..488d99a --- /dev/null +++ b/store-front/src/app/models/user-shipping.ts @@ -0,0 +1,12 @@ +export class UserShipping { + public id: number; + public userShippingNmae: string; + public userShippingStreet1: string; + public userShippingStreet2: string; + public userShippingCity: string; + public userShippingState: string; + public userShippingCountry: string; + public userShippingZipcode: string; + public userShippingDefault: boolean; +} +