Skip to content

G
getme
Commit e57bf542 by amalk
Options

Merge branch 'master' into amal

parents 73134612 a70187d8
Showing with 170 additions and 100 deletions
config.xml
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.getmi.customer" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.getmi.customer" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Get Me</name> <name>GetMi</name>
<description /> <description />
<author email="[email protected]" href="http://ionicframework.com/">Techware Software Solutions Pvt Ltd</author> <author email="[email protected]" href="http://ionicframework.com/">Techware Software Solutions Pvt Ltd</author>
<content src="index.html" /> <content src="index.html" />
...@@ -14,11 +14,13 @@ ...@@ -14,11 +14,13 @@
<preference name="ScrollEnabled" value="false" /> <preference name="ScrollEnabled" value="false" />
<preference name="android-minSdkVersion" value="19" /> <preference name="android-minSdkVersion" value="19" />
<preference name="BackupWebStorage" value="none" /> <preference name="BackupWebStorage" value="none" />
<preference name="orientation" value="portrait" />
<preference name="ShowSplashScreenSpinner" value="false"/>
<preference name="SplashMaintainAspectRatio" value="true" /> <preference name="SplashMaintainAspectRatio" value="true" />
<preference name="FadeSplashScreenDuration" value="300" /> <preference name="FadeSplashScreenDuration" value="300" />
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" /> <preference name="SplashScreenDelay" value="5000" />
<platform name="android"> <platform name="android">
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android"> <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
<application android:networkSecurityConfig="@xml/network_security_config" /> <application android:networkSecurityConfig="@xml/network_security_config" />
......
package.json
...@@ -94,4 +94,4 @@ ...@@ -94,4 +94,4 @@
"android" "android"
] ]
} }
} }
\ No newline at end of file
src/app/app.component.ts
...@@ -3,6 +3,11 @@ import { Router, ActivatedRoute } from '@angular/router'; ...@@ -3,6 +3,11 @@ import { Router, ActivatedRoute } from '@angular/router';
import { Platform } from '@ionic/angular'; import { Platform } from '@ionic/angular';
import { SplashScreen } from '@ionic-native/splash-screen/ngx'; import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { StatusBar } from '@ionic-native/status-bar/ngx'; import { StatusBar } from '@ionic-native/status-bar/ngx';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import * as firebase from 'firebase';
import { ModalController } from '@ionic/angular';
import { DeliverypopPage } from './deliverypop/deliverypop.page';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
...@@ -14,17 +19,64 @@ export class AppComponent { ...@@ -14,17 +19,64 @@ export class AppComponent {
private platform: Platform, private platform: Platform,
private splashScreen: SplashScreen, private splashScreen: SplashScreen,
private statusBar: StatusBar, private statusBar: StatusBar,
private router: Router private router: Router,
public afs: AngularFirestore,
public modalController: ModalController
) { ) {
this.initializeApp(); this.initializeApp();
this.orderState();
} }
initializeApp() { initializeApp() {
this.platform.ready().then(() => { this.platform.ready().then(() => {
this.statusBar.styleDefault(); this.statusBar.styleDefault();
this.statusBar.overlaysWebView(false); this.statusBar.overlaysWebView(true);
this.statusBar.hide();
});
}
async finishpop(data: any) {
const modal = await this.modalController.create({
component: DeliverypopPage,
componentProps: data
});
return await modal.present();
}
orderState() {
console.log('called');
const custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
firebase.firestore().collection('orders').where('custId', '==', custId)
.onSnapshot((snapData) => {
snapData.docChanges().forEach((change) => {
if (change.type === 'modified') {
const data = change.doc.data();
if (data.orderStatus === 7) {
this.finishpop(data);
}
}
});
}); });
/*
.onSnapshot(function(snapshot) {
snapshot.docChanges().forEach(function(change) {
if (change.type === "added") {
console.log("New city: ", change.doc.data());
}
if (change.type === "modified") {
console.log("Modified city: ", change.doc.data());
}
if (change.type === "removed") {
console.log("Removed city: ", change.doc.data());
}
});
}); */
} }
......
src/app/cart/cart.page.html
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<p class="textLeft">Total Price:</p> <p class="textLeft">Total Price:</p>
</ion-col> </ion-col>
<ion-col> <ion-col>
<p class="textRight">AU$ 239.00</p> <p class="textRight" *ngIf="cartService.cartTotal">A$ {{cartService.cartTotal}}</p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
......
src/app/deliverypop/deliverypop.page.html
...@@ -14,18 +14,18 @@ ...@@ -14,18 +14,18 @@
</div> </div>
<img src="../assets/white_tick.png"> <img src="../assets/white_tick.png">
<h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4> <h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
<p>June 26th 2019, 03:00 PM</p> <p>{{currDate | date: 'MMM d, y, h:mm:ss a'}}</p>
</div> </div>
</div> </div>
</ion-content> </ion-content>
<ion-footer padding> <ion-footer padding>
<div class="row"> <div class="row">
<button class="login_btn">I GOT MY ORDER</button> <button class="login_btn" (click)="changeOrder(9)">I GOT MY ORDER</button>
</div> </div>
<div class="row"> <div class="row">
<button class="resend_btn">I DIDN'T GOT THE ORDER</button> <button class="resend_btn" (click)="changeOrder(10)">I DIDN'T GOT THE ORDER</button>
</div> </div>
<div class="row"> <div class="row">
<button class="cancel_btn">CANCEL THIS ORDER</button> <button class="cancel_btn" (click)="changeOrder(0)">CANCEL THIS ORDER</button>
</div> </div>
</ion-footer> </ion-footer>
\ No newline at end of file
src/app/deliverypop/deliverypop.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { ModalController, NavParams } from '@ionic/angular';
import { OrdersService } from './../../config/order.service';
@Component({ @Component({
selector: 'app-deliverypop', selector: 'app-deliverypop',
...@@ -7,18 +8,30 @@ import { ModalController, NavParams } from '@ionic/angular'; ...@@ -7,18 +8,30 @@ import { ModalController, NavParams } from '@ionic/angular';
styleUrls: ['./deliverypop.page.scss'], styleUrls: ['./deliverypop.page.scss'],
}) })
export class DeliverypopPage implements OnInit { export class DeliverypopPage implements OnInit {
currDate = new Date();
params: any;
orderId: string;
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private navParams: NavParams private navParams: NavParams,
public orderService: OrdersService
) { } ) { }
ngOnInit() { ngOnInit() {
this.params = this.navParams.data;
console.log(this.navParams.data);
} }
async closeModal() { async closeModal() {
const onClosedData: string = "Wrapped Up!"; const onClosedData = 'Wrapped Up!';
await this.modalController.dismiss(onClosedData); await this.modalController.dismiss(onClosedData);
} }
changeOrder(status: number) {
this.orderId = this.params.orderId;
this.orderService.changeOrder(this.orderId, status).then(() => {
this.closeModal();
});
}
} }
src/app/home/home.page.html
...@@ -22,28 +22,28 @@ ...@@ -22,28 +22,28 @@
<p class="floatRight" (click)="istoggle()">Territory Queens</p> <p class="floatRight" (click)="istoggle()">Territory Queens</p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<ion-slides pager="true"> <ion-slides pager="true">
<ion-slide> <ion-slide>
<div class="banner_slide" (click)="goToPage('storelist')"> <div class="banner_slide" (click)="goToPage('storelist')">
<h5>Lulu Fashion</h5> <h5>Chadstone</h5>
<p>Women Fashion</p> <p>The fashion capital</p>
</div> </div>
<img src="../assets/portrait-smiling-woman-with-shopping-bags-smartphone_1262-14313_2.png"> <img src="./../../assets/getmi_malls/mall_banner/mall_4.png">
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<div class="banner_slide" (click)="goToPage('storelist')"> <div class="banner_slide" (click)="goToPage('storelist')">
<h5>Lulu Fashion</h5> <h5>Westfield Knox</h5>
<p>Women Fashion</p> <p>Your one-stop hub for Shopping & Fun</p>
</div> </div>
<img src="../assets/portrait-smiling-woman-with-shopping-bags-smartphone_1262-14313_2.png"> <img src="./../../assets/getmi_malls/mall_banner/mall_1.png">
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<div class="banner_slide" (click)="goToPage('storelist')"> <div class="banner_slide" (click)="goToPage('storelist')">
<h5>Lulu Fashion</h5> <h5>Emporium Melbourne</h5>
<p>Women Fashion</p> <p>The luxury shopping centre</p>
</div> </div>
<img src="../assets/portrait-smiling-woman-with-shopping-bags-smartphone_1262-14313_2.png"> <img src="./../../assets/getmi_malls/mall_banner/mall_5.png">
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</div> </div>
...@@ -54,23 +54,23 @@ ...@@ -54,23 +54,23 @@
<ion-slides pager="false" [options]="slideOpts"> <ion-slides pager="false" [options]="slideOpts">
<ion-slide> <ion-slide>
<div class="feature_product" (click)="goToPage('productlist')"> <div class="feature_product" (click)="goToPage('productlist')">
<img src="../assets/videoblocks-woman-using-phone-purchase-in-cool-sunglasses-and-black-dress-holding-black-shopping-bag-isolated-on-dark-background-in-black-friday-holid@3x.png"> <img src="./../../assets/getmi_malls/featured/featured1.png">
<div class="feature_overlay"> <div class="feature_overlay">
<h5>Flames Fashion</h5> <h5>Witchery</h5>
<p>Women Fashion</p> <p>Shop Women's Fashion</p>
</div> </div>
</div> </div>
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<div class="feature_product" (click)="goToPage('productlist')"> <div class="feature_product" (click)="goToPage('productlist')">
<img src="../assets/business-casual-sneakers-men-1-1024x1024@3x.png"> <img src="./../../assets/getmi_malls/featured/featured2.png">
<div class="feature_overlay"> <div class="feature_overlay">
<h5>Flames Fashion</h5> <h5>VonZipper</h5>
<p>Women Fashion</p> <p>Lifestyle & Personality</p>
</div> </div>
</div> </div>
</ion-slide> </ion-slide>
<ion-slide> <!-- <ion-slide>
<div class="feature_product" (click)="goToPage('productlist')"> <div class="feature_product" (click)="goToPage('productlist')">
<img src="../assets/videoblocks-woman-using-phone-purchase-in-cool-sunglasses-and-black-dress-holding-black-shopping-bag-isolated-on-dark-background-in-black-friday-holid@3x.png"> <img src="../assets/videoblocks-woman-using-phone-purchase-in-cool-sunglasses-and-black-dress-holding-black-shopping-bag-isolated-on-dark-background-in-black-friday-holid@3x.png">
<div class="feature_overlay"> <div class="feature_overlay">
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<p>Women Fashion</p> <p>Women Fashion</p>
</div> </div>
</div> </div>
</ion-slide> </ion-slide> -->
</ion-slides> </ion-slides>
</div> </div>
<div class="home_sub_header"> <div class="home_sub_header">
...@@ -91,14 +91,14 @@ ...@@ -91,14 +91,14 @@
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
<ul> <ul>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('storelist')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/5bf42c4220000057060294f8@3x.png"> <img src="./../../assets/getmi_malls/mall_298/mall1.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Queen Victoria Building</span>
<span class="floatRight">4 <span class="floatRight">5
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
...@@ -107,52 +107,52 @@ ...@@ -107,52 +107,52 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('storelist')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/Gentleman-style-menswear-mens-fashion@3x.png"> <img src="./../../assets/getmi_malls/mall_298/mall2.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Westfield Knox</span>
<span class="floatRight">4 <span class="floatRight">4
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>Your one-stop hub for Shopping & Fun</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('storelist')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/f484ec0330d1a103ac58341c9184df2a@3x.png"> <img src="./../../assets/getmi_malls/mall_298/mall4.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Chadstone</span>
<span class="floatRight">4 <span class="floatRight">5
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>The fashion capital</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('storelist')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/2193bb91-3be9-4de9-96f4-4ce7aab8547e1558436499234-RARE-Women-Black-Printed-A-Line-Dress-6731558436495088-1@3x.png"> <img src="./../../assets/getmi_malls/mall_298/mall5.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Emporium Melbourne</span>
<span class="floatRight">4 <span class="floatRight">4
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>The luxury shopping centre</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
......
src/app/landing/landing.page.ts
...@@ -25,7 +25,12 @@ export class LandingPage implements OnInit { ...@@ -25,7 +25,12 @@ export class LandingPage implements OnInit {
) { ) {
this.service.get('landing').then((data) => { this.service.get('landing').then((data) => {
if (data === true) { if (data === true) {
this.goToPage('login'); const user = JSON.parse(localStorage.getItem('user'));
if (user) {
this.goToPage('home');
} else {
this.goToPage('login');
}
} }
}); });
} }
......
src/app/myorder/myorder.page.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<div class="order_other"> <div class="order_other">
<h6 class="floatRight">{{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6> <h6 class="floatRight">{{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6>
<span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7">{{getStatus(order.orderStatus)}}</span> <span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7" (click)="acceptOrder(order)">{{getStatus(order.orderStatus)}}</span>
<div class="clear"></div> <div class="clear"></div>
<button class="track_btn" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">TRACK</button> <button class="track_btn" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">TRACK</button>
<div class="clear"></div> <div class="clear"></div>
......
src/app/myorder/myorder.page.ts
...@@ -21,12 +21,12 @@ export class MyorderPage implements OnInit { ...@@ -21,12 +21,12 @@ export class MyorderPage implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
this.finishpop();
} }
async finishpop() { async finishpop(data: any) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: DeliverypopPage component: DeliverypopPage,
componentProps: data
}); });
return await modal.present(); return await modal.present();
} }
...@@ -46,6 +46,12 @@ export class MyorderPage implements OnInit { ...@@ -46,6 +46,12 @@ export class MyorderPage implements OnInit {
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
} }
acceptOrder(order: any) {
if (order.orderStatus === 7) {
this.finishpop(order);
}
}
getStatus(status: number) { getStatus(status: number) {
switch (status) { switch (status) {
case 1: case 1:
...@@ -69,9 +75,18 @@ export class MyorderPage implements OnInit { ...@@ -69,9 +75,18 @@ export class MyorderPage implements OnInit {
case 7: case 7:
return 'Delivered'; return 'Delivered';
break; break;
case 9:
return 'Completed';
break;
case 8: case 8:
return 'Rejected'; return 'Rejected';
break; break;
case 10:
return 'Not Received';
break;
case 0:
return 'Cancelled';
break;
default: default:
return 'Finished'; return 'Finished';
} }
......
src/app/productlist/productlist.page.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="product_title"> <div class="product_title">
Lulu Fashion Women's Fashion
</div> </div>
<ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0"> <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0">
<li *ngFor="let product of prodService.product; let i = index" (click)="prodDetails(i)"> <li *ngFor="let product of prodService.product; let i = index" (click)="prodDetails(i)">
......
src/app/storelist/storelist.page.html
...@@ -15,101 +15,75 @@ ...@@ -15,101 +15,75 @@
<div class="featured_slider"> <div class="featured_slider">
<ion-slides pager="false" [options]="slideOpts"> <ion-slides pager="false" [options]="slideOpts">
<ion-slide> <ion-slide>
<div class="feature_product" (click)="goToPage('catagory')"> <div class="feature_product" (click)="goToPage('productlist')">
<img src="../assets/videoblocks-woman-using-phone-purchase-in-cool-sunglasses-and-black-dress-holding-black-shopping-bag-isolated-on-dark-background-in-black-friday-holid@3x.png"> <img src="./../../assets/getmi_malls/featured/featured1.png">
<div class="feature_overlay"> <div class="feature_overlay">
<h5>Flames Fashion</h5> <h5>Witchery</h5>
<p>Women Fashion</p> <p>Shop Women's Fashion</p>
</div> </div>
</div> </div>
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<div class="feature_product" (click)="goToPage('catagory')"> <div class="feature_product" (click)="goToPage('productlist')">
<img src="../assets/business-casual-sneakers-men-1-1024x1024@3x.png"> <img src="./../../assets/getmi_malls/featured/featured2.png">
<div class="feature_overlay"> <div class="feature_overlay">
<h5>Flames Fashion</h5> <h5>VonZipper</h5>
<p>Women Fashion</p> <p>Lifestyle & Personality</p>
</div>
</div>
</ion-slide>
<ion-slide>
<div class="feature_product" (click)="goToPage('catagory')">
<img src="../assets/videoblocks-woman-using-phone-purchase-in-cool-sunglasses-and-black-dress-holding-black-shopping-bag-isolated-on-dark-background-in-black-friday-holid@3x.png">
<div class="feature_overlay">
<h5>Flames Fashion</h5>
<p>Women Fashion</p>
</div> </div>
</div> </div>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</div> </div>
<div class="home_sub_header"> <div class="home_sub_header">
Nearby Stores Stores in Chadstone
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
<ul> <ul>
<li (click)="goToPage('catagory')"> <li (click)="goToPage('catagory')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/5bf42c4220000057060294f8@3x.png"> <img src="./../../assets/getmi_malls/store298/stores1.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Witchery</span>
<span class="floatRight">4 <span class="floatRight">5
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>Shop Women's Fashion</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li (click)="goToPage('catagory')"> <li (click)="goToPage('catagory')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/Gentleman-style-menswear-mens-fashion@3x.png"> <img src="./../../assets/getmi_malls/store298/stores2.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">Tigerlily</span>
<span class="floatRight">4 <span class="floatRight">4
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>Fun, Free-Spirited Clothing</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li (click)="goToPage('catagory')"> <li (click)="goToPage('catagory')">
<div class="nearby_image"> <div class="nearby_image">
<img src="../assets/f484ec0330d1a103ac58341c9184df2a@3x.png"> <img src="./../../assets/getmi_malls/store298/stores3.png">
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Carnival Life</span> <span class="floatLeft">VonZipper</span>
<span class="floatRight">4 <span class="floatRight">5
<img src="../assets/Path61_2.png">
</span>
<div class="clear"></div>
</h5>
<p>Men's & Women's Fashion</p>
</div>
<div class="clear"></div>
</li>
<li (click)="goToPage('catagory')">
<div class="nearby_image">
<img src="../assets/2193bb91-3be9-4de9-96f4-4ce7aab8547e1558436499234-RARE-Women-Black-Printed-A-Line-Dress-6731558436495088-1@3x.png">
</div>
<div class="nearby_detail">
<h5>
<span class="floatLeft">Carnival Life</span>
<span class="floatRight">4
<img src="../assets/Path61_2.png"> <img src="../assets/Path61_2.png">
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p>Men's & Women's Fashion</p> <p>Lifestyle & Personality</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
......
src/config/myorder.service.ts
...@@ -55,6 +55,7 @@ export class MyordersService { ...@@ -55,6 +55,7 @@ export class MyordersService {
deliveryLocation: item.deliveryLocation, deliveryLocation: item.deliveryLocation,
pickupLocation: item.pickupLocation, pickupLocation: item.pickupLocation,
riderName: 'John', riderName: 'John',
orderId: item.orderId,
size: item.size, size: item.size,
time: '60' time: '60'
}; };
......
src/config/order.service.ts
...@@ -99,6 +99,11 @@ export class OrdersService { ...@@ -99,6 +99,11 @@ export class OrdersService {
} }
public async changeOrder(orderId, status) {
console.log(orderId, status);
this.afs.collection('orders').doc(orderId).update({orderStatus: status});
}
public async buyNow(product: Products) { public async buyNow(product: Products) {
// //
} }
......
src/config/services/myorder.ts
...@@ -11,6 +11,7 @@ export interface Myorder { ...@@ -11,6 +11,7 @@ export interface Myorder {
status: number; status: number;
orderStatus: number; orderStatus: number;
riderName: string; riderName: string;
orderId: string;
time: string; time: string;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment