Unverified Commit 9de9f488 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge pull request #1167 from ever-co/feat/#1049-incomplete-order-2 

feat: implemented when the order is confirmed carrier to see all prods
parents 3bda1633 03f934b6

packages/admin-web-angular/src/app/@core/data/fakeDataServices/products.ts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ export default class FakeDataProducts { 
					value: this._getRandomProductName(),

				},

				{

					locale: 'he-LI',

					locale: 'he-IL',

					value: 'רק איזה סוג של מוצר',

				},

			],

packages/carrier-mobile-ionic/package.json

+1 −1
Original line number Diff line number Diff line 
{

	"name": "@ever-platform/carrier-mobile-ionic",

	"version": "0.3.0",

	"version": "0.3.4",

	"description": "Ever Carrier Mobile App",

	"license": "GPL-3.0",

	"homepage": "https://ever.co/",

packages/carrier-mobile-ionic/src/pages/product/get-product/get-product.html

+64 −41
Original line number Diff line number Diff line
@@ -5,20 +5,42 @@ 
	</div>

</div>



<div class="carrier-view">

	<img

		class="product-image"

		src="{{ (selectedOrder?.products)[0].product.images[0].url }}"

	/>

	<div class="bottom-container">

		<div class="info">

			<span class="left-info"

				>{{

				localeTranslate((selectedOrder?.products)[0]?.product?.title)

				}}</span

<ion-app>

	<ion-header class="bar-brand bar bar-header disable-user-behavior">

		<h1 class="title" id="main-title">

			<span>{{ 'MAIN_VIEW.EVERCO_DRIVER' | translate }}</span>

		</h1>

		<div class="buttons buttons-left header-item">

			<span class="left-buttons">

				<div class="waves-effect waves-classic">

					<ion-menu-toggle class="button-icon">

						<ion-icon ios="ios-menu" md="md-menu"></ion-icon>

					</ion-menu-toggle>

				</div>

			</span>

		</div>

	</ion-header>

	<ion-content fullscreen class="ion-padding" class="background-content">

		<ion-slides>

			<ion-slide

				*ngFor="let imageUrl of selectedProductImages; let i = index"

			>

				<div class="slide">

					<img src="{{imageUrl}}" />

					<ion-text style="color: white;">

						<h3 class="description">

							{{selectedProductTitles[i]}}

						</h3>

						<span class="description"

							>#{{selectedOrder?.orderNumber}}</span

						>

			<span class="right-text">#{{ selectedOrder?.orderNumber }}</span>

					</ion-text>

				</div>

			</ion-slide>

		</ion-slides>

	</ion-content>

	<ion-row class="full-width">

		<ion-col>

			<div class="buttons">

				<div *ngIf="!selectedOrder?.isCancelled" class="button-bar">

					<button
@@ -48,5 +70,6 @@ 
					</button>

				</div>

			</div>

	</div>

</div>
 
		</ion-col>

	</ion-row>

</ion-app>

packages/carrier-mobile-ionic/src/pages/product/get-product/get-product.module.ts

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ import { GetProductPage } from './get-product'; 
import { TranslateModule } from '@ngx-translate/core';

import { Routes, RouterModule } from '@angular/router';

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

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

import { MenuModule } from 'components/menu/menu.module';



const routes: Routes = [

	{
@@ -17,6 +19,9 @@ const routes: Routes = [ 
		TranslateModule.forChild(),

		RouterModule.forChild(routes),

		CommonModule,

		IonicModule,

		MenuModule,

	],

	providers: [],

})

export class GetProductPageModule {}

packages/carrier-mobile-ionic/src/pages/product/get-product/get-product.scss

+12 −0
Original line number Diff line number Diff line 
page-get-product {

}



.image-container {

}



ion-content {

	--background: #242530;

}



.description {

	padding-left: 5px;

	padding-right: 5px;

}