Merge pull request #1320 from ever-co/develop

Release
ever-co · Oct 27, 2020 · d72cd6d · d72cd6d
2 parents 1117488 + 20eda17
commit d72cd6d
Show file tree

Hide file tree

Showing 56 changed files with 891 additions and 184 deletions.
diff --git a/README.md b/README.md
@@ -279,7 +279,8 @@ All other brand and product names are trademarks, registered trademarks or servi
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e7b2b38660f44963989ac9d49ae76d4d)](https://www.codacy.com/app/Ever/ever?utm_source=github.com&utm_medium=referral&utm_content=ever-co/ever&utm_campaign=Badge_Grade)
 [![DeepScan grade](https://deepscan.io/api/teams/3293/projects/4849/branches/38566/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=4849&bid=38566)
 [![Known Vulnerabilities](https://snyk.io/test/github/ever-co/ever/badge.svg)](https://snyk.io/test/github/ever-co/ever)
-[![Greenkeeper badge](https://badges.greenkeeper.io/ever-co/ever.svg)](https://greenkeeper.io)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/ever-co/ever.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever/alerts/)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ever-co/ever.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever/context:javascript)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever?ref=badge_shield)
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io)
 

diff --git a/packages/common-angular/src/routers/warehouse-orders-router.service.ts b/packages/common-angular/src/routers/warehouse-orders-router.service.ts
@@ -8,6 +8,7 @@ import Order from '@modules/server.common/entities/Order';
 import IWarehouseOrdersRouter, {
 	IWarehouseOrdersRouterGetOptions,
 	IOrderCreateInput,
+	IOrderCreateInputProduct,
 } from '@modules/server.common/routers/IWarehouseOrdersRouter';
 import DeliveryType from '@modules/server.common/enums/DeliveryType';
 
@@ -42,6 +43,27 @@ export class WarehouseOrdersRouter implements IWarehouseOrdersRouter {
 		return this._orderFactory(order);
 	}
 
+	async userComplete(orderId: string): Promise<Order> {
+		const order = await this.router.run<IOrder>('userComplete', orderId);
+		return this._orderFactory(order);
+	}
+
+	async addMore(
+		warehouseId: string,
+		userId: string,
+		orderId: string,
+		products: IOrderCreateInputProduct[]
+	): Promise<Order> {
+		const order = await this.router.run<IOrder>(
+			'addMore',
+			warehouseId,
+			userId,
+			orderId,
+			products
+		);
+		return this._orderFactory(order);
+	}
+
 	async createByProductType(
 		userId: string,
 		warehouseId: string,

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -2,7 +2,7 @@
 	"name": "@ever-platform/common",
 	"description": "Ever Platform Shared Core",
 	"license": "AGPL-3.0",
-	"version": "0.3.24",
+	"version": "0.3.31",
 	"homepage": "https://ever.co",
 	"repository": {
 		"type": "git",

diff --git a/packages/common/src/entities/Order.ts b/packages/common/src/entities/Order.ts
@@ -142,6 +142,16 @@ class Order extends DBObject<IOrder, IOrderCreateObject> implements IOrder {
 	@Column()
 	isCancelled: boolean;
 
+	/**
+	 * Is Order wait for completion by user
+	 *
+	 * @type {boolean}
+	 * @memberof Order
+	 */
+	@Types.Boolean(false)
+	@Column()
+	waitForCompletion: boolean;
+
 	/**
 	 * Is Order Paid by Customer
 	 *

diff --git a/packages/common/src/interfaces/IOrder.ts b/packages/common/src/interfaces/IOrder.ts
@@ -53,6 +53,13 @@ export interface IOrderCreateObject extends DBCreateObject {
 	 */
 	isCancelled?: boolean;
 
+	/**
+	 *
+	 * @type {boolean}
+	 * @memberof IOrderCreateObject
+	 */
+	waitForCompletion?: boolean;
+
 	/**
 	 * Indicate if Order was fully paid
 	 *

diff --git a/packages/common/src/routers/IWarehouseOrdersRouter.ts b/packages/common/src/routers/IWarehouseOrdersRouter.ts
@@ -24,6 +24,7 @@ export interface IOrderCreateInput {
 	products: IOrderCreateInputProduct[];
 
 	orderType?: DeliveryType;
+	waitForCompletion?: boolean;
 	options?: IWarehouseOrdersRouterCreateOptions;
 }
 
@@ -37,6 +38,13 @@ interface IWarehouseOrdersRouter {
 
 	cancel(orderId: string): Promise<Order>;
 
+	addMore(
+		warehouseId: string,
+		userId: string,
+		orderId: string,
+		products: IOrderCreateInputProduct[]
+	): Promise<Order>;
+
 	createByProductType(
 		userId: string,
 		warehouseId: string,

diff --git a/packages/core/src/graphql/orders/orders.types.graphql b/packages/core/src/graphql/orders/orders.types.graphql
@@ -15,6 +15,7 @@ type Order {
 
 	isConfirmed: Boolean!
 	isCancelled: Boolean!
+	waitForCompletion: Boolean
 	isPaid: Boolean!
 	isCompleted: Boolean!
 	totalPrice: Float!