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

Merge pull request #1215 from ever-co/fix/#1213-merchant-dashboard-error 

Fix/#1213 merchant dashboard error
parents 11249406 6026d750

packages/merchant-tablet-ionic/src/components/order-control-buttons/order-control-buttons.ts

+3 −3
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ export class OrderControlButtonsComponent implements OnInit { 
	constructor(

		private orderRouter: OrderRouter,

		private store: Store,

		private warehaousesService: WarehousesService

		private warehousesService: WarehousesService

	) {}



	ngOnInit() {

		this._storeID = this.store.warehouseId;

		this.warehaousesService

			.getStoreById(this._storeID)

		this.warehousesService

			.getWarehouseOrderProcess(this._storeID)

			.pipe(map((store) => store.ordersShortProcess))

			.subscribe((isShortProcess) => {

				this.ordersShortProcess = isShortProcess;

packages/merchant-tablet-ionic/src/pages/+warehouse/warehouse.ts

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import Product from '@modules/server.common/entities/Product'; 
import { PopoverController, ModalController } from '@ionic/angular';

import { CreateProductTypePopupPage } from './create-product-type-popup/create-product-type-popup';

import { EditProductTypePopupPage } from './edit-product-type-popup/edit-product-type-popup';

import { WarehousesService } from 'services/warehouses.service';



export enum OrderState {

	WarehousePreparation,
@@ -54,7 +55,8 @@ export class WarehousePage { 
		private mixpanel: Mixpanel,

		private translateProductLocales: ProductLocalesService,

		private store: Store,

		private barcodeScanner: BarcodeScanner

		private barcodeScanner: BarcodeScanner,

		private warehouseService: WarehousesService

	) {}



	// ionViewDidLoad() {

packages/merchant-tablet-ionic/src/services/warehouses.service.ts

+18 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ export class WarehousesService { 
							usedCarriersIds

							contactEmail

							contactPhone

							ordersShortProcess

							orderCancelation {

								enabled

								onState
@@ -253,6 +252,24 @@ export class WarehousesService { 
			);

	}



	getWarehouseOrderProcess(id: string) {

		return this._apollo

			.query({

				query: gql`

					query GetWarehouseOrderProcess($id: String!) {

						warehouse(id: $id) {

							ordersShortProcess

						}

					}

				`,

				variables: { id },

			})

			.pipe(

				map((res) => res.data['warehouse']),

				share()

			);

	}



	async getCountOfMerchants() {

		const res = await this._apollo

			.query({