Unverified Commit ed5120d5 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge pull request #1185 from ever-co/fix/#1181-register-carrier-countries-order

fix: #1181 admin register carrier countries order
parents 64b38c65 1adba275
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import {
	Country,
	CountryName,
	getCountryName,
	countriesIdsToNamesArray,
} from '@modules/server.common/entities/GeoLocation';
import { FormHelpers } from '../helpers';

@@ -57,11 +58,10 @@ export class LocationFormComponent implements AfterViewInit {

	public showCoordinates: boolean = false;

	static COUNTRIES: Array<{ id: Country; name: CountryName }> = Object.keys(
		countries
	).map((abbr) => {
		return { id: Country[abbr], name: getCountryName(+Country[abbr]) };
	});
	static COUNTRIES: Array<{
		id: Country;
		name: CountryName;
	}> = countriesIdsToNamesArray;

	private _lastUsedAddressText: string;
	private _lat: number;
+2 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import {
	Country,
	getCountryName,
	CountryName,
	countriesIdsToNamesArray,
} from '@modules/server.common/entities/GeoLocation';
import { GeoLocationRouter } from '@modules/client.common.angular2/routers/geo-location-router.service';
import InviteRequest from '@modules/server.common/entities/InviteRequest';
@@ -42,9 +43,7 @@ export class LocationFormComponent
	public static COUNTRIES: Array<{
		id: Country;
		name: CountryName;
	}> = Object.keys(countries).map((abbr) => {
		return { id: Country[abbr], name: getCountryName(+Country[abbr]) };
	});
	}> = countriesIdsToNamesArray;

	@Input()
	public InitUser: User;