Merge branch 'develop' into feat/#60-popup-promotions (985cc062) · 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.0",
		"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
		}
		}
		}
		}
		`,

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ export default class FakeDataProducts {
		value: this._getRandomProductName(),
		},
		{
		locale: 'he-LI',
		locale: 'he-IL',
		value: 'רק איזה סוג של מוצר',
		},
		],

+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);
		}