Updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174282 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/Angular/trunk/src/app/ecm-view/ecm-checkout/ecm-checkout.component.html

@@ -5,7 +5,7 @@
 
 	<div class="medium-8 columns">
 	
-	<md-vertical-stepper #stepper >
+	<md-vertical-stepper #stepper [linear]="true">
 	  <md-step [stepControl]="loginFormGroup">
 	      <ng-template mdStepLabel class="panel-selected">
 			Login     <span *ngIf="userData" class = "email-data"> {{userData?.EMAIL_ID}}</span>
@@ -20,16 +20,18 @@
 	  </md-step>
 	  
 	  <md-step [stepControl]="addressFormGroup">
-			<form [formGroup]="addressFormGroup"> 	
 		      <ng-template mdStepLabel class="panel-selected">
 		      	Delivery/Billing Address
 		      </ng-template>
 
-				<md-radio-group [required]="true" formControlName="address" class="example-radio-group" [(ngModel)]="selectedAddress">
+				<md-radio-group [required]="true" class="example-radio-group" [(ngModel)]="selectedAddressOpt">
 					<md-radio-button *ngFor = "let address of addressList" class="user-address" [value]="address">	
 						<address-screen [address]="address" class="address-screen"></address-screen>
-						<div *ngIf="address == selectedAddress">
-				  			<button md-button class="save-button" type="button" mdStepperNext>
+						<div *ngIf="address == selectedAddressOpt">
+						<form [formGroup]="addressFormGroup"> 	
+				  			<input type="hidden" formControlName="address" [(ngModel)]="selectedAddress">
+				  		</form>		
+				  			<button md-button class="save-button" type="button" mdStepperNext (click)="selectAddress(address)">
 								Deliver Here
 							</button>
 						</div>
@@ -38,24 +40,27 @@
 					<md-radio-button class="user-address" [value]="'newaddress'">
 						<span class="address-screen">New Address</span>
 					</md-radio-button>
-				  	<div *ngIf="selectedAddress == 'newaddress'" class="edit-detail-template">
+						
+				  	<div *ngIf="selectedAddressOpt == 'newaddress'" class="edit-detail-template">
 				  		<address-screen #addrAddScreen [editMode]="'E'" [address]="newAddress" class="address-screen"></address-screen>
 				  			<button md-button mdStepperNext class="save-button" *ngIf="editForm" [disabled]="!editForm.valid || !editForm.dirty" (click)="saveAddress();">
-								SAVE AND DELIVER HERE
+								Save and Deliver Here
 							</button>
 							<button md-button (click)="selectedAddress = addressList[0]">
 								Cancel
 							</button>
 				  	</div>
 				</md-radio-group>
-			</form>	
 	  </md-step>
 	  
-	  <md-step [stepControl]="loginFormGroup">
+	  <md-step [stepControl]="reviewOrdersFormGroup">
 	      <ng-template mdStepLabel>Review Order({{cartItems.length}} Items)</ng-template>
 		  <ng-container *ngTemplateOutlet="reviewOrder"></ng-container>
 	      <div>
-	        <button class="save-button" style="float: right;margin: 10px;" md-button mdStepperNext>Continue</button>
+	        <form [formGroup]="reviewOrdersFormGroup"> 
+		        <input type="hidden" formControlName="orderReviewd" [(ngModel)]="orderReviewd">
+			</form>
+	        <button class="save-button" style="float: right;margin: 10px;" md-button mdStepperNext (click)="confirmOrder();">Continue</button>
 	      </div>
 	  </md-step>
 	  

ecm/Angular/trunk/src/app/ecm-view/ecm-checkout/ecm-checkout.component.ts

@@ -36,6 +36,8 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     cartItems;
     userData: any;
     selectedStep;
+    orderReviewed;
+    selectedAddressOpt;
     
     @ViewChild( 'cardScreen' ) child: CardScreenComponent;
     @ViewChild('addrAddScreen') addScreen: AddressScreenComponent;
@@ -56,6 +58,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     
     loginFormGroup: FormGroup;
     addressFormGroup: FormGroup;
