Release 01

packages/admin-web-angular/.env.template

@@ -4,36 +4,36 @@
 
 # Don't forget to update scripts/*.ts and src/environments/*.ts on changes!
 
-HTTPS_SERVICES_ENDPOINT=https://localhost:5501
-SERVICES_ENDPOINT=http://localhost:5500
-GQL_ENDPOINT=http://localhost:5555/graphql
-GQL_SUBSCRIPTIONS_ENDPOINT=ws://localhost:5050/subscriptions
+HTTPS_SERVICES_ENDPOINT=https://bellem.cm:5501
+SERVICES_ENDPOINT=http://bellem.cm:5500
+GQL_ENDPOINT=http://bellem.cm:5555/graphql
+GQL_SUBSCRIPTIONS_ENDPOINT=ws://bellem.cm:5050/subscriptions
 
 # Insert below Google Maps API Key and make sure you restrict access to it
-GOOGLE_MAPS_API_KEY=
+GOOGLE_MAPS_API_KEY=AIzaSyDudKVRLfNoQFm9JFvGQkGfdxZAbgqXLDE
 
-DEFAULT_LATITUDE=42.6459136
-DEFAULT_LONGITUDE=23.3332736
+DEFAULT_LATITUDE=4.094836
+DEFAULT_LONGITUDE=9.743204
 
 NO_INTERNET_LOGO=assets/images/ever-logo.svg
 
 MAP_MERCHANT_ICON_LINK=http://maps.google.com/mapfiles/kml/pal3/icon21.png
 MAP_USER_ICON_LINK=http://maps.google.com/mapfiles/kml/pal3/icon48.png
 MAP_CARRIER_ICON_LINK=http://maps.google.com/mapfiles/kml/pal4/icon54.png
-API_FILE_UPLOAD_URL=https://api.cloudinary.com/v1_1/evereq/upload
+API_FILE_UPLOAD_URL=https://api.cloudinary.com/v1_1/bellem/image/upload
 
-COMPANY_NAME=Ever Co. LTD
-COMPANY_SITE_LINK=https://ever.co/
-COMPANY_GITHUB_LINK=https://github.com/ever-co
-COMPANY_FACEBOOK_LINK=https://www.facebook.com/evercoapp
-COMPANY_TWITTER_LINK=https://twitter.com/evercoapp
-COMPANY_LINKEDIN_LINK=https://www.linkedin.com/company/ever-co.
+COMPANY_NAME=Bellem
+COMPANY_SITE_LINK=https://bellem.cm/
+COMPANY_GITHUB_LINK=https://github.com/bellem
+COMPANY_FACEBOOK_LINK=https://www.facebook.com/bellemapp
+COMPANY_TWITTER_LINK=https://twitter.com/bellemapp
+COMPANY_LINKEDIN_LINK=https://www.linkedin.com/company/bellem.
 
 GENERATE_PASSWORD_CHARSET=abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789$_
 
-CURRENCY_SYMBOL=$
+CURRENCY_SYMBOL=XAF
 
-DEFAULT_LANGUAGE=en-US
+DEFAULT_LANGUAGE=fr-FR
 
 # For maintenance micro service. Ever maintanance API URL: https://maintenance.ever.co/status
 SETTINGS_APP_TYPE=admin

packages/admin-web-angular/package.json

