Merge pull request #1152 from ever-co/fix/#1148-admin-delivery-zones (5066d743) · Commits · Isfand Yar Khan / ever-demand

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.html

+40 −14

Original line number	Diff line number	Diff line
		@@ -14,7 +14,10 @@
		[hidden]="isEditing"
		class="form-group row mb-4 centered"
		>
		<span>Select shape to add a new zone</span>
		<span>{{
		'WAREHOUSE_VIEW.MUTATION.SELECT_SHAPE_TO_ADD_ZONE'
		\| translate
		}}</span>
		<div class="col-sm-12 btn-container">
		<button
		(click)="
		@@ -22,7 +25,7 @@
		"
		nbButton
		>
		Circle
		{{ 'WAREHOUSE_VIEW.MUTATION.CIRCLE' \| translate }}
		</button>
		<button
		(click)="
		@@ -30,7 +33,7 @@
		"
		nbButton
		>
		Shape
		{{ 'WAREHOUSE_VIEW.MUTATION.SHAPE' \| translate }}
		</button>
		</div>
		</div>
		@@ -39,21 +42,28 @@
		class="mb-4"
		*ngIf="!shapeReady && selectedShapeType"
		[hidden]="isEditing"
		>Draw a shape on the map</span
		>{{
		'WAREHOUSE_VIEW.MUTATION.DRAW_SHAPE_ON_MAP' \| translate
		}}</span
		>

		<fieldset *ngIf="shapeReady \|\| isEditing">
		<div class="form-group row">
		<label
		class="col-sm-4 d-flex align-items-center control-label"
		>Name</label
		>{{
		'WAREHOUSE_VIEW.MUTATION.NAME' \| translate
		}}</label
		>

		<div class="col-sm-8">
		<input
		type="text"
		class="form-control"
		placeholder="Zone name"
		[placeholder]="
		'WAREHOUSE_VIEW.MUTATION.ZONE_NAME'
		\| translate
		"
		formControlName="name"
		/>
		</div>
		@@ -62,7 +72,10 @@
		<div class="form-group row">
		<label
		class="col-sm-4 d-flex align-items-center control-label"
		>Minimum amount</label
		>{{
		'WAREHOUSE_VIEW.MUTATION.MINIMUM_AMOUNT'
		\| translate
		}}</label
		>

		<div class="col-sm-8">
		@@ -70,7 +83,10 @@
		type="number"
		step="0.1"
		class="form-control"
		placeholder="Minimum amount"
		[placeholder]="
		'WAREHOUSE_VIEW.MUTATION.MINIMUM_AMOUNT'
		\| translate
		"
		formControlName="amount"
		/>
		</div>
		@@ -79,7 +95,10 @@
		<div class="form-group row">
		<label
		class="col-sm-4 d-flex align-items-center control-label"
		>Delivery fee</label
		>{{
		'WAREHOUSE_VIEW.MUTATION.DELIVERY_FEE'
		\| translate
		}}</label
		>

		<div class="col-sm-8">
		@@ -87,7 +106,10 @@
		type="number"
		step="0.1"
		class="form-control"
		placeholder="Delvery fee"
		[placeholder]="
		'WAREHOUSE_VIEW.MUTATION.DELIVERY_FEE'
		\| translate
		"
		formControlName="fee"
		/>
		</div>
		@@ -100,7 +122,9 @@
		nbButton
		class="btn btn-wa rning"
		>
		Cancel
		{{
		'WAREHOUSE_VIEW.MUTATION.CANCEL' \| translate
		}}
		</button>

		<button
		@@ -112,7 +136,7 @@
		class="btn btn-primary"
		(click)="addZone()"
		>
		Add
		{{ 'WAREHOUSE_VIEW.MUTATION.ADD' \| translate }}
		</button>
		</div>

		@@ -125,7 +149,9 @@
		nbButton
		class="btn btn-warning"
		>
		Cancel
		{{
		'WAREHOUSE_VIEW.MUTATION.CANCEL' \| translate
		}}
		</button>
		<button
		[disabled]="deliverForm.status === 'INVALID'"
		@@ -133,7 +159,7 @@
		class="btn btn-primary"
		(click)="editZone()"
		>
		Edit
		{{ 'WAREHOUSE_VIEW.MUTATION.EDIT' \| translate }}
		</button>
		</div>
		</div>

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ export class WarehouseManageTabsDeliveryAreasComponent
		// Used to know when we're editing a zone
		isEditing: boolean = false;

		private _zoneNumber;
		private _zoneNumber = 0;

		private _map: google.maps.Map;
		private _drawingManager: google.maps.drawing.DrawingManager;

packages/admin-web-angular/src/assets/i18n/bg-BG.json

+10 −0

