Commit 3b8168e0 authored by alish's avatar alish
Browse files

fix: order info

parent 2b119181

packages/shop-mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.html

+12 −12
Original line number Diff line number Diff line
@@ -8,25 +8,25 @@ 
	<div *ngIf="modalOpen" class="blur-lighter"></div>

	<div dir="{{ 'CURRENT_DIRECTION' | translate }}" class="all">

		<div class="title">

			<div

				class="box box-brand text-align-center"

				style="padding: 30px 20px;"

			>

				<h4 class="main-title">{{ byPopupStatuses.TITLE }}</h4>

			<div class="box box-brand text-align-center">

				<div class="box-top">

					<h4 class="main-title mt-0">{{ byPopupStatuses.TITLE }}</h4>



				<div style="font-size: 80%;">{{ byPopupStatuses.DETAILS }}</div>

					<div style="font-size: 80%;">

						{{ byPopupStatuses.DETAILS }}

					</div>



					<div style="font-size: 80%;" ng-if="!order?.isPaid">

						{{ byPopupStatuses.NOT_PAID_NOTE }}

					</div>

				</div>



				<div style="font-size: 80%;">

				<div class="order-onfo-view-products">

					<i class="fa fa-shopping-basket"></i>

					<!-- TODO add translate -->

					<span

						(click)="showProductsModal()"

						style="text-decoration: underline; margin-left: 3px;"

						>View products</span

						style="text-decoration: underline; margin-left: 5px;"

						>{{'BUY_POPUP.VIEW_ORDER_PRODUCTS' | translate}}</span

					>

				</div>

			</div>

packages/shop-mobile-ionic/src/app/pages/+products/+order/order-info-page.scss

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
		height: 25%;

		.box {

			height: 100%;



			&-top {

				padding: 30px 20px;

				padding-bottom: 10px;

			}

		}

	}

	.maps {

packages/shop-mobile-ionic/src/app/pages/+products/+order/order.page.html

+10 −12
Original line number Diff line number Diff line 
<div class="order-page">

	<div [hidden]="areIssues" dir="{{ 'CURRENT_DIRECTION' | translate }}">

		<div

			class="box box-brand text-align-center"

			style="padding: 20px 20px;"

		>

			<h4 class="main-title">{{ byPopupStatuses.TITLE }}</h4>

		<div class="box box-brand text-align-center">

			<div class="box-top">

				<h4 class="main-title mt-0">{{ byPopupStatuses.TITLE }}</h4>



				<div style="font-size: 80%;">{{ byPopupStatuses.DETAILS }}</div>



				<div style="font-size: 80%;" ng-if="!order?.isPaid">

					{{ byPopupStatuses.NOT_PAID_NOTE }}

				</div>

			</div>



			<div style="font-size: 80%;">

			<div class="order-onfo-view-products">

				<i class="fa fa-shopping-basket"></i>

				<!-- TODO add translate -->

				<span

					(click)="showProductsModal()"

					style="text-decoration: underline; margin-left: 3px;"

					>View products</span

					style="text-decoration: underline; margin-left: 5px;"

					>{{'BUY_POPUP.VIEW_ORDER_PRODUCTS' | translate}}</span

				>

			</div>

		</div>

packages/shop-mobile-ionic/src/app/pages/+products/+order/order.page.scss

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,13 @@ 
	}

}



.box {

	&-top {

		padding: 20px 20px;

		padding-bottom: 10px;

	}

}



.order-page {

	z-index: 9999;

packages/shop-mobile-ionic/src/app/pages/+products/+order/takeaway/common/title/title.component.html

+16 −18
Original line number Diff line number Diff line 
<div

	class="box box-brand takeaway-title"

	style="padding: 30px 20px; height: 100%;"

>

<div class="box box-brand takeaway-title" style="height: 100%;">

	<div style="padding: 30px 20px; padding-bottom: 10px;">

		<div class="title-content">

			<h4 class="main-title mt-0">{{ byPopupStatuses.TITLE }}</h4>
@@ -10,15 +8,15 @@ 
			<div style="font-size: 80%;" *ngIf="!order?.isPaid">

				{{ byPopupStatuses.NOT_PAID_NOTE }}

			</div>

		</div>

	</div>



		<div style="font-size: 80%;">

	<div class="order-onfo-view-products">

		<i class="fa fa-shopping-basket"></i>

			<!-- TODO add translate -->

		<span

			(click)="showProductsModal()"

				style="text-decoration: underline; margin-left: 3px;"

				>View products</span

			style="text-decoration: underline; margin-left: 5px;"

			>{{ 'BUY_POPUP.VIEW_ORDER_PRODUCTS' | translate }}</span

		>

	</div>

</div>
 
</div>