Commit 56fc6b00 authored by Alish's avatar Alish
Browse files

feat: done for cases before take the order

parent d38943d5

carrier/mobile-ionic/src/pages/main/delivery/delivery.ts

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ export class DeliveryPage implements AfterViewInit { 
			.toPromise();



		this.selectedOrder = order;

		this.store.selectedOrder = order;

		// const carrier = await this.carrierRouter

		// 	.get(order.carrierId)

		// 	.pipe(first())

carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.html

+11 −3
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@ 
	</div>

	<div class="buttons">

		<div class="button-bar" *ngIf="!workTaken">

			<button class="button button-brand" (click)="takeWork()">

			<button

				*ngIf="!selectedOrder?.isCancelled"

				class="button button-brand"

				(click)="takeWork()"

			>

				{{ 'DRIVE_TO_WAREHOUSE_VIEW.TAKE_WORK' | translate }}

			</button>
@@ -16,13 +20,17 @@ 
			</button>

		</div>

		<div class="button-bar" *ngIf="workTaken">

			<button class="button button-brand" (click)="carrierInWarehouse()">

			<button

				*ngIf="!selectedOrder?.isCancelled || store.driveToWarehouseFrom === 'delivery'"

				class="button button-brand"

				(click)="carrierInWarehouse()"

			>

				{{ "DRIVE_TO_WAREHOUSE_VIEW.I'M_THERE" | translate }}

			</button>



			<button

				class="button button-assertive"

				*ngIf="!selectedOrder.isCancelled"

				*ngIf="store.driveToWarehouseFrom !== 'delivery'"

				(click)="cancelWork()"

			>

				{{ 'DRIVE_TO_WAREHOUSE_VIEW.CANCEL' | translate }}

carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ export class DriveToWarehousePage { 
		private orderRouter: OrderRouter,

		private carrierRouter: CarrierRouter,

		private carrierOrdersRouter: CarrierOrdersRouter,

		private store: Store,

		public store: Store,

		private geoLocationService: GeoLocationService,

		private geolocation: Geolocation,

		private router: Router
@@ -76,6 +76,7 @@ export class DriveToWarehousePage { 
						})

						.subscribe((order) => {

							this.selectedOrder = order;

							this.store.selectedOrder = order;

							this.workTaken =

								order.carrierStatus !==

								OrderCarrierStatus.NoCarrier;
@@ -183,6 +184,7 @@ export class DriveToWarehousePage { 
	}



	private unselectOrder() {

		this.store.selectedOrder = null;

		localStorage.removeItem('orderId');

	}

carrier/mobile-ionic/src/pages/main/main.html

+6 −0
Original line number Diff line number Diff line
@@ -17,5 +17,11 @@ 
</ion-header>



<ion-content class="carrier-view" scroll="false">

	<div *ngIf="selectedOrder?.isCancelled" class="money-amount-container">

		<div class="money-amount">

			<!-- TODO add translate -->

			The customer cancel order

		</div>

	</div>

	<ion-router-outlet></ion-router-outlet>

</ion-content>

carrier/mobile-ionic/src/pages/main/main.module.ts

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import { HomeModuleGuard } from './home/home.module.guard'; 
import { DeliveryModuleGuard } from './delivery/delivery.module.guard';

import { StartingDeliveryModuleGuard } from './starting-delivery/starting-delivery.module.guard';

import { DriveToWarehouseModuleGuard } from './drive-to-warehouse/drive-to-warehouse.module.guard';

import { CommonModule } from '@angular/common';



const routes: Routes = [

	{
@@ -53,7 +54,8 @@ const routes: Routes = [ 
	imports: [

		IonicModule,

		RouterModule.forChild(routes),

		TranslateModule.forChild()

		TranslateModule.forChild(),

		CommonModule

	],

	entryComponents: [MainPage],

	providers: [