Commit 556ec941 authored by Yavor Grancharov's avatar Yavor Grancharov
Browse files

Merge branch 'develop' of https://github.com/ever-co/ever into feat/#40-location-notes

parents 3982ebd8 f07aa9aa

packages/admin-web-angular/src/app/pages/+orders/+order/order.component.ts

+6 −10
Original line number Diff line number Diff line 
import { Component, OnDestroy } from '@angular/core';

import { ActivatedRoute } from '@angular/router';

import { switchMap, takeUntil, first } from 'rxjs/operators';

import { switchMap, takeUntil, first, debounceTime } from 'rxjs/operators';

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

import { Subject } from 'rxjs';

import Warehouse from '@modules/server.common/entities/Warehouse';
@@ -37,15 +37,11 @@ export class OrderComponent implements OnDestroy { 
		private readonly orderRouter: OrderRouter,

		private readonly translateService: TranslateService

	) {

		this.order$ = this._router.params.pipe(

			switchMap((params) => {

				return this.orderRouter.get(params.id, {

					populateWarehouse: true,

					populateCarrier: true,

				});

			}),

			takeUntil(this.ngDestroy$)

		);

		const id = this._router.snapshot.params.id;



		this.order$ = this.orderRouter

			.get(id, { populateWarehouse: true, populateCarrier: true })

			.pipe(takeUntil(this.ngDestroy$));

	}



	get titleWarehouse() {

packages/admin-web-angular/src/app/pages/+simulation/order/order.component.html

+3 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ 


		<div class="row">

			<div class="col-12 no-padding">

				<slideshow

				<!-- TODO un-comment when the following is fixed https://github.com/dockleryxk/ng-simple-slideshow/issues/105 -->

				<!-- <slideshow

					*ngIf="order.products.length"

					[height]="'355px'"

					[autoPlay]="true"
@@ -97,7 +98,7 @@ 
					[lazyLoad]="order.products.length"

					[autoPlayWaitForLazyLoad]="true"

					>></slideshow

				>

				> -->

			</div>

		</div>

	</div>

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.html

+3 −2
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ 
			*ngIf="selectedOrder.products.length"

			class="col-12 no-padding slider"

		>

			<slideshow

			<!-- TODO un-comment when the following is fixed https://github.com/dockleryxk/ng-simple-slideshow/issues/105 -->

			<!-- <slideshow

				#slideshow

				[height]="'300px'"

				[captionBackground]="'rgba(0, 0, 0, .5)'"
@@ -192,7 +193,7 @@ 
				[imageUrls]="slideImages"

				[lazyLoad]="selectedOrder.products.length"

				[autoPlayWaitForLazyLoad]="true"

			></slideshow>

			></slideshow> -->

		</div>

	</nb-card-body>

</nb-card>