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

Merge pull request #1114 from ever-co/feat/#40-location-notes 

Feat/#40 location notes
parents 4d0263a6 cf5e190c

packages/admin-web-angular/src/app/@core/data/fakeDataServices/invites.ts

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ export default class FakeDataInvites { 
				geoLocation: {

					city: faker.address.city(),

					postcode: faker.address.zipCode(),

					notes: faker.lorem.text(1),

					streetAddress: faker.address.streetAddress(),

					house: faker.random.number(199).toString(),

					countryId: faker.random.number(1) as Country,

packages/admin-web-angular/src/app/@core/data/fakeDataServices/users.ts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ export default class FakeDataUsers { 
					countryId: faker.random.number(200) as Country,

					city: faker.address.city(),

					postcode: faker.address.zipCode(),

					notes: faker.lorem.text(1),

					streetAddress: faker.address.streetAddress(),

					house: faker.random.number(199).toString(),

					loc: {

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ export class UsersService { 
								streetAddress

								city

								house

								notes

								loc {

									type

									coordinates

packages/admin-web-angular/src/app/pages/+customers/+customer/ea-customer-info/ea-customer-info.component.html

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
							', ' + user.geoLocation.countryName

					}}

				</div>

				<div>Notes: {{ user.geoLocation.notes }}</div>

			</div>

		</div>

packages/admin-web-angular/src/app/pages/+orders/+order/order.component.ts

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ export class OrderComponent implements OnDestroy { 
		}

		if (user.geoLocation) {

			details.push(user.fullAddress);



			user.geoLocation.notes =

				user.geoLocation.notes === undefined

					? ''

					: user.geoLocation.notes;



			details.push(`Notes: ${user.geoLocation.notes}`);

		}

		return details.filter((d) => d);

	}