Commit f3859c5e authored by alish's avatar alish
Browse files

feat: add more products for popup view

parent 3b8168e0

packages/shop-mobile-ionic/src/app/components/order/order.component.ts

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import { 
import { DOCUMENT } from '@angular/common';

import DeliveryType from '@modules/server.common/enums/DeliveryType';

import { NavController } from '@ionic/angular';

import { environment } from 'environments/environment';



@Component({

	selector: 'e-cu-order',
@@ -123,7 +124,7 @@ export class OrderComponent { 
	) {}



	goToOrder() {

		if (this.inProcessing) {

		if (this.inProcessing && environment.ORDER_INFO_TYPE === 'page') {

			this.navCtrl.navigateRoot(

				`${

					this.store.deliveryType === DeliveryType.Delivery

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

+3 −0
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">

			<span (click)="backToProducts()" class="box-close">

				<i class="fa fa-times"></i>

			</span>

			<div class="box-top">

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

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

+11 −1
Original line number Diff line number Diff line
@@ -11,10 +11,20 @@ 
}



.box {

	position: relative;



	&-top {

		padding: 20px 20px;

		padding: 30px 20px;

		padding-bottom: 10px;

	}



	&-close {

		top: 10px;

		right: 10px;

		position: absolute;

		display: flex;

		font-size: 20px;

	}

}



.order-page {

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

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ export class OrderPage implements OnInit, OnDestroy { 
		return modal.present();

	}



	backToProducts() {

		this.modalController.dismiss();

		this.modalChange.emit(false);

	}



	public get byPopupStatuses() {

		// this is workaround for access language assets from array.

		const popupStatuses = `BUY_POPUP.${

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

+3 −0
Original line number Diff line number Diff line 
<div class="box box-brand takeaway-title" style="height: 100%;">

	<span (click)="closeModal.emit()" *ngIf="lessInfo" class="box-close">

		<i class="fa fa-times"></i>

	</span>

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

		<div class="title-content">

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