Skip to content

G
getme
Commit 5e0d50ed by Adarsh K
Options

latest change

parent edf41b5d
Showing with 687 additions and 211 deletions
.gitignore
...@@ -28,7 +28,7 @@ plugins/ ...@@ -28,7 +28,7 @@ plugins/
plugins/android.json plugins/android.json
plugins/ios.json plugins/ios.json
$RECYCLE.BIN/ $RECYCLE.BIN/
package-lock.json
.DS_Store .DS_Store
Thumbs.db Thumbs.db
UserInterfaceState.xcuserstate UserInterfaceState.xcuserstate
config.xml
...@@ -103,5 +103,4 @@ ...@@ -103,5 +103,4 @@
</plugin> </plugin>
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" /> <plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" /> <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<engine name="android" spec="7.1.4" />
</widget> </widget>
package.json
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"@ionic/angular": "^4.7.1", "@ionic/angular": "^4.7.1",
"@ionic/storage": "^2.2.0", "@ionic/storage": "^2.2.0",
"agm-direction": "^0.7.8", "agm-direction": "^0.7.8",
"cordova-android": "7.1.4", "cordova-android": "^8.0.0",
"cordova-plugin-device": "^2.0.2", "cordova-plugin-device": "^2.0.2",
"cordova-plugin-geolocation": "4.0.2", "cordova-plugin-geolocation": "4.0.2",
"cordova-plugin-ionic-keyboard": "^2.1.3", "cordova-plugin-ionic-keyboard": "^2.1.3",
...@@ -94,4 +94,4 @@ ...@@ -94,4 +94,4 @@
"android" "android"
] ]
} }
} }
\ No newline at end of file
resources/README.md deleted 100644 → 0
These are Cordova resources. You can replace icon.png and splash.png and run
`ionic cordova resources` to generate custom icons and splash screens for your
app. See `ionic cordova resources --help` for details.
Cordova reference documentation:
- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html
- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/
src/app/cart/cart.page.html
...@@ -26,17 +26,17 @@ ...@@ -26,17 +26,17 @@
</ul> </ul>
</div> </div>
<div class="cart_content"> <div class="cart_content">
<ion-slides pager="false" [options]="cart_wizard" (ionSlideDidChange)="slideChanged()"> <ion-slides pager="false" [options]="cartwizard" (ionSlideDidChange)="slideChanged()">
<ion-slide> <ion-slide>
<div class="cart_list"> <div class="cart_list" *ngIf="cartService.carts">
<ul> <ul *ngIf="cartService.carts.length > 0">
<li> <li *ngFor="let carts of cartService.carts">
<div class="close"></div> <div class="close"></div>
<div class="cart_image"></div> <div class="cart_image"><img [src]="carts.image" onerror="this.src=''" /></div>
<div class="cart_detail"> <div class="cart_detail">
<h4>European Style V neck</h4> <h4>{{carts.prodName}}</h4>
<h4>Green, Red</h4> <h4>{{carts.size}}, {{carts.color}}</h4>
<h5>AU$99.00</h5> <h5>A$ {{carts.price}}</h5>
</div> </div>
<div class="cart_count"> <div class="cart_count">
<div class="add" (click)="addCount()">+</div> <div class="add" (click)="addCount()">+</div>
...@@ -44,45 +44,15 @@ ...@@ -44,45 +44,15 @@
<div class="remove" (click)="removeCount()">-</div> <div class="remove" (click)="removeCount()">-</div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li>
<div class="close"></div>
<div class="cart_image"></div>
<div class="cart_detail">
<h4>European Style V neck</h4>
<h4>Green, Red</h4>
<h5>AU$99.00</h5>
</div>
<div class="cart_count">
<div class="add" (click)="addCount()">+</div>
<div class="count">{{count}}</div>
<div class="remove" (click)="removeCount()">-</div>
</div>
<div class="clear"></div>
</li>
<li>
<div class="close"></div>
<div class="cart_image"></div>
<div class="cart_detail">
<h4>European Style V neck</h4>
<h4>Green, Red</h4>
<h5>AU$99.00</h5>
</div>
<div class="cart_count">
<div class="add" (click)="addCount()">+</div>
<div class="count">{{count}}</div>
<div class="remove" (click)="removeCount()">-</div>
</div>
<div class="clear"></div>
</li>
</ul> </ul>
<div class="total_div"> <div class="total_div" *ngIf="cartService.cartTotal">
<ion-row> <ion-row>
<ion-col> <ion-col>
<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">A$ {{cartService.cartTotal}}</p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
...@@ -92,43 +62,21 @@ ...@@ -92,43 +62,21 @@
<div class="checkout_list"> <div class="checkout_list">
<h5> <h5>
<span class="floatLeft">ITEMS</span> <span class="floatLeft">ITEMS</span>
<span class="floatRight">AU$239.00</span> <span class="floatRight" *ngIf="cartService.cartTotal">A$ {{cartService.cartTotal}}</span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<ion-grid class="p0"> <ion-grid class="p0" *ngIf="cartService.carts && cartService.carts.length > 0">
<ion-row> <ion-row *ngFor="let carts of cartService.carts">
<ion-col size="6" class="p0"> <ion-col size="6" class="p0">
<h6 class="textLeft">European Style V Neck</h6> <h6 class="textLeft">{{carts.prodName}}</h6>
</ion-col> </ion-col>
<ion-col size="2" class="p0"> <ion-col size="2" class="p0">
<h6 class="textRight"><strong>1 X</strong></h6> <h6 class="textRight"><strong>1 X</strong></h6>
</ion-col> </ion-col>
<ion-col size="4" class="p0"> <ion-col size="4" class="p0">
<h6 class="textRight"><strong>AU$99.00</strong></h6> <h6 class="textRight"><strong>A$ {{carts.price}}</strong></h6>
</ion-col>
</ion-row>
<ion-row>
<ion-col size="6" class="p0">
<h6 class="textLeft">Simple Night Wear black doted</h6>
</ion-col>
<ion-col size="2" class="p0">
<h6 class="textRight"><strong>3 X</strong></h6>
</ion-col>
<ion-col size="4" class="p0">
<h6 class="textRight"><strong>AU$60.00</strong></h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row>
<ion-col size="6" class="p0">
<h6 class="textLeft">European Style V Neck</h6>
</ion-col>
<ion-col size="2" class="p0">
<h6 class="textRight"><strong>3 X</strong></h6>
</ion-col>
<ion-col size="4" class="p0">
<h6 class="textRight"><strong>AU$90.00</strong></h6>
</ion-col>
</ion-row>
</ion-grid> </ion-grid>
<hr> <hr>
<h5> <h5>
...@@ -192,7 +140,7 @@ ...@@ -192,7 +140,7 @@
<h4>Order Placed</h4> <h4>Order Placed</h4>
<p>June 26th 2019, 03:00 PM</p> <p>June 26th 2019, 03:00 PM</p>
<h3>The product will be delivered in</h3> <h3>The product will be delivered in</h3>
<h1>10:00 Mins</h1> <h1>60:00 Mins</h1>
<button class="view_order" (click)="goToPage('myorder')">VIEW ORDERS</button><br> <button class="view_order" (click)="goToPage('myorder')">VIEW ORDERS</button><br>
<button class="home_btn" (click)="goToPage('home')">HOME</button> <button class="home_btn" (click)="goToPage('home')">HOME</button>
</div> </div>
...@@ -200,14 +148,14 @@ ...@@ -200,14 +148,14 @@
</ion-slides> </ion-slides>
</div> </div>
</div> </div>
<div class="footer_btn" [hidden]="currentIndex != 0" (click)="next()"> <div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0" (click)="next(1)">
CHECKOUT CHECKOUT
</div> </div>
<div class="footer_btn" [hidden]="currentIndex != 1" (click)="next()"> <div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">
PAY PAY
</div> </div>
<div class="footer_btn" [hidden]="currentIndex != 2" (click)="goToPage('orderplaced')"> <!-- <div class="footer_btn" [hidden]="currentIndex != 2" (click)="goToPage('orderplaced')">
FINISH FINISH
</div> </div> -->
</div> </div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/cart/cart.page.scss
...@@ -179,6 +179,8 @@ ...@@ -179,6 +179,8 @@
} }
.cart_list { .cart_list {
width: 100%; width: 100%;
height: calc(100vh - 200px);
overflow: scroll;
ul { ul {
margin: 0px; margin: 0px;
padding: 10px; padding: 10px;
......
src/app/cart/cart.page.ts
...@@ -2,6 +2,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; ...@@ -2,6 +2,8 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { IonSlides } from '@ionic/angular'; import { IonSlides } from '@ionic/angular';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { CartsService } from './../../config/cart.service';
import { OrdersService } from './../../config/order.service';
@Component({ @Component({
...@@ -13,22 +15,31 @@ export class CartPage implements OnInit { ...@@ -13,22 +15,31 @@ export class CartPage implements OnInit {
@ViewChild(IonSlides, { static: false }) slides: IonSlides; @ViewChild(IonSlides, { static: false }) slides: IonSlides;
currentIndex: any; currentIndex: any;
count:any; count: any;
cartwizard = {
initialSlide: 0,
speed: 1000,
allowTouchMove: false
};
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
) { public cartService: CartsService,
public orderService: OrdersService
) {
this.currentIndex = 0; this.currentIndex = 0;
this.count = 0; this.count = 1;
this.cartService.cartList();
} }
ngOnInit() { ngOnInit() {
} }
goToPage(path, data = null) { goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data }); this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
...@@ -36,30 +47,33 @@ export class CartPage implements OnInit { ...@@ -36,30 +47,33 @@ export class CartPage implements OnInit {
goBack() { goBack() {
this.location.back(); this.location.back();
} }
cart_wizard = {
initialSlide: 0,
speed: 1000,
allowTouchMove: false
};
next() {
this.slides.slideNext(); next(index: number = null) {
console.log(index);
if (index === 2) {
const state = this.orderService.checkOut(this.cartService.carts).then((data) => {
console.log('ready for slide');
this.slides.slideNext();
});
} else {
this.slides.slideNext();
}
} }
prev() { prev() {
this.slides.slidePrev(); this.slides.slidePrev();
} }
addCount(){ addCount() {
this.count = this.count+1 // this.count = this.count+1
} }
removeCount() { removeCount() {
this.count = this.count - 1; // this.count = this.count - 1;
if(this.count <0){ if (this.count <0){
this.count = 0; this.count = 0;
} }
} }
...@@ -69,8 +83,16 @@ export class CartPage implements OnInit { ...@@ -69,8 +83,16 @@ export class CartPage implements OnInit {
this.slides.getActiveIndex().then(index => { this.slides.getActiveIndex().then(index => {
this.currentIndex = index; this.currentIndex = index;
console.log(this.currentIndex); console.log(this.currentIndex);
}); });
} }
sliderChange() {
this.orderService.checkout.subscribe(state => {
if (state) {
this.next();
this.orderService.checkout.next(false);
}
});
}
} }
src/app/myorder/myorder.page.html
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="myorder_wrapper"> <div class="myorder_wrapper" *ngIf="myorder.orders">
<ul> <ul *ngIf="myorder.orders.length > 0">
<li> <li *ngFor="let order of myorder.orders; let i = index">
<div class="order_image"></div> <div class="order_image"><img [src]="order.image" onerror="" /></div>
<div class="order_detail"> <div class="order_detail">
<h5 class="floatLeft">European Style V Neck</h5> <h5 class="floatLeft">{{order.prodName}}</h5>
<div class="clear"></div> <div class="clear"></div>
<h5>Green, Small <span>3</span></h5> <h5>{{order.color}}, {{order.size}} <span>{{order.qty}}</span></h5>
<p>AU$99.00</p> <p>{{order.amount}}</p>
</div> </div>
<div class="order_other"> <div class="order_other">
<h6 class="floatRight">June 26th 2019</h6> <h6 class="floatRight">{{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6>
<div class="clear"></div> <div class="clear"></div>
<button class="track_btn" (click)=" goToPage('trackorder')">TRACK</button> <button class="track_btn" *ngIf="order.orderStatus == 3" (click)="orderDetails(i)">TRACK</button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <!-- <li>
<div class="order_image"></div> <div class="order_image"></div>
<div class="order_detail"> <div class="order_detail">
<h5 class="floatLeft">European Style V Neck</h5> <h5 class="floatLeft">European Style V Neck</h5>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li> -->
</ul> </ul>
</div> </div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/myorder/myorder.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { MyordersService } from './../../config/myorder.service';
@Component({ @Component({
selector: 'app-myorder', selector: 'app-myorder',
...@@ -12,7 +13,8 @@ export class MyorderPage implements OnInit { ...@@ -12,7 +13,8 @@ export class MyorderPage implements OnInit {
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
public myorder: MyordersService
) { } ) { }
ngOnInit() { ngOnInit() {
...@@ -25,6 +27,12 @@ export class MyorderPage implements OnInit { ...@@ -25,6 +27,12 @@ export class MyorderPage implements OnInit {
goBack() { goBack() {
this.location.back(); this.location.back();
} }
orderDetails(index: number) {
this.myorder.trackOrder(this.myorder.orders[index]);
this.router.navigateByUrl('trackorder');
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
} }
src/app/productdetail/productdetail.page.html
...@@ -9,75 +9,45 @@ ...@@ -9,75 +9,45 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="product_detail_wrapper"> <div class="product_detail_wrapper" *ngIf="product">
<div class="product_banner"> <div class="product_banner">
<div class="fav_icon"></div> <div class="fav_icon"></div>
<div class="featured_badge">Featured</div> <div class="featured_badge" *ngIf="product.featured">Featured</div>
<img src="../assets/[email protected]"> <img [src]="product.image" onerror="this.src='../assets/[email protected]'">
</div> </div>
<div class="product_header"> <div class="product_header">
<ion-row> <ion-row>
<ion-col size="8"> <ion-col size="8">
<h3>European style V Neck</h3> <h3>{{product.prodName}}</h3>
<p><strong><span><img src="../assets/Path61_2.png"></span>4</strong>Lulu Fashion, Women's Fashion <p><strong><span><img src="../assets/Path61_2.png"></span>4</strong>Lulu Fashion, {{product.category}}
</p> </p>
</ion-col> </ion-col>
<ion-col size="4"> <ion-col size="4">
<h5>AU$99.00</h5> <h5>A$ {{product.price}}</h5>
<p><span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<div class="product_div_content"> <div class="product_div_content">
<h5>Size</h5> <h5>Size</h5>
<div class="size_div"> <div class="size_div">
<ul> <ul *ngIf="product.size">
<ion-slides pager="false" [options]="slideOpts"> <ion-slides pager="false" [options]="slideOpts">
<ion-slide> <ion-slide *ngFor="let size of product.size; let i = index">
<li>
<button id="custom_check_button">
<label>
<input id="1" type="radio" name="services" value="">
<p>Small</p>
</label>
</button>
</li>
</ion-slide>
<ion-slide>
<li>
<button id="custom_check_button">
<label>
<input id="2" type="radio" name="services" value="">
<p>Medium</p>
</label>
</button>
</li>
</ion-slide>
<ion-slide>
<li>
<button id="custom_check_button">
<label>
<input id="3" type="radio" name="services" value="">
<p>Large</p>
</label>
</button>
</li>
</ion-slide>
<ion-slide>
<li> <li>
<button id="custom_check_button"> <button id="custom_check_button">
<label> <label>
<input id="4" type="radio" name="services" value=""> <input id="{{size.sizeId}}" type="radio" name="services" value="{{size.sizeId}}" (click)="cartService.choose_size(size.sizeName)" [checked]="i==0">
<p>Xtra Large</p> <p>{{size.sizeName}}</p>
</label> </label>
</button> </button>
</li> </li>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</ul> </ul>
</div> </div>
<h5>Description</h5> <h5>Description</h5>
<p>Brand - SMART SHOP Fabric- Net Work - Embroidered Colour- White Occasion - Wedding,Festival Wash Care- Normal Wash Type- Anarkali Sleeve- Full Sleeve Dupatta- No Neck- Round This product make you more beautiful and pretty from other. This <p>{{product.prodDesc}}
product has good quality material. Buy only original that product with us for get satisfy. Buy only original Buy only that
</p> </p>
<h5> <h5>
<span class="floatLeft">Reviews</span><span class="floatRight" (click)="goToPage('reviewlist')">MORE</span> <span class="floatLeft">Reviews</span><span class="floatRight" (click)="goToPage('reviewlist')">MORE</span>
...@@ -206,6 +176,6 @@ ...@@ -206,6 +176,6 @@
<button class="fav"></button> <button class="fav"></button>
<button class="cart" (click)="goToPage('cart')"></button> <button class="cart" (click)="goToPage('cart')"></button>
</div> </div>
<div class="footer_btn" (click)="goToPage('cart')">BUY NOW</div> <div class="footer_btn" (click)="cartService.buyNow(product)">BUY NOW</div>
</div> </div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/productdetail/productdetail.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { Products } from './../../config/services/product';
import { Order } from './../../config/services/order';
import { CartsService } from './../../config/cart.service';
import { ProductsService } from './../../config/products.service';
import { map } from 'rxjs/operators';
@Component({ @Component({
selector: 'app-productdetail', selector: 'app-productdetail',
...@@ -8,22 +13,63 @@ import { Router, ActivatedRoute } from '@angular/router'; ...@@ -8,22 +13,63 @@ import { Router, ActivatedRoute } from '@angular/router';
styleUrls: ['./productdetail.page.scss'], styleUrls: ['./productdetail.page.scss'],
}) })
export class ProductdetailPage implements OnInit { export class ProductdetailPage implements OnInit {
product: Products;
order: Order;
slideOpts = { slideOpts = {
slidesPerView: 3.5 slidesPerView: 3.5
} };
relatedProd = { relatedProd = {
slidesPerView: 2 slidesPerView: 2
} };
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
) { } private cartService: CartsService,
private prodService: ProductsService
) {
}
ngOnInit() { ngOnInit() {
console.log('here');
const params = this.prodService.selItem;
if (params) {
const prod: Products = {
prodId: params.prodId,
prodName: params.prodName,
prodCode: params.prodCode,
prodDesc: params.prodDesc,
prodStatus: params.prodStatus,
brand: params.brand,
category: params.category,
color: params.color,
discount: params.discount,
featured: params.featured,
image: params.image,
price: params.price,
qty: params.qty,
shopper: params.shopper,
skuCode: params.skuCode,
status: params.status,
size: params.size,
currency: params.currency
};
this.product = prod;
} else {
this.product = undefined;
}
console.log(this.product);
}
stringObject(items: any) {
items.forEach(element => {
console.log(element.sizeId);
element = JSON.parse(element);
console.log(element);
});
} }
goToPage(path, data = null) { goToPage(path, data = null) {
......
src/app/productlist/productlist.page.html
...@@ -27,44 +27,17 @@ ...@@ -27,44 +27,17 @@
<div class="product_title"> <div class="product_title">
Lulu Fashion Lulu Fashion
</div> </div>
<ul [class.grid_view]="onGrid"> <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0">
<li (click)="goToPage('productdetail')"> <li *ngFor="let product of prodService.product; let i = index" (click)="prodDetails(i)">
<div class="product_image"> <div class="product_image">
<img src="../assets/[email protected]"> <img [src]="product.image" onerror="this.src='../assets/[email protected]'">
<div class="fav_icon"> <div class="fav_icon">
</div> </div>
<div class="featured_badge" *ngIf="product.featured">Featured</div>
</div> </div>
<h5>European Style V Neck</h5> <h5>{{product.prodName}}</h5>
<p>AU$99.00</p> <p>A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p>
</li> </li>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/Recommended-Ball-Gown-Floor-Length-V-Neck-Lace-Organza-Prom-Dress-OD850662@3x.png">
<div class="fav_icon">
</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00</p>
</li>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]">
<div class="fav_icon">
</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00 <span class="offer">-8%</span></p>
</li>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]">
<div class="fav_icon">
</div>
<div class="featured_badge">Featured</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00<span>AU$110.00</span></p>
</li>
</ul> </ul>
</div> </div>
<div class="sort_wrappper" *ngIf="isShow" [@slideInOut]> <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]>
......
src/app/productlist/productlist.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { trigger, transition, animate, style } from '@angular/animations'; import { trigger, transition, animate, style } from '@angular/animations';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute, NavigationExtras } from '@angular/router';
import { ProductsService } from './../../config/products.service';
@Component({ @Component({
...@@ -28,10 +29,12 @@ export class ProductlistPage implements OnInit { ...@@ -28,10 +29,12 @@ export class ProductlistPage implements OnInit {
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
public prodService: ProductsService
) { } ) { }
ngOnInit() { ngOnInit() {
this.prodService.prodList();
} }
goToPage(path, data = null) { goToPage(path, data = null) {
...@@ -44,10 +47,17 @@ export class ProductlistPage implements OnInit { ...@@ -44,10 +47,17 @@ export class ProductlistPage implements OnInit {
} }
goBack() { goBack() {
this.location.back(); // this.location.back();
window.history.back();
} }
gridToggle(){ gridToggle(){
this.onGrid = !this.onGrid; this.onGrid = !this.onGrid;
} }
prodDetails(index: number) {
this.prodService.setProd(this.prodService.product[index]);
this.router.navigateByUrl('productdetail');
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
} }
src/app/trackorder/trackorder.page.html
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
</div> --> </div> -->
</div> </div>
<div class="rider_footer "> <div class="rider_footer" *ngIf="order">
<div class="rider_image "></div> <div class="rider_image "></div>
<div class="rider_detail "> <div class="rider_detail ">
<h5>John Doe</h5> <h5>{{order.riderName}}</h5>
<p>Rider</p> <p>Rider</p>
</div> </div>
<div class="rider_time "> <div class="rider_time ">
18<span>Mins</span> {{order.time}}<span>Mins</span>
</div> </div>
<div class="rider_call ">Call Rider</div> <div class="rider_call ">Call Rider</div>
<div class="clear "></div> <div class="clear "></div>
......
src/app/trackorder/trackorder.page.ts
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { MyordersService } from './../../config/myorder.service';
import { Myorder } from './../../config/services/myorder';
declare var google; declare var google;
...@@ -13,7 +15,8 @@ declare var google; ...@@ -13,7 +15,8 @@ declare var google;
export class TrackorderPage implements OnInit { export class TrackorderPage implements OnInit {
map: any; map: any;
address: string address: string;
order: Myorder;
public lat: number = 51.678418; public lat: number = 51.678418;
public lng: number = 7.809007; public lng: number = 7.809007;
...@@ -25,10 +28,11 @@ export class TrackorderPage implements OnInit { ...@@ -25,10 +28,11 @@ export class TrackorderPage implements OnInit {
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
public myorder: MyordersService
) { } ) { }
ngOnInit() { ngOnInit() {
this.getDirection(); this.getDirection();
} }
...@@ -46,8 +50,9 @@ export class TrackorderPage implements OnInit { ...@@ -46,8 +50,9 @@ export class TrackorderPage implements OnInit {
getDirection() { getDirection() {
this.origin = { lat: 51.678418, lng: 7.809007 }; this.order = this.myorder.selItem;
this.destination = { lat: 51.678418, lng: 7.81900 }; this.origin = { lat: this.order.pickupLocation._lat, lng: this.order.pickupLocation._long };
this.destination = { lat: this.order.deliveryLocation._lat, lng: this.order.deliveryLocation._long };
this.renderOptions = { polylineOptions: { strokeColor: 'rgba(69, 67, 152,1)' }, suppressMarkers: true }; this.renderOptions = { polylineOptions: { strokeColor: 'rgba(69, 67, 152,1)' }, suppressMarkers: true };
this.markerOptions = { this.markerOptions = {
origin: { origin: {
......
src/config/cart.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Router, ActivatedRoute } from '@angular/router';
import { Products } from './services/product';
import { Cart, CartItem } from './services/cart';
import { ServiceService } from './service.service';
import * as firebase from 'firebase';
import { take } from 'rxjs/operators';
import { User } from './services/user';
import { from } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class CartsService {
size: string;
color: string;
custId: string;
prodId: string;
cart: Cart;
user: User;
carts: CartItem[] = [];
cartTotal: number;
constructor(
public afs: AngularFirestore,
public router: Router,
public service: ServiceService
) {
this.size = 'Small';
this.custId = '';
const users = this.service.get('user').then((data) => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
console.log(this.custId);
} else {
this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
}
});
}
public async buyNow(product: Products) {
this.color = 'Blue';
this.prodId = product.prodId;
const prodRef = firebase.firestore().collection('products').doc(this.prodId);
const cartRef: AngularFirestoreCollection<any> = this.afs.collection('carts', ref => ref.where('size', '==', this.size)
.where('color', '==', this.color)
.where('custId', '==', this.custId)
.where('product', '==', prodRef)
);
cartRef.valueChanges().pipe(take(1)).subscribe((value: Cart[]) => {
console.log(value);
if (value.length === 0) {
const cart: Cart = {
color: this.color,
custId: this.custId,
product: firebase.firestore().doc(`products/${this.prodId}`),
image: product.image,
prodId: product.prodId,
price: product.price,
prodName: product.prodName,
shopper: product.shopper,
qty: 1,
size: this.size
};
this.afs.collection('carts').add(cart).then((docRef) => {
const neworderId = docRef.id;
this.afs.collection('carts').doc(neworderId).update({cartId: docRef.id}).then(() => {
console.log('Booking Successfully');
this.router.navigateByUrl('cart');
document.body.scrollTop = document.documentElement.scrollTop = 0;
});
}).catch((error) => {
console.error('Error adding document: ', error);
});
} else {
alert('Item already added in the cart');
}
});
}
public async cartList() {
const cartRef: AngularFirestoreCollection<any> = this.afs.collection('carts', ref => ref.where('custId', '==', this.custId));
cartRef.valueChanges().subscribe((value) => {
this.carts = [];
const res = value;
this.cartTotal = 0;
if (res.length > 0) {
res.forEach((item) => {
const cartItem: CartItem = {
cartId: item.cartId,
color: item.color,
shopperId: item.shopper,
prodId: item.prodId,
price: item.price,
prodName: item.prodName,
image: item.image,
qty: item.qty,
size: item.size,
};
this.cartTotal += item.price;
/*const prodItem = item.product.get().then((property) => {
const response = property.data();
cartItem.prodName = response.prodName;
cartItem.price = response.price;
cartItem.image = response.image;
cartItem.prodId = response.prodId;
cartItem.shopperId = response.shopper;
this.cartTotal += response.price;
});*/
this.carts.push(cartItem);
});
} else {
// alert('No Products Found');
}
});
}
choose_size(size: string) {
this.size = size;
}
}
src/config/myorder.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Myorder } from './services/myorder';
import { ServiceService } from './../config/service.service';
import * as firebase from 'firebase';
@Injectable({
providedIn: 'root'
})
export class MyordersService {
product: Myorder[] = [];
custId: string;
orders: Myorder[];
selItem: Myorder;
constructor(
public afs: AngularFirestore,
public service: ServiceService
) {
const users = this.service.get('user').then((data) => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
if (this.custId !== undefined) {
this.orderList(this.custId);
}
} else {
this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
}
});
}
public async orderList(custId) {
console.log('called');
console.log(custId);
const This = this;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('orders', ref => ref.where('custId', '==', custId)
.orderBy('bookDate', 'desc'));
orderRef.valueChanges().subscribe((value) => {
console.log(value);
this.orders = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
const order: Myorder = {
prodName: item.prodName,
color: item.color,
image: item.image,
amount: item.amount,
qty: item.qty,
status: item.status,
orderStatus: item.orderStatus,
bookDate: item.bookDate,
deliveryLocation: item.deliveryLocation,
pickupLocation: item.pickupLocation,
riderName: 'John',
size: item.size,
time: '60'
};
this.orders.push(order);
});
console.log(this.orders);
} else {
alert('No Orders Found');
}
});
}
public async trackOrder(order) {
this.selItem = order;
}
}
src/config/order.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Router, ActivatedRoute } from '@angular/router';
import { Order } from './services/order';
import { Products } from './services/product';
import { ServiceService } from './service.service';
import * as firebase from 'firebase';
import { CartItem } from './services/cart';
import { BehaviorSubject } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class OrdersService {
order: Order;
size: string;
color: string;
custId: string;
shopperId: any;
checkout = new BehaviorSubject(false);
constructor(
public afs: AngularFirestore,
public router: Router,
public service: ServiceService
) {
this.size = 'small';
this.color = 'Blue';
this.custId = '';
const users = this.service.get('user').then((data) => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
console.log(this.custId);
} else {
this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
}
});
}
public async checkOut(cart: CartItem[]) {
console.log(cart);
let currProcess = 0;
const cartCount = cart.length;
cart.forEach((product) => {
this.afs.collection('orders').add({
bookDate: firebase.firestore.FieldValue.serverTimestamp()
}).then((docRef) => {
const neworderId = docRef.id;
const delivery = new firebase.firestore.GeoPoint(10.0237, 76.3116);
const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
const orderItem: Order = {
amount: 'A$ 175',
customer: firebase.firestore().doc('/customer/' + this.custId),
shopper: product.shopperId,
deliveryAddress: 'Techware Software solution, Carnival Infopark, Kochi',
deliveryCharge: 'A$ 0.5',
deliveryLocation: delivery,
bookDate: firebase.firestore.FieldValue.serverTimestamp(),
discount: 'A$ 12.00',
orderCode: this.orderCode(),
orderId: neworderId,
orderStatus: 1,
pickupAddress: 'GetMi, Canberra, AUS',
pickupLocation: pickup,
price: 'A$ ' + product.price,
product: firebase.firestore().doc('/product/' + product.prodId),
promoId: null,
qty: product.qty,
rider: firebase.firestore().doc('/riders/qbTKza18mWVzYG9NLIbmjMbrYjG2'),
status: 1,
tax: 'A$ 7.5',
size: product.size,
color: product.color,
custId: this.custId,
image: product.image,
prodId: product.prodId,
prodName: product.prodName,
riderId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2',
shopperId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2'
};
this.afs.collection('orders').doc(neworderId).set(orderItem).then(() => {
currProcess += 1;
console.log('Booking Successfully');
this.afs.doc(`carts/${product.cartId}`).delete();
// this.router.navigateByUrl('cart');
console.log(currProcess, cartCount);
document.body.scrollTop = document.documentElement.scrollTop = 0;
if (currProcess === cartCount) {
// this.router.navigateByUrl('cart');
return true;
}
});
}).catch((error) => {
console.error('Error adding document: ', error);
});
});
}
public async buyNow(product: Products) {
//
}
orderCode() {
const newpin = Math.round(Math.random() * 1000000);
const orderCode = 'GM' + this.pad(newpin, 6, null);
return orderCode;
}
pad(n, width, z) {
z = z || '0';
n = n + '';
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
}
choose_size(size: string) {
this.size = size;
}
}
src/config/products.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Products } from './services/product';
import { ServiceService } from './../config/service.service';
@Injectable({
providedIn: 'root'
})
export class ProductsService {
product: Products[] = [];
selItem: Products;
constructor(
public afs: AngularFirestore,
public service: ServiceService
) { }
public async prodList() {
const This = this;
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(`products`);
prodRef.valueChanges().subscribe((value) => {
this.product = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item.size);
const prod: Products = {
prodId: item.prodId,
prodName: item.prodName,
prodCode: item.prodCode,
prodDesc: item.prodDesc,
prodStatus: item.prodStatus,
brand: item.brand.brandName,
category: item.category.catName,
color: item.color,
discount: item.discount,
featured: item.featured,
image: item.image,
price: item.price,
qty: item.qty,
shopper: item.shopper,
skuCode: item.skuCode,
status: item.status,
size: this.service.key2Array(item.size),
currency: item.currency
};
this.product.push(prod);
});
console.log(this.product);
} else {
alert('No Products Found');
}
});
}
public async setProd(item: Products) {
this.selItem = item;
}
}
src/config/service.service.ts
...@@ -26,5 +26,15 @@ export class ServiceService { ...@@ -26,5 +26,15 @@ export class ServiceService {
}); });
} }
public key2Array(item: object) {
const response = [];
for (const key in item) {
if (item.hasOwnProperty(key)) {
response.push(item[key]);
}
}
return response;
}
} }
src/config/services/cart.ts 0 → 100644
export interface Cart {
custId: string;
shopper: any;
product: any;
prodName: any;
prodId: string;
image: string;
size: string;
color: string;
qty: number;
price: number;
}
export interface CartItem {
cartId: string;
prodId: string;
shopperId: any;
prodName: any;
image: string;
size: string;
color: string;
qty: number;
price: number;
}
src/config/services/myorder.ts 0 → 100644
export interface Myorder {
amount: string;
prodName: any;
image: string;
size: string;
color: string;
qty: number;
bookDate: any;
pickupLocation: any;
deliveryLocation: any;
status: number;
orderStatus: number;
riderName: string;
time: string;
}
src/config/services/order.ts 0 → 100644
import { AngularFirestoreDocument } from '@angular/fire/firestore';
import { GeoJsonOptions } from '@agm/core/services/google-maps-types';
export interface Order {
amount: string;
customer: any;
deliveryAddress: string;
deliveryCharge: string;
deliveryLocation: object;
discount: string;
orderCode: string;
orderId: string;
orderStatus: number;
pickupAddress: string;
pickupLocation: object;
price: string;
bookDate: any;
prodId: string;
custId: string;
product: any;
prodName: any;
image: string;
size: string;
color: string;
promoId: any;
qty: number;
rider: any;
riderId: string;
shopper: any;
shopperId: string;
status: number;
tax: string;
}
src/config/services/product.ts 0 → 100644
export interface Products {
brand: string;
category: string;
color: string;
discount: number;
featured: boolean;
image: string;
price: number;
prodCode: string;
prodDesc: string;
prodId: string;
prodName: string;
prodStatus: boolean;
qty: number;
shopper: string;
size: Size[];
skuCode: string;
status: boolean;
currency: {
currId: string;
currName: string;
symbol: string
};
}
export interface Size {
sizeId: string;
sizeName: 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