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

Merge pull request #1111 from ever-co/fix/#983-show-on-map-back-btn 

fix: back btn on show on map page
parents 64b17965 c73776ad

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ 
			<div class="col-8">

				<nb-card>

					<nb-card-header>

						<div class="go-back">

							<nb-icon

								icon="arrow-back-outline"

								(click)="goBack()"

							>

							</nb-icon>

						</div>



						{{

							'WAREHOUSES_VIEW.MERCHANTS.TRACK_ALL_MERCHANTS'

								| translate

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss

+4 −0
Original line number Diff line number Diff line 
.googleMap {

	height: 700px;

}



.go-back {

	cursor: pointer;

}

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts

+9 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import { 
	getCountryName,

	CountryName,

} from '@modules/server.common/entities/GeoLocation';



import { Location } from '@angular/common';

@Component({

	templateUrl: './warehouse-track.component.html',

	styleUrls: ['./warehouse-track.component.scss'],
@@ -26,7 +26,10 @@ export class WarehouseTrackComponent implements OnInit { 
	merchantName: string;

	merchantCountry: CountryName;



	constructor(private warehouseService: WarehousesService) {}

	constructor(

		private warehouseService: WarehousesService,

		private location: Location

	) {}



	ngOnInit(): void {

		this.showMap();
@@ -188,4 +191,8 @@ export class WarehouseTrackComponent implements OnInit { 
			icon,

		});

	}



	goBack() {

		this.location.back();

	}

}