Commit 5165d378 authored by Rachit Magon's avatar Rachit Magon
Browse files

fix: #1086 get merchant data

parent 4a3af37f

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts

+2 −3
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ import { IWarehouseCreateObject } from '@modules/server.common/interfaces/IWareh 
import { map, first } from 'rxjs/operators';

import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';

import { IMultiSelectOption } from 'angular-2-dropdown-multiselect';

import { Observable, concat } from 'rxjs';

import { Observable, concat, of } from 'rxjs';

import { FormHelpers } from '../../../../forms/helpers';

import 'rxjs/add/observable/of';

import _ from 'lodash';

import isUrl from 'is-url';

import { TranslateService } from '@ngx-translate/core';
@@ -54,7 +53,7 @@ export class WarehouseManageTabsDetailsComponent 
	uploaderPlaceholder: string;



	carriersOptions$: Observable<IMultiSelectOption[]> = concat(

		Observable.of([]),

		of([]),

		this._carrierRouter.getAllActive().pipe(

			map((carriers) =>

				carriers

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts

+9 −22
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ export class WarehouseManageComponent implements OnInit { 
		map((p) => p['id'])

	);



	readonly warehouse$ = this.warehouseId$.pipe(

		switchMap((id) => {

			return this.warehouseRouter.get(id).pipe(first());

		})

	);



	private _currentWarehouse: Warehouse;



	constructor(
@@ -53,7 +47,15 @@ export class WarehouseManageComponent implements OnInit { 
	) {}



	ngOnInit() {

		this._loadWarehouse();

		this.warehouseId$.subscribe((id) => {

			this.warehouseRouter

				.get(id)

				.pipe()

				.subscribe((warehouse) => {

					this._currentWarehouse = warehouse;

					this.warehouseManageTabs.setValue(warehouse);

				});

		});

	}



	get validForm() {
@@ -106,21 +108,6 @@ export class WarehouseManageComponent implements OnInit { 
		}

	}



	private _loadWarehouse() {

		this.warehouse$

			.withLatestFrom(this.warehouseId$)

			.subscribe(([warehouse, id]) => {

				if (!warehouse) {

					this.toasterService.pop(

						'error',

						`Warehouse with id ${id} doesn't exist!`

					);

				}

				this._currentWarehouse = warehouse;

				this.warehouseManageTabs.setValue(warehouse);

			});

	}



	private _showWarehouseUpdateSuccessMessage(warehouse) {

		this.toasterService.pop(

			'success',