Updated

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

ecm/Angular/ProteusECM/trunk/src/app/ecm-view/ecm-checkout/ecm-checkout.component.css

@@ -210,7 +210,6 @@ md-card {
 
 .payment-option{
     display: block;
-    border-bottom: 1px solid #f3f3f3;
     padding: 15px 0;
     padding-left: 15px;
 }
@@ -282,6 +281,21 @@ md-card {
     left: calc(50% - 100px);
 }
 
+.cvv-field {
+	display: inline-block;
+	padding-right: 20px;
+}
+
+.cvv-input {
+    height: 30px;
+    vertical-align: inherit;
+}
+
+.cvv-form-container {
+	padding-left: 50px;
+    padding-bottom: 20px;
+}
+
 .payment-button[disabled], .save-button[disabled] {
 	background: #e0e0e0;
     color: #fff;
@@ -392,35 +406,44 @@ md-card {
 
 /* Review Order End*/
 
-/* .example-headers-align .mat-expansion-panel-header-title,  */
-/* .example-headers-align .mat-expansion-panel-header-description { */
-/*   flex-basis: 0; */
-/* } */
+/* Material Expansion CSS */
 
-.example-headers-align .mat-expansion-panel-header-description {
-  justify-content: flex-end;
-  align-items: initial;
+.checkout-page > div .mat-stepper-vertical > .mat-step {
+    box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
+    background: white;
+    margin: 10px;
 }
 
-.mat-expansion-panel {
-    margin: 10px 0 !important;
-} 
-
-.mat-expansion-panel-header-title {
-    line-height: 35px;
+.mat-vertical-content-container.mat-stepper-vertical-line::BEFORE {
+    content: initial;
 }
 
-.mat-expansion-panel-header {
-	padding: 0 !important;	
-}
+/* End */
 
 .login-descr {
 	justify-content: space-between !important;
 }
 
 
+.popular-bank {
+    padding: 0 30px 30px 0;
+    width: 200px;
+    font-size: 15px;
+}
+
+.netBankingContainer {
+	padding-left: 50px;
+}
 
+.popular-bank-title {
+    font-size: 18px;
+    font-weight: 700;
+    padding: 15px 0;	
+}
 
+.cod-order {
+	padding-left: 45px;
+}
 
 
 

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

 import { Component, OnInit, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { FormBuilder, Validators,NgForm,NgModel } from '@angular/forms';
+import { FormBuilder, Validators,NgForm,NgModel,FormGroup } from '@angular/forms';
 import { ItemDetail } from '../../ecm-model/product-detail-model';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
 import { Location } from '@angular/common';
 import { MdSnackBar } from '@angular/material';
+import {MatVerticalStepper} from '@angular/material/stepper';
 
 import { Store } from '@ngrx/store';
 import {AppState} from '../../ecm-store/reducers';
@@ -29,16 +30,15 @@ export class EcmCheckoutComponent implements OnInit {
     
     @ViewChild('userForm') currentForm: NgForm;
     @Input() unAuthorized: boolean = false;
-    userForm: NgForm;
     checked = false;
-    cartItemsDetail: ItemDetail[];
     totalPrice:number = 0;
-    activeNGForm: NgForm;
-    cartItems: Observable<ItemDetail[]>;
+    cartItems;
     userData: any;
+    selectedStep;
     
     @ViewChild( 'cardScreen' ) child: CardScreenComponent;
     @ViewChild('addrAddScreen') addScreen: AddressScreenComponent;
+    @ViewChild('stepper') stepper: MatVerticalStepper;
     cardList;
     newCard: Card = new Card();
     selectedPaymntOpt;
@@ -46,10 +46,15 @@ export class EcmCheckoutComponent implements OnInit {
     newAddress: Address = new Address();
     selectedAddress: Address;
     userInfo;
+    cvv;
     public childForm;
     public editForm;
     
-    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) {
+    loginFormGroup: FormGroup;
+    addressFormGroup: 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) {
                  this.store.dispatch(this.profileActions.loadProfile());
                  this.store.dispatch(this.addressActions.loadAddress());
                  this.store.dispatch(this.cardActions.loadSavedCards());
@@ -57,11 +62,7 @@ export class EcmCheckoutComponent implements OnInit {
 
     ngOnInit() {
         window.scrollTo(0,0);
-        var userInfo = localStorage.getItem( 'userInfo' );
-        console.log( 'EcmUserOptionComponent getUserInfo ::' + userInfo );
-        if ( userInfo !== 'undefined' && userInfo !== null && userInfo !== 'null' ) {
-            this.userData = JSON.parse( userInfo );
-        }
+        this.createUserData();
         this.getCartItems();
         
         let breadcrumb = [{label: 'Home', url: '/home'}, {label: 'Checkout', url: 'javascript:void(0)'}];

ecm/Angular/ProteusECM/trunk/src/app/user-card/card-manager/card-screen/card-screen.component.ts

@@ -46,10 +46,6 @@ export class CardScreenComponent implements OnInit {
             cvv: ['', [<any>Validators.required]]
           });
         
-        if(!this.isPaymentsPage) {
-            this.card.cvv = "123";
-        }
-        
         if(this.editMode == 'V'){
            this.getCardDetails(this.card.acctNumber);
         }