From bed84249feb762217715be19cdb1a570e112a9d9 Mon Sep 17 00:00:00 2001
From: Le Deng <z00382545@z00382545-mac.local>
Date: Wed, 8 Mar 2017 12:00:20 -0500
Subject: [PATCH] latest

---
 bookstore-api/.idea/workspace.xml                  |  4 ++--
 .../my-profile/my-profile.component.html           | 14 ++++++++------
 .../components/my-profile/my-profile.component.ts  |  7 ++++++-
 store-front/src/app/models/user-payment.ts         |  4 ++--
 store-front/src/app/services/payment.service.ts    |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml
index 26696f8..534a6f8 100644
--- a/bookstore-api/.idea/workspace.xml
+++ b/bookstore-api/.idea/workspace.xml
@@ -943,12 +943,12 @@
       <workItem from="1486538831944" duration="450000" />
       <workItem from="1488378219247" duration="650000" />
       <workItem from="1488461561430" duration="18419000" />
-      <workItem from="1488731165185" duration="15175000" />
+      <workItem from="1488731165185" duration="15539000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="77187000" />
+    <option name="totallyTimeSpent" value="77551000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1280" height="797" extended-state="0" />
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 0d0c027..12afe0e 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
@@ -131,16 +131,15 @@
                                                     <div class="col-xs-4">
                                                         <div class="form-group">
                                                             <label for="billingCity">* City</label>
-                                                            <input type="text" class="form-control" id="billingCity" required="required" placeholder="Your billing shippingAddressCity" name="userBillingCity" [(ngModel)]="userBilling.userBillingCity" />
+                                                            <input type="text" class="form-control" id="billingCity" required="required" placeholder="Your billing city" name="userBillingCity" [(ngModel)]="userBilling.userBillingCity" />
                                                         </div>
                                                     </div>
                                                     <div class="col-xs-4">
                                                         <div class="form-group">
                                                             <label for="billingState">* State</label>
                                                             <select id="billingState" class="form-control" name="userBillingState" [(ngModel)]="userBilling.userBillingState" required="required">
-                                                                <option value="" disabled="disabled">Please select an option...
-                                                                </option>
-                                                                <option *ngFor="let state : stateList">{{state}}
+                                                                <option value="" disabled>-- state --</option>
+                                                                <option *ngFor="let state of stateList">{{state}}
                                                                 </option>
                                                             </select>
                                                         </div>
@@ -164,6 +163,9 @@
                                                         <div class="form-group">
                                                             <label for="cardType">* Select Card Type:</label>
                                                             <select class="form-control" id="cardType" name="type" [(ngModel)]="userPayment.type">
+                                                                <option value="" disabled="disabled">
+                                                                    -- Card Type --
+                                                                </option>
                                                                 <option value="visa">Visa</option>
                                                                 <option value="mastercard">Mastercard</option>
                                                                 <option value="discover">Discover</option>
@@ -191,7 +193,7 @@
                                                             <div class="row">
                                                                 <div class="col-xs-6">
                                                                     <select class="form-control" name="expiryMonth" required="required" [(ngModel)]="userPayment.expiryMonth">
-                                                                        <option disabled="disabled">
+                                                                        <option value="" disabled="disabled">
                                                                             --Month--
                                                                         </option>
                                                                         <option value="01">Jan (01)</option>
@@ -210,7 +212,7 @@
                                                                 </div>
                                                                 <div class="col-xs-6">
                                                                     <select class="form-control" name="expiryYear" [(ngModel)]="userPayment.expiryYear">
-                                                                        <option disabled="disabled">--Year--
+                                                                        <option value="" disabled="disabled">--Year--
                                                                         </option>
                                                                         <option value="17">2017</option>
                                                                         <option value="18">2018</option>
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 cbd2811..17e3d78 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
@@ -104,7 +104,7 @@ export class MyProfileComponent implements OnInit {
     	res => {
     		console.log(res.json());
     		this.user=res.json();
-    		this.userPaymentList = this.user.userPaymentList;
+    		// this.userPaymentList = this.user.userPaymentList;
     	},
     	error => {
     		console.log(error);
@@ -114,5 +114,10 @@ export class MyProfileComponent implements OnInit {
     for (let s in AppConst.usStates) {
     	this.stateList.push(s);
     }
+
+    this.userBilling.userBillingState="";
+    this.userPayment.type="";
+    this.userPayment.expiryMonth="";
+    this.userPayment.expiryYear="";
 }
 }
diff --git a/store-front/src/app/models/user-payment.ts b/store-front/src/app/models/user-payment.ts
index fda368c..fa4f4d4 100644
--- a/store-front/src/app/models/user-payment.ts
+++ b/store-front/src/app/models/user-payment.ts
@@ -5,8 +5,8 @@ export class UserPayment {
     public type: string;
     public cardName: string;
     public cardNumber: string;
-    public expiryMonth: number;
-    public expiryYear: number;
+    public expiryMonth: string;
+    public expiryYear: string;
     public cvc: number;
     public holderName: string;
     public defaultPayment: boolean;
diff --git a/store-front/src/app/services/payment.service.ts b/store-front/src/app/services/payment.service.ts
index ff5cdbd..3301e9e 100644
--- a/store-front/src/app/services/payment.service.ts
+++ b/store-front/src/app/services/payment.service.ts
@@ -9,6 +9,6 @@ export class PaymentService {
   constructor(private http:Http) { }
 
   getUserPaymentlist() {
-
+  	
   }
 }
\ No newline at end of file