Commit 7e9ff1b6 authored by alish's avatar alish
Browse files

fix: cancel order

parent a62ff20b

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

+8 −2
Original line number Diff line number Diff line 
import { Component, OnInit, EventEmitter } from '@angular/core';

import { WarehouseOrdersRouter } from '@modules/client.common.angular2/routers/warehouse-orders-router.service';

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

import { PopoverController, ModalController, NavParams } from '@ionic/angular';

import {

	PopoverController,

	ModalController,

	NavParams,

	NavController,

} from '@ionic/angular';

import { Store } from '../../../../services/store.service';

import { OrderPage } from '../order.page';

import { Router } from '@angular/router';
@@ -23,6 +28,7 @@ export class CancelPage { 
		private readonly orderRouter: OrderRouter,

		private readonly store: Store,

		public modalController: ModalController,

		public navCtrl: NavController,

		private router: Router,

		private readonly navParams: NavParams

	) {
@@ -49,7 +55,7 @@ export class CancelPage { 
		this.store.orderId = null;



		if (environment.ORDER_INFO_TYPE === 'page') {

			this.router.navigate(['/products']);

			this.navCtrl.navigateRoot('/products');

		}



		await this.modalController.dismiss();

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

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import { OrderRouter } from '@modules/client.common.angular2/routers/order-route 
import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';

import { TranslateService } from '@ngx-translate/core';

import { Store } from '../../../../services/store.service';

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

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

import { CancelPage } from '../+cancel/cancel.page';

import { IssuePage } from '../issue/issue.page';

import { takeUntil } from 'rxjs/operators';
@@ -53,6 +53,7 @@ export class OrderInfoPage implements OnInit, OnDestroy { 
		private readonly _translateService: TranslateService,

		private readonly store: Store,

		public modalController: ModalController,

		public navCtrl: NavController,

		private router: Router

	) {

		this._trackOrder();
@@ -313,7 +314,7 @@ export class OrderInfoPage implements OnInit, OnDestroy { 
			localStorage.removeItem('startDate');

			localStorage.removeItem('endTime');

			this.store.orderId = null;

			this.router.navigate(['/products']);

			this.navCtrl.navigateRoot('/products');

		}

	}