{
let url = this.marketingUrl + '/api/v1/m/campaigns/' + id;
- return this.service.get(url).pipe(map((response: Response) => {
+ return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
index d03b8433b..96f05db56 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
@@ -40,7 +40,7 @@
{{item.name}}
- {{item.price | number:'.2-2'}}
+ {{item.price | number:'3.2-2'}}
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.module.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
index 2736b4b7e..4dd7b6d86 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
-
+import { CommonModule } from '@angular/common'
import { SharedModule } from '../shared/shared.module';
import { CatalogComponent } from './catalog.component';
import { CatalogService } from './catalog.service';
import { Pager } from '../shared/components/pager/pager';
@NgModule({
- imports: [BrowserModule, SharedModule],
+ imports: [BrowserModule, SharedModule, CommonModule],
declarations: [CatalogComponent],
providers: [CatalogService]
})
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
index 368da6b17..2054e0adf 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
@@ -38,7 +38,7 @@ export class CatalogService {
return this.service.get(url)
.pipe(
- map((response: Response) => {
+ map((response: any) => {
return response;
})
);
@@ -47,7 +47,7 @@ export class CatalogService {
getBrands(): Observable {
return this.service.get(this.brandUrl)
.pipe(
- map((response: Response) => {
+ map((response: any) => {
return response;
})
);
@@ -56,7 +56,7 @@ export class CatalogService {
getTypes(): Observable {
return this.service.get(this.typesUrl)
.pipe(
- map((response: Response) => {
+ map((response: any) => {
return response;
})
);
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.service.ts b/src/Web/WebSPA/Client/modules/orders/orders.service.ts
index c02f9da12..fc7ecd6f2 100644
--- a/src/Web/WebSPA/Client/modules/orders/orders.service.ts
+++ b/src/Web/WebSPA/Client/modules/orders/orders.service.ts
@@ -27,7 +27,7 @@ export class OrdersService {
getOrders(): Observable {
let url = this.ordersUrl + '/api/v1/o/orders';
- return this.service.get(url).pipe(map((response: Response) => {
+ return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}
@@ -35,7 +35,7 @@ export class OrdersService {
getOrder(id: number): Observable {
let url = this.ordersUrl + '/api/v1/o/orders/' + id;
- return this.service.get(url).pipe(map((response: Response) => {
+ return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}
diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile
index d732684bf..6ac1a7961 100644
--- a/src/Web/WebSPA/Dockerfile
+++ b/src/Web/WebSPA/Dockerfile
@@ -1,9 +1,9 @@
ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet:2.2.0-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base
WORKDIR /app
EXPOSE 80
-FROM microsoft/dotnet:2.2.100-sdk AS dotnet-build
+FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS dotnet-build
WORKDIR /src
FROM ${NODE_IMAGE} as node-build
diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj
index 2d554810b..56f94d530 100644
--- a/src/Web/WebSPA/WebSPA.csproj
+++ b/src/Web/WebSPA/WebSPA.csproj
@@ -85,8 +85,8 @@