Commit a62ff20b authored by alish's avatar alish
Browse files

feat: init preview order products

parent da20e2f3

packages/shop-mobile-ionic/src/app/pages/+orders-history/order-card/order-card.module.ts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
import { CommonModule } from '@angular/common';

import { NgModule } from '@angular/core';

import { FormsModule } from '@angular/forms';

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

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

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

import { OrderModule } from 'app/components/order/order.module';

import { OrderCardComponent } from './order-card.component';



@NgModule({

	imports: [

		CommonModule,

		FormsModule,

		IonicModule,

		OrderModule,

		RouterModule,

		TranslateModule.forChild(),

	],

	declarations: [OrderCardComponent],

	exports: [OrderCardComponent],

	entryComponents: [OrderCardComponent],

})

export class OrdersCardModule {}

packages/shop-mobile-ionic/src/app/pages/+orders-history/orders-history.module.ts

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import { IonicModule } from '@ionic/angular'; 
import { OrdersHistoryPage } from './orders-history.page';

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

import { OrderModule } from '../../components/order/order.module';

import { OrderCardComponent } from './order-card/order-card.component';

import { OrdersCardModule } from './order-card/order-card.module';



const routes: Routes = [

	{
@@ -28,9 +28,10 @@ const routes: Routes = [ 
		FormsModule,

		IonicModule,

		OrderModule,

		OrdersCardModule,

		RouterModule.forChild(routes),

		TranslateModule.forChild(),

	],

	declarations: [OrdersHistoryPage, OrderCardComponent],

	declarations: [OrdersHistoryPage],

})

export class OrdersHistoryPageModule {}

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

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ 


				<div style="font-size: 80%;">

					<i class="fa fa-shopping-basket"></i>

					<span style="text-decoration: underline; margin-left: 3px;"

					<!-- TODO add translate -->

					<span

						(click)="showProductsModal()"

						style="text-decoration: underline; margin-left: 3px;"

						>View products</span

					>

				</div>

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

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import { IssuePage } from '../issue/issue.page'; 
import { takeUntil } from 'rxjs/operators';

import { ElapsedTimeComponent } from 'app/components/elapsed-time/elapsed-time.component';

import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseStatus';

import { OrderInfoModalComponent } from '../common/order-info-modal/order-info-modal.component';



@Component({

	selector: 'e-cu-order-info',
@@ -284,6 +285,17 @@ export class OrderInfoPage implements OnInit, OnDestroy { 
		this.router.navigateByUrl('/products', { skipLocationChange: true });

	}



	async showProductsModal(): Promise<void> {

		const modal = await this.modalController.create({

			component: OrderInfoModalComponent,

			cssClass: 'products-info-modal',

			componentProps: {

				order: this.order,

			},

		});

		return modal.present();

	}



	private async showCancelOrderInfoModal(): Promise<void> {

		const modal = await this.modalController.create({

			component: CancelPage,

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

+5 −0
Original line number Diff line number Diff line
@@ -10,12 +10,16 @@ import { DirectionsLocationComponent } from './carreir-location/carreir-location 
import { OrderInfoHeaderComponent } from './header/order-info-header.component';

import { PaymentComponent } from './payment/payment.component';

import { MapModalComponent } from './map-modal/map-modal.component';

import { OrdersCardModule } from 'app/pages/+orders-history/order-card/order-card.module';

import { OrderInfoModalComponent } from './order-info-modal/order-info-modal.component';



const COMPONENTS = [

	DirectionsLocationComponent,

	OrderInfoHeaderComponent,

	PaymentComponent,

	MapModalComponent,

	OrderInfoHeaderComponent,

	OrderInfoModalComponent,

];



@NgModule({
@@ -27,6 +31,7 @@ const COMPONENTS = [ 
		CancelPageModule,

		IssuePageModule,

		ElapsedTimeModule,

		OrdersCardModule,

	],

	entryComponents: [...COMPONENTS],

	declarations: [...COMPONENTS],