Unverified Commit 1a9c29a3 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge pull request #1174 from ever-co/feat/#52-carrier-show-orderid 

feat: show order ID on carrier
parents f7204e27 131cb34b

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

+11 −2
Original line number Diff line number Diff line
@@ -2,9 +2,18 @@ 


<div class="bottom-container">

	<div class="info">

		<span class="left-info">To: {{ selectedOrder?.user.fullAddress }}</span>

		<div class="row">

			<div>

				<span class="left-info"

					>To: {{ selectedOrder?.user.fullAddress }}</span

				>

				<span class="right-text">{{ carrierUserDistance + 'km' }}</span>

			</div>

			<div class="center-info">

				<span>Order ID: {{ selectedOrderID }}</span>

			</div>

		</div>

	</div>

	<div class="buttons">

		<div

			class="button-bar"

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

+3 −0
Original line number Diff line number Diff line 
page-drive-to-warehouse {

}

.center-info {

	margin-top: 8px;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ import { GeoLocationService } from '../../../services/geo-location.service'; 
import { MapComponent } from '../common/map/map.component';

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

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

import { getIdFromTheDate } from '@modules/server.common/utils';



declare var google: any;



@Component({

	selector: 'page-drive-to-warehouse',

	templateUrl: 'drive-to-warehouse.html',

	styleUrls: ['drive-to-warehouse.scss'],

})

export class DriveToWarehousePage implements OnInit {

	@ViewChild('map')
@@ -31,6 +33,7 @@ export class DriveToWarehousePage implements OnInit { 
	carrierUserDistance: string;

	workTaken: boolean;

	fromDelivery: boolean;

	selectedOrderID: string;



	carrier$;

	order$;
@@ -84,6 +87,7 @@ export class DriveToWarehousePage implements OnInit { 
						.subscribe((order) => {

							this.selectedOrder = order;

							this.store.selectedOrder = order;

							this.selectedOrderID = getIdFromTheDate(order);

							this.workTaken =

								order.carrierStatus !==

								OrderCarrierStatus.NoCarrier;