Commit 7488039a authored by alish's avatar alish
Browse files

feat: show comment on merchant app

parent e83f3cce

packages/core/src/graphql/orders/orders.types.graphql

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ type OrderProduct { 
	initialPrice: Float!

	price: Float!

	product: Product!

	comment: String

}



input OrdersFindInput {

packages/merchant-tablet-ionic/src/components/common/order-image/order-image.html

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
			<div class="name">

				{{ productLocalesService.getTranslate(product.product.title) }}

			</div>

			<div *ngIf="!!product.comment" class="comment">

				<div class="comment-text">{{ product.comment }}</div>

			</div>

		</div>

	</div>

</div>

packages/merchant-tablet-ionic/src/components/common/order-image/order-image.scss

+20 −0
Original line number Diff line number Diff line
@@ -34,6 +34,26 @@ 
			white-space: nowrap;

			overflow: hidden;

		}



		.comment {

			color: white;

			background: $brand;

			font-size: 14px;

			padding: 5px;

			padding-top: 0;



			// comment-text

			&-text {

				margin-top: 5px;

			}



			&::before {

				content: '';

				height: 1px;

				background: white;

				display: block;

			}

		}

	}



	.product-info {

packages/merchant-tablet-ionic/src/services/warehouse-orders.service.ts

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ export class WarehouseOrdersService { 
								products {

									count

									price

									comment

									product {

										id

										_id