Updated

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

ecm/Angular/trunk/src/app/ecm-order/ecm-order.service.ts

@@ -9,21 +9,22 @@ import { Store } from '@ngrx/store';
 import {AppState} from '../ecm-store/reducers';
 import {OrderActions} from '../ecm-store/actions';
 import { Order } from '../ecm-model/order-model';
+import { HostUrlService } from '../host-url.service';
 
 @Injectable()
 export class EcmOrderService {
-    private orderActionUrl = '/ibase/ecm/service';
+    private orderActionUrl = '/ecm/service/orders';
     
     orderItems: Order[];
     
-    constructor( private http: Http, private store: Store<AppState> ) { }
+    constructor( private http: Http, private store: Store<AppState>, public hostUrlService : HostUrlService ) { }
 
     fetchOrder(): Observable<Order[]> {
         console.log( "fetch Orders Called" );
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
   
-        return this.http.get( this.orderActionUrl + "/orders", options )
+        return this.http.get( this.hostUrlService.hostUrl+this.orderActionUrl, options )
                    .map( (res) => this.extractData(res) )
                    .catch(this.handleError);
     }
@@ -34,7 +35,7 @@ export class EcmOrderService {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
-       return this.http.post( '/ibase/ecm/service/orders', JSON.stringify(order) , options)
+       return this.http.post( this.hostUrlService.hostUrl+this.orderActionUrl, JSON.stringify(order) , options)
             .map( (res) => this.extractData(res) );
     }
     
@@ -44,7 +45,7 @@ export class EcmOrderService {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
 
-        return this.http.post( '/ibase/ecm/service/orders', JSON.stringify(order) , options)
+        return this.http.post( this.hostUrlService.hostUrl+this.orderActionUrl, JSON.stringify(order) , options)
             .map( (res) => this.extractData(res) );
     }
     

ecm/Angular/trunk/src/app/ecm-search/ecm-search-result/search.service.ts

@@ -3,12 +3,13 @@ import {Http, Response, Headers, RequestOptions} from '@angular/http';
 
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
+import { HostUrlService } from '../../host-url.service';
 
 @Injectable()
 export class SearchService {
   
   val;
-  constructor(private http:Http) { }
+  constructor(private http:Http, public hostUrlService : HostUrlService) { }
   
   setSearch(value){
    console.log('Set Query:['+value+']');
@@ -22,7 +23,7 @@ export class SearchService {
   
   getSuggestions(value) {
       console.log('Query:['+value+']');
-      let solrUrl = '/ibase/ecm/service/solr/local2do/';
+      let solrUrl = this.hostUrlService.hostUrl + '/ecm/service/solr/local2do/';
       solrUrl = solrUrl+value+'/json';
       
       let headers = new Headers( { 'Content-Type': 'application/json' });

ecm/Angular/trunk/src/app/ecm-view/ecm-cart/ecm-cart.service.ts

@@ -49,7 +49,7 @@ private userActionUrl = '/ecm/service/feeds/cart';
       let headers = new Headers( { 'Content-Type': 'application/json' });
       let options = new RequestOptions( { headers: headers });
       
-     return this.http.post( this.hostUrlService.hostUrl+this.SERVICE_URL, JSON.stringify(cartData) , options)
+     return this.http.post( this.hostUrlService.hostUrl+this.userActionUrl, JSON.stringify(cartData) , options)
           .map( (res) => this.extractData(res) );
   }
   

ecm/Angular/trunk/src/app/ecm-view/ecm-related-items/ecm-related-item.service.ts

@@ -11,14 +11,14 @@ import { HostUrlService } from '../../host-url.service';
 @Injectable()
 export class EcmRelatedItemService {
     
-    private trendsUrl = '/ecm/service/category/related';  // URL to web service
+    private SERVICE_URL = '/ecm/service/category/related';  // URL to web service
     
     constructor (private http: Http,public hostUrlService : HostUrlService) {}
 
     getRelatedItems(scatCode): Observable<ItemDetail[]> {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
-        let URL = this.hostUrlService.hostUrl+this.trendsUrl + '/' +scatCode;
+        let URL = this.hostUrlService.hostUrl+this.SERVICE_URL + '/' +scatCode;
         
         return this.http.get( URL, options )
             .map( (res) => this.extractData(res) )

ecm/Angular/trunk/src/app/ecm-view/ecm-wish-list/ecm-wish-list.service.ts

@@ -44,7 +44,7 @@ export class EcmWishListService   {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
-       return this.http.post( this.hostUrlService.hostUrl+'/ecm/service/feeds/wishlist/'+itemCode , options)
+       return this.http.post( this.hostUrlService.hostUrl+this.wishListUrl+'/'+itemCode , options)
                    .map( (res) => this.extractData(res) );
     }
     
@@ -52,7 +52,7 @@ export class EcmWishListService   {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
-        return this.http.delete( this.hostUrlService.hostUrl+'/ecm/service/feeds/wishlist/'+itemCode, options)
+        return this.http.delete( this.hostUrlService.hostUrl+this.wishListUrl+'/'+itemCode, options)
                     .map( (res) => this.extractData(res) );
     }
 

ecm/Angular/trunk/src/app/user-profile/profile-info.service.ts

@@ -36,7 +36,7 @@ export class ProfileInfoService {
         let headers = new Headers( { 'Content-Type': 'application/json' });
         let options = new RequestOptions( { headers: headers });
         
-       return this.http.post( '/ecm/service/feeds/profile', JSON.stringify(userData) , options)
+       return this.http.post( this.hostUrlService.hostUrl+this.userActionUrl, JSON.stringify(userData) , options)
             .map( (res) => this.extractData(res) );
     }
     

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

@@ -57,7 +57,7 @@ export class UserReviewService {
     deleteCartItem( userReview ) {
         console.log( "deleteUserreview Called" );
 
-        return this.http.delete( this.userActionUrl + '/' + userReview.userCode, {})
+        return this.http.delete( this.hostUrlService.hostUrl + this.userActionUrl + '/' + userReview.userCode, {})
             .map( res => res.json() );
 
     }