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

Merge pull request #1216 from ever-co/fix/#1189-order-cycle-error 

fix: #1189 order cycle error
parents dc97ad75 cff72130

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

+7 −1
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ 
					dir="{{ 'CURRENT_DIRECTION' | translate }}"

				>

					<div class="row">

						<span class="waves-effect waves-classic col-3">

						<span

							class="waves-effect waves-classic col-3"

							[ngClass]="{

								'col-12': !paymentsEnabled && !isOrderReady()

							}"

						>

							<button

								class="button button-brand col-100"

								(click)="undo.emit(true)"
@@ -37,6 +42,7 @@ 
							}}"

						>

							<button

								*ngIf="isOrderReady()"

								class="button button-balanced border-color-brand col-100"

								(click)="complete.emit(true)"

							>

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

+7 −1
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ import { 
} from '@angular/core';

import { Subject } from 'rxjs';

import Order from '@modules/server.common/entities/Order';

import { getIdFromTheDate } from '@modules/server.common/utils';

import { environment } from 'environments/environment';

import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';

import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';

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



@Component({

	selector: 'e-cu-order-produts-info',
@@ -40,6 +40,12 @@ export class OrderProductsInfo implements OnInit, OnDestroy { 
		console.warn('OrderProductsInfo Initialize.');

	}



	isOrderReady() {

		return (

			this.order.warehouseStatus >= OrderWarehouseStatus.PackagingFinished

		);

	}



	localeTranslate(member: ILocaleMember[]): string {

		return this._translateProductLocales.getTranslate(member);

	}