Merge branch 'develop' into feat/#1049-incomplete-order-2 (03f934b6) · Commits · Isfand Yar Khan / ever-demand

packages/admin-web-angular/package.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "@ever-platform/admin-web-angular",
		"version": "0.3.2",
		"version": "0.3.7",
		"description": "Ever Admin",
		"license": "AGPL-3.0",
		"homepage": "https://ever.co",

+18 −0

Original line number	Diff line number	Diff line
		@@ -135,7 +135,25 @@ export class CarriersService {
		getCarrier(id: $id) {
		id
		firstName
		lastName
		phone
		logo
		isDeleted
		numberOfDeliveries
		skippedOrderIds
		status
		isActive
		username
		isSharedCarrier
		geoLocation {
		city
		streetAddress
		house
		loc {
		type
		coordinates
		}
		}
		}
		}
		`,

+16 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,22 @@ export class Store {
		localStorage.setItem('serverConnection', val);
		}

		get adminPasswordReset() {
		return localStorage.getItem('adminPasswordReset');
		}

		set adminPasswordReset(val: string) {
		localStorage.setItem('adminPasswordReset', val);
		}

		get fakeDataGenerator() {
		return localStorage.getItem('fakeDataGenerator');
		}

		set fakeDataGenerator(val: string) {
		localStorage.setItem('fakeDataGenerator', val);
		}

		clearMaintenanceMode() {
		localStorage.removeItem('maintenanceMode');
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -272,7 +272,6 @@ export class WarehousesService {

		return res.data['getCountOfMerchants'];
		}

		protected _warehouseFactory(warehouse: IWarehouse) {
		return warehouse == null ? null : new Warehouse(warehouse);
		}

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		import { Injectable } from '@angular/core';
		import { Store } from '../data/store.service';
		import { Apollo } from 'apollo-angular';
		import { IAdminAppSettings } from '@modules/server.common/interfaces/IAppsSettings';
		import gql from 'graphql-tag';
		import { take, map } from 'rxjs/operators';

		@Injectable({
		providedIn: 'root',
		})
		export class ServerSettingsService {
		constructor(
		private readonly _apollo: Apollo,
		private readonly store: Store
		) {}

		async load() {
		return new Promise(async (resolve, reject) => {
		const res = await this.getAdminAppSettings();

		if (res) {
		this.store.adminPasswordReset = res.adminPasswordReset;
		this.store.fakeDataGenerator = res.fakeDataGenerator;
		}

		resolve(true);
		});
		}

		getAdminAppSettings() {
		return this._apollo
		.query<{ settings: IAdminAppSettings }>({
		query: gql`
		query adminAppSettings {
		adminAppSettings {
		adminPasswordReset
		fakeDataGenerator
		}
		}
		`,
		})
		.pipe(
		take(1),
		map((res) => res.data['adminAppSettings'])
		)
		.toPromise();
		}
		}