Added customer-selection screen for ecm-type = 2

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

ecm/Angular/ProteusECM/trunk/src/app/app.module.ts

@@ -5,8 +5,8 @@ import { LocationStrategy, HashLocationStrategy } from '@angular/common';
 import { FormsModule,ReactiveFormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { RouterModule, Routes } from '@angular/router';
-import {BBKeyInputModule} from 'base-blocks';
-
+//import {BBKeyInputModule} from 'base-blocks';
+import { BBComponentModule } from 'base-blocks';
 //import { JwtHelper } from 'angular2-jwt'; //For Future
 import {StoreModule} from '@ngrx/store';
 import {EffectsModule} from '@ngrx/effects';
@@ -193,7 +193,8 @@ const appRoutes: Routes = [
     EffectsModule.run(OrderEffects),
     FormsModule,
     BrowserAnimationsModule,
-    BBKeyInputModule
+  //  BBKeyInputModule
+    BBComponentModule
   ],
   providers: [
 	{provide: LocationStrategy, useClass: HashLocationStrategy},

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

@@ -458,11 +458,58 @@ md-card {
     display: none !important;
 }
 
+.sales-form{
+	padding-left: 50px;
+}
+.date-picker{
+	padding-left: 90px;
+}
 
 
+mat-calendar#md-datepicker-0 {
+    width: 100% !important;
+    height: 100% !important;
+}
+mat-calendar#md-datepicker-1 {
+	width: 100% !important;
+    height: 100% !important;
+}
+mat-calendar#md-datepicker-2 {
+	width: 100% !important;
+    height: 100% !important;
+}
+/*mat-autocomplete-panel.mat-autocomplete-visible {
+    visibility: visible;
+    width: 350px !important ;
+}*/
+mat-autocomplete-panel {
+    visibility: visible;
+    width: 375px !important ;
+}
+.mat-calendar {
+    display: block;
+    width: 100% !important;
+}
 
+/*chitranga*/
 
+.name{
+	padding-bottom: 8px;
+}
 
+.name-span{
+	color: #000;
+    font-weight: 600;
+    font-size: 12px;
+}
+.address-span{
+	color: #666;
+    display: block;
+    font-size: 12px;
+}
 
-
-
+.user-alladress-info {
+    display: inline-block;
+    /* padding-left: 75px; */
+    padding-left: 30px;
+}

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

@@ -21,16 +21,30 @@ import { AddressScreenComponent } from '../../user-address/address-manager/addre
 import { EcmPanelComponent } from '../ecm-panel/ecm-panel.component';
 import { EcmCartService } from '../ecm-cart/ecm-cart.service';
 
+
+ export class SaleAddress {  
+        public soldTo:string = '';
+        public billTo:string = '';
+        public deliverTo:string = '';
+        public orderNo:string = '';
+        public orderDate:string = '';
+        public shipDate:string = '';
+        public dueDate:string = '';
+
+}
+    
 @Component( {
     selector: 'ecm-checkout',
     templateUrl: './ecm-checkout.component.html',
-    styleUrls: ['./ecm-checkout.component.css']
+    styleUrls: ['./ecm-checkout.component.css'], 
+    providers:[EcmCheckoutService]
 })
