diff --git a/src/app/core/services/preparer/client.service.ts b/src/app/core/services/preparer/client.service.ts index b1a8500..4eb3687 100644 --- a/src/app/core/services/preparer/client.service.ts +++ b/src/app/core/services/preparer/client.service.ts @@ -42,5 +42,4 @@ export class ClientService { // inactivatedDate: basicDetails.INACTIVEDATE || null })); } - } diff --git a/src/app/core/services/service-provider/basic-fee.service.ts b/src/app/core/services/service-provider/basic-fee.service.ts index 3d576d1..b48af96 100644 --- a/src/app/core/services/service-provider/basic-fee.service.ts +++ b/src/app/core/services/service-provider/basic-fee.service.ts @@ -16,7 +16,7 @@ export class BasicFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getBasicFees(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBasicFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBasicFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToBasicFees(response))); } diff --git a/src/app/core/services/service-provider/carnet-fee.service.ts b/src/app/core/services/service-provider/carnet-fee.service.ts index 1cd43cd..84ef7b2 100644 --- a/src/app/core/services/service-provider/carnet-fee.service.ts +++ b/src/app/core/services/service-provider/carnet-fee.service.ts @@ -16,7 +16,7 @@ export class CarnetFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getFeeCommissions(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetFeeComm?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetFeeComm/${spid}/ACTIVE`).pipe( map(response => this.mapToFeeCommissions(response))); } diff --git a/src/app/core/services/service-provider/continuation-sheet-fee.service.ts b/src/app/core/services/service-provider/continuation-sheet-fee.service.ts index 2780c54..3daa274 100644 --- a/src/app/core/services/service-provider/continuation-sheet-fee.service.ts +++ b/src/app/core/services/service-provider/continuation-sheet-fee.service.ts @@ -16,7 +16,7 @@ export class ContinuationSheetFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getContinuationSheets(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCsFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCsFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToContinuationSheetFee(response))); } diff --git a/src/app/core/services/service-provider/counterfoil-fee.service.ts b/src/app/core/services/service-provider/counterfoil-fee.service.ts index ffe2a9b..9667f69 100644 --- a/src/app/core/services/service-provider/counterfoil-fee.service.ts +++ b/src/app/core/services/service-provider/counterfoil-fee.service.ts @@ -16,7 +16,7 @@ export class CounterfoilFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getCounterfoils(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCfFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCfFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToCounterFoilFee(response))); } diff --git a/src/app/core/services/service-provider/expedited-fee.service.ts b/src/app/core/services/service-provider/expedited-fee.service.ts index 2325729..59ef3db 100644 --- a/src/app/core/services/service-provider/expedited-fee.service.ts +++ b/src/app/core/services/service-provider/expedited-fee.service.ts @@ -16,7 +16,7 @@ export class ExpeditedFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getExpeditedFees(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetEfFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetEfFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToExpeditedFee(response))); } diff --git a/src/app/core/services/service-provider/security-deposit.service.ts b/src/app/core/services/service-provider/security-deposit.service.ts index a68e888..0c3b8aa 100644 --- a/src/app/core/services/service-provider/security-deposit.service.ts +++ b/src/app/core/services/service-provider/security-deposit.service.ts @@ -16,7 +16,7 @@ export class SecurityDepositService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getSecurityDeposits(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBondRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBondRates/${spid}/ACTIVE`).pipe( map(response => this.mapToSecurityDeposit(response))); }