+    reviewOrdersFormGroup: FormGroup;
     cardFormGroup: FormGroup;
     
     constructor(private formBuilder: FormBuilder, private store: Store<AppState>,public checkoutService: EcmCheckoutService,private _location: Location, private cartActions: CartActions, public breadcrumbSerivce: Breadcrumbs, private cardActions: SavedCardAction, private profileActions: ProfileActions, private addressActions: AdressAction, public snackBar: MdSnackBar, private _formBuilder: FormBuilder) {
@@ -65,6 +68,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     }
 
     ngOnInit() {
+        console.log("selectedAddressOpt -- >",this.selectedAddressOpt);
         this.store.dispatch(this.addressActions.loadAddress());
         this.store.dispatch(this.cardActions.loadSavedCards());
         window.scrollTo(0,0);
@@ -76,7 +80,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
         this.store.select('Address').subscribe( addressList => {
             console.log( 'loadUser addressList >> ', addressList );
             this.addressList = addressList;
-            this.selectedAddress = addressList[0];
+            //this.selectedAddress = addressList[0];
         });
         
         this.store.select('savedCards').subscribe( cardList => {
@@ -101,6 +105,10 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
             address: ['', Validators.required]
         });
         
+        this.reviewOrdersFormGroup = this._formBuilder.group({
+            orderReviewd: ['', Validators.required]
+        });
+        
         this.cardFormGroup = this._formBuilder.group({
             cvv: ['', Validators.required]
         });
@@ -196,6 +204,16 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
         
     }
     
+    selectAddress(address){
+        this.selectedAddress = address;
+        this.stepper.next();
+    }
+    
+    confirmOrder(){
+        this.orderReviewed = true; 
+        this.stepper.next();
+    }
+    
     increment(item : ItemDetail) {
         item.itemQuantity++;
         let cartData = new Item;

ecm/Angular/trunk/src/app/user-review/ecm-user-review.service.ts

@@ -14,7 +14,7 @@ import { HostUrlService } from '../host-url.service';
 @Injectable()
 export class UserReviewService {
 
-    private userActionUrl = '';
+    private userActionUrl = '/ecm/service/feeds/review';
 
     userReview: Review[];
 
@@ -63,27 +63,25 @@ export class UserReviewService {
     }
 
     getUserReview( itemCode ) {
-        let getUserReviewUrl = '/ecm/service/feeds/review/';
-        getUserReviewUrl = getUserReviewUrl + itemCode;
-        console.log( "URL: " + this.hostUrlService.hostUrl+getUserReviewUrl );
+        this.userActionUrl = this.userActionUrl + '/'+ itemCode;
+        console.log( "URL: " + this.hostUrlService.hostUrl+this.userActionUrl );
 
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
 
-        return this.http.get( this.hostUrlService.hostUrl+getUserReviewUrl, options )
+        return this.http.get( this.hostUrlService.hostUrl+this.userActionUrl, options )
             .map( this.extractData )
             .catch( this.handleError );
     }
     
     submitReview(reviewData){
-        let userServiceUrl = '/ecm/service/feeds/review';
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
         console.log("Submitting Review...");
         console.log(JSON.stringify(reviewData));
         
-        this.http.post(this.hostUrlService.hostUrl+userServiceUrl, reviewData, options)
+        this.http.post(this.hostUrlService.hostUrl+this.userActionUrl, reviewData, options)
         .subscribe(data => {
            console.log("Add Review");
         }, error => {
@@ -92,13 +90,12 @@ export class UserReviewService {
     }
     
     removeReview(itemCode){
-        let userServiceUrl = '/ecm/service/feeds/review/';
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
         console.log("Deleting Review for...",itemCode);
         
-        this.http.delete(this.hostUrlService.hostUrl+userServiceUrl+itemCode, options)
+        this.http.delete(this.hostUrlService.hostUrl+this.userActionUrl+itemCode, options)
         .subscribe(data => {
            console.log("Deleted Review");
         }, error => {