Merge pull request #798 from ever-co/develop

merge develop to master

Author: evereq

README.md

@@ -1,3 +1,5 @@
+#### *** If you are running IT Company, check our new project [Gauzy](https://github.com/ever-co/gauzy) ***
+
 [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/ever)
 [![Gitter](https://badges.gitter.im/JoinChat.svg)](https://gitter.im/ever-co/ever?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Get help on Codementor](https://cdn.codementor.io/badges/get_help_github.svg)](https://www.codementor.io/evereq?utm_source=github&utm_medium=button&utm_term=evereq&utm_campaign=github)
@@ -47,8 +49,8 @@ Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_wi
 -   [TypeScript](https://www.typescriptlang.org) language (version >=2.9)
 -   [Node.js](https://nodejs.org) (version >=10)
 -   [Ionic](https://ionicframework.com) (version 4) for Shopping Mobile App, Carrier Mobile App and Merchant Tablet App
--   Shopping Website developed with [Angular](https://angular.io) 7 using [Angular Starter](https://github.com/gdi2290/angular-starter)
--   Admin Website developed with [Angular](https://angular.io) version 7 using [ngx-admin](https://github.com/akveo/ngx-admin)
+-   Shopping Website developed with [Angular](https://angular.io) 8 using [Angular Starter](https://github.com/gdi2290/angular-starter)
+-   Admin Website developed with [Angular](https://angular.io) version 8 using [ngx-admin](https://github.com/akveo/ngx-admin)
 -   Headless Commerce framework (Backend APIs/Server) developed using [Nest](https://github.com/nestjs/nest) with heavy use of our own Pyro module. Supports GraphQL, REST and WS Real-Time APIs (WebSockets using [Socket.io](https://socket.io) library)
 -   [RxJS](http://reactivex.io/rxjs) library used heavy in every part of the Platform
 -   [InversifyJS](http://inversify.io) used for Inversion Control / Dependency Injection in most parts of the Platform. On the Backend/API we also use DI provided by [Nest](https://github.com/nestjs/nest)
@@ -138,6 +140,8 @@ yarn lerna bootstrap
 
 The command above install all required packages for every sub-project of the Ever Platform.
 
+Note: if above command fails for any reason, you can try to install required packages manually by running `yarn` inside every sub-folder with 'package.json' file
+
 ### MongoDB
 
 Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on the default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).
@@ -185,13 +189,15 @@ According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform tod
 -   Ruslan Konviser ([Evereq](https://github.com/evereq))
 -   Michael Konviser ([Komish](https://github.com/MrKomish))
 
-#### Developers
+#### Developers (alphabetical order)
 
+-   Aleksandar Tasev ([AlexTasev](https://github.com/AlexTasev))
 -   Alish Meklyov ([Alish](https://github.com/AlishMekliov931))
 -   Blagovest Gerov ([BlagovestGerov](https://github.com/BlagovestGerov))
 -   Boyan Stanchev ([boyanstanchev](https://github.com/boyanstanchev))
 -   Elvis Arabadjiyski ([Dreemsuncho](https://github.com/Dreemsuncho))
 -   Emil Momchilov ([jew-er](https://github.com/jew-er))
+-   Hristo Hristov ([hrimar](https://github.com/hrimar))
 
 #### Designers & QA
 
@@ -255,3 +261,5 @@ All other brand and product names are trademarks, registered trademarks or servi
 [![Greenkeeper badge](https://badges.greenkeeper.io/ever-co/ever.svg)](https://greenkeeper.io)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever?ref=badge_shield)
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io)
+
+#### *** If you are running IT Company, check our new project [Gauzy](https://github.com/ever-co/gauzy) ***

admin/website-angular/package.json

@@ -68,23 +68,23 @@
 		"@angular/platform-browser": "^8.0.0",
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/router": "^8.0.0",
-		"@asymmetrik/ngx-leaflet": "^5.0.2",
-		"@fortawesome/fontawesome-free": "~5.8.1",
-		"@nebular/auth": "^4.1.0",
-		"@nebular/bootstrap": "^4.1.0",
-		"@nebular/eva-icons": "^4.1.0",
-		"@nebular/security": "^4.1.0",
-		"@nebular/theme": "^4.1.0",
-		"@ng-bootstrap/ng-bootstrap": "^4.2.1",
-		"@ng-select/ng-select": "^2.18.0",
+		"@asymmetrik/ngx-leaflet": "^6.0.1",
+		"@fortawesome/fontawesome-free": "^5.10.0",
+		"@nebular/auth": "^4.1.3",
+		"@nebular/bootstrap": "^4.1.3",
+		"@nebular/eva-icons": "^4.1.3",
+		"@nebular/security": "^4.1.3",
+		"@nebular/theme": "^4.1.3",
+		"@ng-bootstrap/ng-bootstrap": "^5.1.0",
+		"@ng-select/ng-select": "^3.0.4",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
-		"@swimlane/ngx-charts": "^11.1.0",
+		"@swimlane/ngx-charts": "^12.0.1",
 		"angular-2-dropdown-multiselect": "^1.9.0",
 		"angular-tree-component": "^8.3.0",
 		"angular2-chartjs": "^0.5.1",
 		"angular2-logger": "^0.7.0",
-		"angular2-toaster": "^7.0.0",
+		"angular2-toaster": "^8.0.0",
 		"angular2-wizard": "github:maiyaporn/angular2-wizard#pull/56/head",
 		"apollo-angular": "^1.6.0",
 		"apollo-angular-link-http": "^1.7.0",
@@ -93,7 +93,7 @@
 		"apollo-link": "^1.2.11",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
-		"apollo-upload-client": "^10.0.1",
+		"apollo-upload-client": "^11.0.0",
 		"bootstrap": "^4.3.1",
 		"buffer": "^5.2.1",
 		"chart.js": "^2.8.0",
@@ -115,13 +115,15 @@
 		"jquery": "^3.4.0",
 		"jsbarcode": "^3.11.0",
 		"leaflet": "^1.4.0",
+		"lodash.template": "^4.5.0",
+		"lodash.templatesettings": "^4.2.0",
 		"moment": "^2.24.0",
 		"ng-simple-slideshow": "^1.2.9",
 		"ng2-ckeditor": "^1.2.2",
 		"ng2-completer": "2.0.8",
 		"ng2-file-upload": "^1.3.0",
 		"ng2-simple-timer": "^6.0.0",
-		"ng2-smart-table": "^1.4.0",
+		"ng2-smart-table": "^1.5.0",
 		"ng2-tree": "^2.0.0-rc.11",
 		"ngx-echarts": "^4.1.1",
 		"ngx-highlightjs": "^2.1.4",
@@ -131,7 +133,7 @@
 		"normalize.css": "^8.0.1",
 		"pace-js": "1.0.2",
 		"popper.js": "^1.15.0",
-		"qrcode": "^1.3.3",
+		"qrcode": "^1.4.1",
 		"reflect-metadata": "^0.1.13",
 		"roboto-fontface": "^0.10.0",
 		"rxjs": "^6.5.2",
@@ -149,9 +151,9 @@
 		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
-		"@angular-devkit/architect": "^0.800.2",
-		"@angular-devkit/build-angular": "^0.800.2",
-		"@angular-devkit/build-webpack": "^0.800.2",
+		"@angular-devkit/architect": "^0.801.2",
+		"@angular-devkit/build-angular": "^0.801.3",
+		"@angular-devkit/build-webpack": "^0.801.3",
 		"@angular-devkit/core": "^8.0.2",
 		"@angular-devkit/schematics": "^8.0.2",
 		"@angular/cli": "^8.0.2",
@@ -177,7 +179,7 @@
 		"@types/mongoose": "^5.3.26",
 		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.17",
+		"@types/stripe": "^6.31.10",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
@@ -186,11 +188,11 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.4.0",
+		"husky": "^3.0.1",
 		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.1.0",
-		"karma-chrome-launcher": "^2.2.0",
+		"karma-chrome-launcher": "^3.0.0",
 		"karma-cli": "^2.0.0",
 		"karma-coverage-istanbul-reporter": "^2.0.5",
 		"karma-jasmine": "^2.0.1",
@@ -203,7 +205,7 @@
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
 		"typescript": "3.4.5",
-		"typescript-tslint-plugin": "^0.5.0",
+		"typescript-tslint-plugin": "^0.5.4",
 		"webpack-dev-server": "^3.3.1",
 		"yargs": "^13.2.4"
 	},

admin/website-angular/src/app/@shared/payment-gateways/payPal-gateway/payPal-gateway.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, ViewChild } from '@angular/core';
 import PaymentGateways, {
-	paymentGatewaysToString
+	paymentGatewaysToString,
+	paymentGatewaysLogo
 } from '@modules/server.common/enums/PaymentGateways';
 import { Country } from '@modules/server.common/entities';
 import { NgForm } from '@angular/forms';
@@ -16,7 +17,7 @@ export class PayPalGatewayComponent {
 
 	isPayPalEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.PayPal);
-	logo = 'https://avatars1.githubusercontent.com/u/476675?s=200&v=4';
+	logo = paymentGatewaysLogo(PaymentGateways.PayPal);
 
 	@Input()
 	currenciesCodes: string[] = [];

admin/website-angular/src/app/@shared/payment-gateways/stripe-gateway/stripe-gateway.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, OnChanges, ViewChild } from '@angular/core';
 import PaymentGateways, {
-	paymentGatewaysToString
+	paymentGatewaysToString,
+	paymentGatewaysLogo
 } from '@modules/server.common/enums/PaymentGateways';
 import { Country } from '@modules/server.common/entities';
 import { NgForm } from '@angular/forms';
@@ -19,7 +20,7 @@ export class StripeGatewayComponent {
 
 	isStripeEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
-	logo = 'https://stripe.com/img/v3/home/twitter.png';
+	logo = paymentGatewaysLogo(PaymentGateways.Stripe);
 	invalidUrl: boolean;
 
 	private _ngDestroy$ = new Subject<void>();

admin/website-angular/src/app/app.module.ts

@@ -55,7 +55,7 @@ import { ServerConnectionService } from '@modules/client.common.angular2/service
 			}
 		}),
 		CommonModule.forRoot({ apiUrl: environment.SERVICES_ENDPOINT }),
-		NgbModule.forRoot(),
+		NgbModule,
 		ThemeModule.forRoot(),
 		CoreModule.forRoot()
 	],

admin/website-angular/src/app/pages/+carriers/+carrier/carrier.module.ts

@@ -11,7 +11,6 @@ import { CarrierOrdersComponent } from './carrier-orders/carrier-orders.componen
 import { FormWizardModule } from 'angular2-wizard';
 import { ToasterModule } from 'angular2-toaster';
 import { TranslateModule } from '@ngx-translate/core';
-import { Ng2SmartTableModule } from 'ng2-smart-table/ng2-smart-table.module';
 import { CarrierMutationModule } from '../../../@shared/carrier/carrier-mutation';
 import { HighlightModule } from 'ngx-highlightjs';
 import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
@@ -24,6 +23,7 @@ import { CarriersOrdersService } from '../../../@core/data/carriers-orders.servi
 import { CarrierOrdersTableModule } from '../../../@shared/render-component/carrier-orders-table/carrier-orders-table.module';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { FormsModule } from '@angular/forms';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
 
 @NgModule({
 	imports: [

admin/website-angular/src/app/pages/+products/+product/product.module.ts

@@ -6,9 +6,9 @@ import { routes } from './product.routes';
 import { FormWizardModule } from 'angular2-wizard';
 import { ToasterModule } from 'angular2-toaster';
 import { TranslateModule } from '@ngx-translate/core';
-import { Ng2SmartTableModule } from 'ng2-smart-table/ng2-smart-table.module';
 import { HighlightModule } from 'ngx-highlightjs';
 import { ProductComponent } from './product.component';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
 
 @NgModule({
 	imports: [