@@ -35,30 +35,30 @@
 		"IE 11"
 	],
 	"scripts": {
-		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node -P tsconfig.commonjs.json ./scripts/configure.ts",
-		"ng:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ng",
-		"ng:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn ng",
-		"conventional-changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 conventional-changelog",
-		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
-		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve",
-		"start:server:prod": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run build:prod && node --harmony ./dist/out-tsc/app.js",
-		"start:server:pm2": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run build:prod && node --harmony ./dist/out-tsc/packages/admin-web-angular/src/pm2bootstrap.js",
-		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn ng:dev build && yarn tsc",
-		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ng:prod build -- --prod --aot=false --build-optimizer=false && yarn tsc",
-		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng:dev test",
-		"test:coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && rimraf coverage && yarn run test -- --code-coverage",
-		"lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng:dev lint",
-		"lint:fix": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng:dev lint ever-admin --fix",
-		"lint:styles": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && stylelint ./src/**/*.scss",
-		"lint:ci": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run lint && yarn run lint:styles",
-		"pree2e": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && webdriver-manager update --standalone false --gecko false",
-		"e2e": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng e2e",
-		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs",
-		"docs:serve": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs -s",
-		"release:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run conventional-changelog -- -p angular -i CHANGELOG.md -s",
-		"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && start-storybook -p 9001 -c .storybook",
-		"build-storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && build-storybook -c .storybook"
+		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn ts-node -P tsconfig.commonjs.json ./scripts/configure.ts",
+		"ng:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn ng",
+		"ng:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 yarn ng",
+		"conventional-changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 conventional-changelog",
+		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config -- --environment=dev",
+		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 yarn run config -- --environment=prod",
+		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && ng serve",
+		"start:server:prod": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run build:prod && node --harmony ./dist/out-tsc/app.js",
+		"start:server:pm2": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 yarn run build:prod && node --harmony ./dist/out-tsc/packages/admin-web-angular/src/pm2bootstrap.js",
+		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && yarn ng:dev build && yarn tsc",
+		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 yarn run config:prod && yarn ng:prod build -- --prod --aot=false --build-optimizer=false && yarn tsc",
+		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && ng:dev test",
+		"test:coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && rimraf coverage && yarn run test -- --code-coverage",
+		"lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && ng:dev lint",
+		"lint:fix": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && ng:dev lint ever-admin --fix",
+		"lint:styles": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && stylelint ./src/**/*.scss",
+		"lint:ci": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && yarn run lint && yarn run lint:styles",
+		"pree2e": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && webdriver-manager update --standalone false --gecko false",
+		"e2e": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && ng e2e",
+		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs",
+		"docs:serve": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs -s",
+		"release:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && yarn run conventional-changelog -- -p angular -i CHANGELOG.md -s",
+		"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && start-storybook -p 9001 -c .storybook",
+		"build-storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn run config:dev && build-storybook -c .storybook"
 	},
 	"dependencies": {
 		"@agm/core": "^1.1.0",

packages/admin-web-angular/scripts/env.ts

@@ -62,8 +62,8 @@ export const env: Env = cleanEnv(
 
 		GOOGLE_MAPS_API_KEY: str({ default: '' }),
 
-		DEFAULT_LATITUDE: num({ default: 42.6459136 }),
-		DEFAULT_LONGITUDE: num({ default: 23.3332736 }),
+		DEFAULT_LATITUDE: num({ default: 4.0850277 }),
+		DEFAULT_LONGITUDE: num({ default: 9.7535913 }),
 
 		NO_INTERNET_LOGO: str({ default: 'assets/images/ever-logo.svg' }),
 

packages/admin-web-angular/src/app/@core/data/warehouses.service.ts

@@ -77,6 +77,7 @@ export class WarehousesService {
 						getAllStores {
 							id
 							_createdAt
+							ordersPhone
 							geoLocation {
 								loc {
 									coordinates
@@ -98,6 +99,7 @@ export class WarehousesService {
 							id
 							_createdAt
 							name
+							ordersPhone
 							logo
 							geoLocation {
 								loc {
@@ -123,6 +125,7 @@ export class WarehousesService {
 							_id
 							_createdAt
 							name
+							ordersPhone
 							contactEmail
 							contactPhone
 							logo
@@ -155,6 +158,7 @@ export class WarehousesService {
 						nearbyStores(geoLocation: $geoLocation) {
 							_id
 							name
+							ordersPhone
 							contactEmail
 							contactPhone
 							logo

packages/admin-web-angular/src/app/@shared/file-uploader/file-uploader.component.ts

@@ -111,7 +111,7 @@ export class FileUploaderComponent {
 			fileItem: any,
 			form: FormData
 		): any => {
-			form.append('upload_preset', 'everbie-products-images');
+			form.append('upload_preset', 'upload_preset');
 
 			let tags = 'myphotoalbum';
 

packages/admin-web-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts

@@ -53,7 +53,7 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 	constructor(
 		private readonly fb: FormBuilder,
 		private readonly _langTranslateService: TranslateService
-	) {}
+	) { }
 
 	get image() {
 		return this.form.get('image');
@@ -74,23 +74,14 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 	get usedLanguage() {
 		const usedLanguage = this._langTranslateService.currentLang;
 		switch (usedLanguage) {
+			case 'fr-Fr':
+				return 'fr-FR';
+
 			case 'en-US':
 				return 'en-US';
-
-			case 'bg-BG':
-				return 'bg-BG';
-
-			case 'he-IL':
-				return 'he-IL';
-
-			case 'ru-RU':
-				return 'ru-RU';
-
-			case 'es-ES':
-				return 'es-ES';
-
+
 			default:
-				return 'en-US';
+				return 'fr-FR';
 		}
 	}
 
@@ -113,9 +104,9 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 			({ locale, value }) => {
 				return locale === usedLanguage
 					? {
-							locale: usedLanguage,
-							value: this.name.value,
-					  }
+						locale: usedLanguage,
+						value: this.name.value,
+					}
 					: { locale, value };
 			}
 		);

packages/admin-web-angular/src/app/@shared/render-component/store-product-is-available-checkbox/is-available-checkbox.component.ts

@@ -35,6 +35,7 @@ export class IsAvailableCheckBox implements ViewCell, OnInit {
 		this.isChecked = this.rowData.isProductAvailable;
 		this.wareHouseId = this.rowData.storeId;
 		this.productId = this.rowData.product.id;
+		console.warn(this.rowData);
 	}
 
 	async clickHandler() {

packages/admin-web-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html

@@ -116,6 +116,7 @@
 							| translate
 					}}
 				</nb-checkbox>
+
 				<input
 					*ngIf="forwardingPhone"
 					type="text"
@@ -126,6 +127,20 @@
 					formControlName="ordersPhone"
 				/>
 
+				<!--
+				<select
+					*ngIf="forwardingPhone"
+					id="ordersPhone"
+					[formControl]="type"
+					type="select"
+					class="form-control"
+					formControlName="ordersPhone"
+					>
+			    <option [ngValue]="null">Select a service ...</option>
+			    <option *ngFor="let type of services | keyvalue" [ngValue]="type.value">{{type.value}}</option>
+			  </select>
+				-->
+
 				<div
 					*ngIf="
 						(ordersPhone.errors ||

packages/admin-web-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts

@@ -14,6 +14,18 @@ export type WarehouseContactInfo = Pick<
 >;
 
 const phoneNumberRegex = /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$/;
+const serviceRegex = ("cake|drinks|food|clean|med|messenger|pizza|mart");
+
+enum services {
+  cake = 'Cake',
+  drinks = 'Drinks',
+  food = 'Food',
+	clean = 'Clean',
+	med = 'Med',
+	messenger = 'Messenger',
+	pizza = 'Pizza',
+  mart = 'Mart'
+}
 
 @Component({
 	selector: 'ea-warehouse-contact-info-form',
@@ -24,7 +36,10 @@ export class ContactInfoFormComponent {
 	readonly form: FormGroup;
 
 	forwardingEmail: boolean;
-	forwardingPhone: boolean;
+	forwardingPhone: boolean = true;
+
+	services = services;
+
 
 	static buildForm(formBuilder: FormBuilder): FormGroup {
 		// would be used in the parent component and injected into this.form
@@ -33,9 +48,10 @@ export class ContactInfoFormComponent {
 			contactPhone: ['', [Validators.pattern(phoneNumberRegex)]],
 			contactEmail: ['', [Validators.email]],
 
-			forwardOrdersUsing: [],
+			forwardOrdersUsing: [ForwardOrdersMethod.Phone],
 
-			ordersPhone: ['', [Validators.pattern(phoneNumberRegex)]],
+			// OrdersPhone will be used to store services
+			ordersPhone: ['', [Validators.pattern(serviceRegex)]],
 			ordersEmail: ['', [Validators.email]],
 		});
 	}
@@ -121,6 +137,7 @@ export class ContactInfoFormComponent {
 	}
 
 	forwardingPhoneChange() {
+		/*
 		this.forwardingPhone = !this.forwardingPhone;
 		let forwardOrdersUsingArr = this.forwardOrdersUsing.value || [];
 
@@ -135,6 +152,8 @@ export class ContactInfoFormComponent {
 		}
 
 		this.forwardOrdersUsing.setValue(forwardOrdersUsingArr);
+		*/
+			this.forwardingPhone = true;
 	}
 
 	forwardingEmailChange() {

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts

@@ -85,7 +85,12 @@ export class WarehouseManageTabsComponent {
 	}
 
 	get validForm() {
-		return this.form.valid && this.paymentsSettingsForm.isPaymentValid;
+		return (
+			this.form.valid &&
+			this.contactInfoForm.validForm &&
+			this.paymentsSettingsForm.isPaymentValid &&
+			this.paymentsSettingsForm.isCashPaymentEnabled
+		);
 	}
 
 	get deliveryAreas() {

packages/admin-web-angular/src/app/@theme/components/footer/footer.component.html

@@ -7,21 +7,11 @@
 	>. {{ 'FOOTER_VIEW.ALL_RIGHTS_RESERVED' | translate }}.</span
 >
 <div class="socials">
-	<a
-		href="{{ companyGithubLink }}"
-		target="_blank"
-		class="ion ion-logo-github"
-	></a>
 	<a
 		href="{{ companyFacebookLink }}"
 		target="_blank"
 		class="ion ion-logo-facebook"
 	></a>
-	<a
-		href="{{ companyTwitterLink }}"
-		target="_blank"
-		class="ion ion-logo-twitter"
-	></a>
 	<a
 		href="{{ companyLinkedinLink }}"
 		target="_blank"

packages/admin-web-angular/src/app/@theme/components/theme-settings/theme-settings.component.html

@@ -51,11 +51,12 @@ <h6>LANGUAGE</h6>
 				{{ lang.name }}</option
 			>
 		</select>
-	</div>
+		<!-- </div>
 
 	<div class="switcher">
 		<ngx-layout-direction-switcher
 			[vertical]="true"
 		></ngx-layout-direction-switcher>
+	</div> -->
 	</div>
 </div>