Merge pull request #1056 from ever-co/feat#1036/admin-translations (d9db789b) · Commits · Isfand Yar Khan / ever-demand

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

+20 −5

Original line number	Diff line number	Diff line
		@@ -4,7 +4,10 @@
		<div class="col-8">
		<nb-card>
		<nb-card-header>
		Track all merchants
		{{
		'WAREHOUSES_VIEW.MERCHANTS.TRACK_ALL_MERCHANTS'
		\| translate
		}}
		</nb-card-header>
		<nb-card-body>
		<div #gmap class="googleMap"></div>
		@@ -15,13 +18,19 @@
		<div class="col-4">
		<nb-card>
		<nb-card-header>
		Filter Merchants
		{{
		'WAREHOUSES_VIEW.MERCHANTS.FILTER_MERCHANTS'
		\| translate
		}}
		</nb-card-header>
		<nb-card-body style="overflow:inherit;">
		<div>
		<ng-select
		[items]="listOfMerchants"
		placeholder="Filter by Name"
		[placeholder]="
		'WAREHOUSES_VIEW.MERCHANTS.FILTER_BY_NAME'
		\| translate
		"
		[clearable]="true"
		bindLabel="name"
		[(ngModel)]="merchantName"
		@@ -43,7 +52,10 @@
		[items]="listOfCities"
		[(ngModel)]="merchantCity"
		[clearable]="true"
		placeholder="Filter by City"
		[placeholder]="
		'WAREHOUSES_VIEW.MERCHANTS.FILTER_BY_CITY'
		\| translate
		"
		bindLabel="city"
		style="width:100%; margin-bottom:30px;"
		(change)="filterByCity($event)"
		@@ -68,7 +80,10 @@
		<ng-select
		[items]="listOfCountries"
		[clearable]="true"
		placeholder="Filter by City"
		[placeholder]="
		'WAREHOUSES_VIEW.MERCHANTS.FILTER_BY_COUNTRY'
		\| translate
		"
		bindLabel="city"
		[(ngModel)]="merchantCountry"
		style="width:100%; margin-bottom:30px;"

+2 −2

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
		onComponentInitFunction: async (
		instance: StatusComponent
		) => {
		instance.text = 'paid';
		instance.text = paid;
		instance.checkOrderField = 'isPaid';
		},
		width: '100px'
		@@ -281,7 +281,7 @@ export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
		onComponentInitFunction: async (
		instance: StatusComponent
		) => {
		instance.text = 'cancelled';
		instance.text = cancelled;
		instance.checkOrderField = 'isCancelled';
		},
		width: '100px'

+3 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,9 @@
		routerLink="track"
		>
		<i class="ion-md-map button-icon mr-1"></i>
		<small _ngcontent-c55="">Show on Map</small>
		<small _ngcontent-c55="">{{
		'WAREHOUSES_VIEW.SHOW_ON_MAP' \| translate
		}}</small>
		</button>
		</nb-card-header>

+8 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,7 @@
		"DELETE_WAREHOUSES": "Изтрий Селектирани",
		"DELETE": "Изтрий",
		"CREATE": "създавам",
		"SHOW_ON_MAP": "Покажи на карта",
		"SMART_TABLE_COLUMNS": {
		"IMAGE": "Изображение",
		"NAME": "Име",
		@@ -392,6 +393,13 @@
		"STORE_INFO": "Информация за магазина",
		"STORE_ID": "Идент. № на магазина",
		"STORE_NAME": "Име на Магазина"
		},
		"MERCHANTS": {
		"TRACK_ALL_MERCHANTS": "Проследи всички търговци",
		"FILTER_MERCHANTS": "Филтрирай търговци",
		"FILTER_BY_NAME": "Филтрирай по име",
		"FILTER_BY_CITY": "Филтрирай по град",
		"FILTER_BY_COUNTRY": "Филтрирай по държава"
		}
		},
		"WAREHOUSE_VIEW": {

+8 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,7 @@
		"DELETE_WAREHOUSES": "Delete Selected",
		"DELETE": "DELETE",
		"CREATE": "CREATE",
		"SHOW_ON_MAP": "Show on map",
		"SMART_TABLE_COLUMNS": {
		"IMAGE": "Image",
		"NAME": "Name",
		@@ -392,6 +393,13 @@
		"STORE_INFO": "Store Info",
		"STORE_ID": "Store ID",
		"STORE_NAME": "Store Name"
		},
		"MERCHANTS": {
		"TRACK_ALL_MERCHANTS": "Track all merchants",
		"FILTER_MERCHANTS": "Filter merchants",
		"FILTER_BY_NAME": "Filter by name",
		"FILTER_BY_CITY": "Filter by city",
		"FILTER_BY_COUNTRY": "Filter by country"
		}
		},
		"WAREHOUSE_VIEW": {