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

Merge pull request #1284 from ever-co/feat/#45-enable-disable-store 

Feat/#45 enable disable In-store mode
parents 3dbd65b9 03b2690e

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

+11 −0
Original line number Diff line number Diff line
@@ -172,6 +172,17 @@ 
				</select>

			</div>

		</div>

		<div class="form-group row">

			<div class="col-sm-9 offset-sm-2">

				<div class="checkbox">

					<nb-checkbox status="success" formControlName="inStoreMode">

						{{

							'WAREHOUSE_VIEW.MUTATION.IN_STORE_MODE' | translate

						}}

					</nb-checkbox>

				</div>

			</div>

		</div>



		<div class="form-group row">

			<label class="col-sm-2 control-label">{{

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

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ export type WarehouseManageTabsDetails = Pick< 
	| 'preferRestrictedCarriersForDelivery'

	| 'ordersShortProcess'

	| 'orderCancelation'

	| 'inStoreMode'

>;



@Component({
@@ -77,6 +78,10 @@ export class WarehouseManageTabsDetailsComponent 
		private readonly _translateService: TranslateService

	) {}



	get inStoreMode() {

		return this.form.get('inStoreMode');

	}



	get name() {

		return this.form.get('name');

	}
@@ -176,6 +181,7 @@ export class WarehouseManageTabsDetailsComponent 
			preferRestrictedCarriersForDelivery: [false],

			carriersIds: [[]],

			ordersShortProcess: [false],

			inStoreMode: [],



			enabledOrderCancelation: [false],

			stateOrderCancelation: [0],
@@ -203,6 +209,7 @@ export class WarehouseManageTabsDetailsComponent 
			useOnlyRestrictedCarriersForDelivery: boolean;

			preferRestrictedCarriersForDelivery: boolean;

			ordersShortProcess: boolean;

			inStoreMode: boolean;



			enabledOrderCancelation: boolean;

			stateOrderCancelation: number;
@@ -211,6 +218,7 @@ export class WarehouseManageTabsDetailsComponent 
		return {

			ordersShortProcess: basicInfo.ordersShortProcess,

			isActive: basicInfo.isActive,

			inStoreMode: basicInfo.inStoreMode,

			isManufacturing: basicInfo.isManufacturing,

			isCarrierRequired: basicInfo.isCarrierRequired,

			name: basicInfo.name,

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

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ 
			"ADD": "Добави",

			"EDIT": "Редактирай",

			"ZONE_NAME": "Име на зона",

			"IN_STORE_MODE": "В режим на съхраняване",

			"ERRORS": {

				"NAME_IS_REQUIRED": "Името на склада е задължително",

				"NAME_ATLEAST_3_CHARS": "Името трябва да е с дължина най-малко 3 знака",

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

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ 
			"EDIT": "Edit",

			"ZONE_NAME": "Zone name",

			"UNALLOWED_ORDER_CANCELATION": "Unallowed Order Cancelation",

			"IN_STORE_MODE": "In-store mode",

			"ORDER_CANCELATION_OPTIONS": {

				"ORDERING": "After Ordering",

				"START_PROCESSING": "After Start Processing",

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

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ 
			"EDIT": "Edit",

			"ZONE_NAME": "Zone name",

			"UNALLOWED_ORDER_CANCELATION": "Unallowed Order Cancelation",

			"IN_STORE_MODE": "In-store mode",

			"ORDER_CANCELATION_OPTIONS": {

				"ORDERING": "After Ordering",

				"START_PROCESSING": "After Start Processing",