Original line number	Diff line number	Diff line
		@@ -450,6 +450,16 @@
		"AUTO_DETECT_COORDINATES": "Автоматично откриване на координати",
		"CARRIERS": "Превозвачите",
		"USE_ONLY_SPECIFIC_CARRIERS": "Използвайте само конкретни доставчици",
		"SELECT_SHAPE_TO_ADD_ZONE": "Изберете форма, за да добавите нова зона",
		"CIRCLE": "Кръг",
		"SHAPE": "Форма",
		"DRAW_SHAPE_ON_MAP": "Начертайте форма на картата",
		"MINIMUM_AMOUNT": "Минимална сума",
		"DELIVERY_FEE": "Такса за доставка",
		"CANCEL": "Отказ",
		"ADD": "Добави",
		"EDIT": "Редактирай",
		"ZONE_NAME": "Име на зона",
		"ERRORS": {
		"NAME_IS_REQUIRED": "Името на склада е задължително",
		"NAME_ATLEAST_3_CHARS": "Името трябва да е с дължина най-малко 3 знака",

packages/admin-web-angular/src/assets/i18n/bg.json

+40 −30

Original line number	Diff line number	Diff line
		@@ -420,36 +420,46 @@
		"CANT_PROCESSING_WITHOUT_PRODUCTS": "Can't processing the order without products."
		},
		"MUTATION": {
		"TITLE": "Register New Store",
		"NAME": "Name",
		"LOGO": "Logo",
		"PHOTO": "Photo",
		"IS_ACTIVE": "Is Active",
		"PRODUCTS_MANUFACTURING": "Products Manufacturing",
		"CARRIER_REQUIRED": "Carrier required",
		"RIGHT_NOW": "Right now",
		"ORDERS_PHONE": "Orders Phone",
		"CONTACT_PHONE": "Contact Phone",
		"ORDERS_EMAIL": "Orders Email",
		"CONTACT_EMAIL": "Contact Email",
		"FORWARD_ORDERS_WITH": "Forward Orders With",
		"USERNAME": "Username",
		"OLD_PASSWORD": "Old Password",
		"NEW_PASSWORD": "New Password",
		"CONFIRM_PASSWORD": "Confirm Password",
		"PASSWORDS_DO_NOT_MATCH": "Passwords do not match",
		"PASSWORD": "Password",
		"COUNTRY": "Country",
		"USA": "USA",
		"ISRAEL": "Israel",
		"BULGARIA": "Bulgaria",
		"CITY": "City",
		"ADDRESS": "Address",
		"POSTCODE": "Postcode",
		"COORDINATES": "Coordinates",
		"AUTO_DETECT_COORDINATES": "Auto detect coordinates",
		"CARRIERS": "Carriers",
		"USE_ONLY_SPECIFIC_CARRIERS": "Use only specific carriers",
		"TITLE": "Създай нов склад",
		"NAME": "Име",
		"LOGO": "Лого",
		"PHOTO": "Снимка",
		"IS_ACTIVE": "Активен ли е?",
		"PRODUCTS_MANUFACTURING": "Производство на изделия",
		"CARRIER_REQUIRED": "Необходим е превозвач",
		"RIGHT_NOW": "Точно сега",
		"ORDERS_PHONE": "Телефон за поръчки",
		"CONTACT_PHONE": "Телефон за връзка",
		"ORDERS_EMAIL": "Имейл за поръчки",
		"CONTACT_EMAIL": "Емейл за връзка",
		"FORWARD_ORDERS_WITH": "Препращайте поръчките с",
		"USERNAME": "Потребител",
		"OLD_PASSWORD": "Стара парола",
		"NEW_PASSWORD": "Нова Парола",
		"CONFIRM_PASSWORD": "Потвърди Парола",
		"PASSWORDS_DO_NOT_MATCH": "Паролите не съвпадат",
		"PASSWORD": "Парола",
		"COUNTRY": "Държава",
		"USA": "САЩ",
		"ISRAEL": "Израел",
		"BULGARIA": "България",
		"CITY": "Град",
		"ADDRESS": "Адрес",
		"POSTCODE": "Пощенски код",
		"COORDINATES": "Координати",
		"AUTO_DETECT_COORDINATES": "Автоматично откриване на координати",
		"CARRIERS": "Превозвачите",
		"USE_ONLY_SPECIFIC_CARRIERS": "Използвайте само конкретни доставчици",
		"SELECT_SHAPE_TO_ADD_ZONE": "Изберете форма, за да добавите нова зона",
		"CIRCLE": "Кръг",
		"SHAPE": "Форма",
		"DRAW_SHAPE_ON_MAP": "Начертайте форма на картата",
		"MINIMUM_AMOUNT": "Минимална сума",
		"DELIVERY_FEE": "Такса за доставка",
		"CANCEL": "Отказ",
		"ADD": "Добави",
		"EDIT": "Редактирай",
		"ZONE_NAME": "Име на зона",
		"ERRORS": {
		"NAME_IS_REQUIRED": "Warehouse name is required",
		"NAME_ATLEAST_3_CHARS": "Name must be at least 3 characters long",

packages/admin-web-angular/src/assets/i18n/en-US.json

+10 −0

Original line number	Diff line number	Diff line
		@@ -450,6 +450,16 @@
		"AUTO_DETECT_COORDINATES": "Auto detect coordinates",
		"CARRIERS": "Carriers",
		"USE_ONLY_SPECIFIC_CARRIERS": "Use only specific carriers",
		"SELECT_SHAPE_TO_ADD_ZONE": "Select shape to add a new zone",
		"CIRCLE": "Circle",
		"SHAPE": "Shape",
		"DRAW_SHAPE_ON_MAP": "Draw a shape on the map",
		"MINIMUM_AMOUNT": "Minimum amount",
		"DELIVERY_FEE": "Delivery fee",
		"CANCEL": "Cancel",
		"ADD": "Add",
		"EDIT": "Edit",
		"ZONE_NAME": "Zone name",
		"ERRORS": {
		"NAME_IS_REQUIRED": "Warehouse name is required",
		"NAME_ATLEAST_3_CHARS": "Name must be at least 3 characters long",