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

Merge pull request #1163 from ever-co/feat/#49-Admin-orders-short-process 

feat: admin turn off/on Orders short process
parents e8604853 d42f5f38

packages/admin-web-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ export type WarehouseBasicInfo = Pick< 
	| 'carriersIds'

	| 'useOnlyRestrictedCarriersForDelivery'

	| 'preferRestrictedCarriersForDelivery'

	| 'ordersShortProcess'

>;



@Component({
@@ -84,6 +85,7 @@ export class BasicInfoFormComponent implements OnInit { 
			hasRestrictedCarriers: [false, [Validators.required]],

			useOnlyRestrictedCarriersForDelivery: [false],

			preferRestrictedCarriersForDelivery: [false],

			ordersShortProcess: [false],

			carriersIds: [[]],

		});

	}
@@ -103,6 +105,7 @@ export class BasicInfoFormComponent implements OnInit { 
			carriersIds: string[];

			useOnlyRestrictedCarriersForDelivery: boolean;

			preferRestrictedCarriersForDelivery: boolean;

			ordersShortProcess: boolean;

		};



		if (!basicInfo.logo) {
@@ -134,6 +137,7 @@ export class BasicInfoFormComponent implements OnInit { 
						useOnlyRestrictedCarriersForDelivery: false,

						preferRestrictedCarriersForDelivery: false,

				  }),

			ordersShortProcess: basicInfo.ordersShortProcess,

		};

	}
@@ -144,6 +148,7 @@ export class BasicInfoFormComponent implements OnInit { 
			{

				useOnlyRestrictedCarriersForDelivery: false,

				preferRestrictedCarriersForDelivery: false,

				ordersShortProcess: false,

			},

			basicInfo

		);

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

+16 −0
Original line number Diff line number Diff line
@@ -96,6 +96,22 @@ 
			</div>

		</div>



		<div class="form-group row">

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

				<div class="checkbox">

					<nb-checkbox

						status="success"

						formControlName="ordersShortProcess"

					>

						{{

							'WAREHOUSE_VIEW.MUTATION.ORDERS_SHORT_PROCESS'

								| translate

						}}

					</nb-checkbox>

				</div>

			</div>

		</div>



		<div class="form-group row">

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

				<div class="checkbox">

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
@@ -32,6 +32,7 @@ export type WarehouseManageTabsDetails = Pick< 
	| 'isCarrierRequired'

	| 'useOnlyRestrictedCarriersForDelivery'

	| 'preferRestrictedCarriersForDelivery'

	| 'ordersShortProcess'

>;



@Component({
@@ -100,6 +101,9 @@ export class WarehouseManageTabsDetailsComponent 
	get preferRestrictedCarriersForDelivery() {

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

	}

	get ordersShortProcess() {

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

	}



	get delivery() {

		return this._delivery;
@@ -152,6 +156,7 @@ export class WarehouseManageTabsDetailsComponent 
			useOnlyRestrictedCarriersForDelivery: [false],

			preferRestrictedCarriersForDelivery: [false],

			carriersIds: [[]],

			ordersShortProcess: [false],

		});

	}
@@ -175,9 +180,11 @@ export class WarehouseManageTabsDetailsComponent 
			carriersIds: string[];

			useOnlyRestrictedCarriersForDelivery: boolean;

			preferRestrictedCarriersForDelivery: boolean;

			ordersShortProcess: boolean;

		};



		return {

			ordersShortProcess: basicInfo.ordersShortProcess,

			isActive: basicInfo.isActive,

			isManufacturing: basicInfo.isManufacturing,

			isCarrierRequired: basicInfo.isCarrierRequired,
@@ -212,6 +219,7 @@ export class WarehouseManageTabsDetailsComponent 
			{

				useOnlyRestrictedCarriersForDelivery: false,

				preferRestrictedCarriersForDelivery: false,

				ordersShortProcess: false,

			},

			basicInfo

		);

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

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ 
			"LOGO": "Logo",

			"PHOTO": "Photo",

			"IS_ACTIVE": "Is Active",

			"ORDERS_SHORT_PROCESS": "Orders Short Process",

			"PRODUCTS_MANUFACTURING": "Products Manufacturing",

			"CARRIER_REQUIRED": "Carrier required",

			"RIGHT_NOW": "Right now",

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

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ 
			"LOGO": "Logo",

			"PHOTO": "Photo",

			"IS_ACTIVE": "Is Active",

			"ORDERS_SHORT_PROCESS": "Orders Short Process",

			"PRODUCTS_MANUFACTURING": "Products Manufacturing",

			"CARRIER_REQUIRED": "Carrier required",

			"RIGHT_NOW": "Right now",