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

Merge pull request #1331 from ever-co/feature/comment-order-product 

Feature/comment order product
parents 329ab641 00220b76

packages/common-angular/package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "@ever-platform/common-angular",

	"description": "Ever Platform Shared Angular Core",

	"license": "AGPL-3.0",

	"version": "0.3.6",

	"version": "0.3.7",

	"homepage": "https://ever.co",

	"repository": {

		"type": "git",

packages/common-angular/src/routers/order-router.service.ts

+14 −0
Original line number Diff line number Diff line
@@ -116,6 +116,20 @@ export class OrderRouter implements IOrderRouter { 
		return this._orderFactory(order);

	}



	async addProductComment(

		orderId: Order['id'],

		productId: string,

		comment: string

	): Promise<Order> {

		const order = await this.router.run<IOrder>(

			'addProductComment',

			orderId,

			productId,

			comment

		);

		return this._orderFactory(order);

	}



	protected _orderFactory(order: IOrder) {

		return order == null ? null : new Order(order);

	}

packages/common/package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "@ever-platform/common",

	"description": "Ever Platform Shared Core",

	"license": "AGPL-3.0",

	"version": "0.3.31",

	"version": "0.3.32",

	"homepage": "https://ever.co",

	"repository": {

		"type": "git",

packages/common/src/entities/OrderProduct.ts

+10 −0
Original line number Diff line number Diff line
@@ -110,6 +110,16 @@ class OrderProduct extends DBObject<IOrderProduct, IOrderProductCreateObject> 
	@Schema({ required: false, type: Number })

	@Column()

	deliveryTimeMax?: number;



	/**

	 * Comment

	 *

	 * @type {string}

	 * @memberof OrderProduct

	 */

	@Schema({ type: String, required: false })

	@Column()

	comment?: string;

}



export default OrderProduct;

packages/common/src/interfaces/IOrderProduct.ts

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ export interface IOrderProductCreateObject extends DBCreateObject { 
	isCarrierRequired?: boolean;

	isDeliveryRequired?: boolean;

	isTakeaway?: boolean;

	comment?: string;

}



interface IOrderProduct extends IOrderProductCreateObject, DBRawObject {