-
 export class EcmCheckoutComponent implements OnInit ,DoCheck  {
-    ecmType = localStorage.getItem( 'ECM_TYPE' );
+    dataSource = '/ibase/ecm/service/customers/'
+    
     @ViewChild('userForm') currentForm: NgForm;
     @Input() unAuthorized: boolean = false;
+    
     checked = false;
     totalPrice:number = 0;
     cartItems;
@@ -39,6 +53,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     selectedStep;
     orderReviewed;
     selectedAddressOpt;
+    ecmType; //chitra
     
     @ViewChild( 'cardScreen' ) child: CardScreenComponent;
     @ViewChild('addrAddScreen') addScreen: AddressScreenComponent;
@@ -56,24 +71,36 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     cvv;
     public childForm;
     public editForm;
+    address;
+    addressObj;
     
     loginFormGroup: FormGroup;
     addressFormGroup: FormGroup;
     reviewOrdersFormGroup: FormGroup;
     cardFormGroup: FormGroup;
+    salesAddressFormGroup : FormGroup;
+    saleAddress;
     
-    constructor(private formBuilder: FormBuilder, private store: Store<AppState>,public checkoutService: EcmCheckoutService, private cartService: EcmCartService,private _location: Location, private cartActions: CartActions, public breadcrumbSerivce: Breadcrumbs, private cardActions: SavedCardAction, private profileActions: ProfileActions, private addressActions: AdressAction, public snackBar: MdSnackBar, private _formBuilder: FormBuilder) {
+    
+    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());
+        
+                 this.saleAddress = new SaleAddress();//chitra
     }
 
     ngOnInit() {
+        
+        this.ecmType= localStorage.getItem( 'ECM_TYPE' );
+        console.log("ecmType exist in local storage",this.ecmType);
+ 
         console.log("selectedAddressOpt -- >",this.selectedAddressOpt);
         this.store.dispatch(this.addressActions.loadAddress());
         this.store.dispatch(this.cardActions.loadSavedCards());
         window.scrollTo(0,0);
         this.createUserData();
+        this.getCartItems();
         
         if(this.checkoutService.getItem()){
             this.cartItems = [];
@@ -130,6 +157,17 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
             cvv: ['', Validators.required]
         });
         
+        /*chitra */
+        this.salesAddressFormGroup = this._formBuilder.group({
+            soldTo: ['', Validators.required],
+            billTo: ['', Validators.required],
+            deliverTo: ['', Validators.required],
+            orderNo: ['', Validators.required],
+            orderDate: ['', Validators.required],
+            shipDate: ['', Validators.required],
+            dueDate: ['', Validators.required]
+
+        });
     }
     
     ngAfterViewChecked(): void {
@@ -180,7 +218,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
                     break;
         }
         
-        let order = { "token_id": this.userData.TOKEN_ID, "billAddress": this.selectedAddress, "orderedItems":this.cartItems, "paymentInfo": paymentInfo, "ecm_type":this.ecmType};
+        let order = { "token_id": this.userData.TOKEN_ID, "billAddress": this.selectedAddress, "orderedItems":this.cartItems, "paymentInfo": paymentInfo};
         
         console.log('-----order-----',order);
         
@@ -264,8 +302,8 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     }
     
     createUserData() {
-        var userInfo = localStorage.getItem( 'userInfo' );
-        if ( userInfo !== 'undefined' && userInfo !== null && userInfo !== 'null' ) 
+         var userInfo = localStorage.getItem( 'userInfo' );
+         if ( userInfo !== 'undefined' && userInfo !== null && userInfo !== 'null' ) 
         {
             this.userData = JSON.parse( userInfo );
 
@@ -334,8 +372,7 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
     
     ngDoCheck()
     {
-       //already logged in
-        if( this.userData && !this.redirect)
+         if( this.userData && !this.redirect)
         {
             console.log('stepper--',this.stepper._steps,this.stepper.selectedIndex);
             if(this.stepper._steps && this.stepper.selectedIndex == 0)
@@ -351,6 +388,52 @@ export class EcmCheckoutComponent implements OnInit ,DoCheck  {
         }
     }
     
+    onSelect(dataObj, field){
+    console.log("dataObj in ecm checkout ",dataObj,dataObj.address);    
+         this.addressObj = dataObj;
+         this.address = dataObj.address;
+        
+        if(field == 'soldTo'){
+            
+            this.saleAddress.soldTo = dataObj;
+        }
+         if(field == 'billTo'){
+            
+            this.saleAddress.billTo = dataObj;
+        }
+         if(field == 'deliverTo'){
+            
+            this.saleAddress.deliverTo = dataObj;
+        }
+    }
+    
+    getSeparator( displayVal ){
+        if( displayVal ) {
+            return ',';
+        }
+        return '';
+    }
+    
+    onDeSelect(data){
+    console.log("values in onDeSelect()---------");
+        if(data == 'soldTo'){
+            
+             this.saleAddress.soldTo = '';
+        }
+         if(data == 'billTo'){
+            
+            this.saleAddress.billTo = ''; 
+        }
+        
+         if(data == 'deliverTo'){
+            
+            this.saleAddress.deliverTo = '';
+        }
+    }
+    
+    submitForm(){
+        console.log('submitted---',this.salesAddressFormGroup);
+    }
 }