Skip to content

G
getme
Commit b7d2998c by Adarsh K
Options

Merge branch 'adarsh' into 'master'

Adarsh See merge request !94
parents c57eb366 6afa4f28
Showing with 703 additions and 226 deletions
dist/out-tsc/src/app/app.component.js
import * as tslib_1 from "tslib"; import * as tslib_1 from "tslib";
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { Platform } from '@ionic/angular'; import { Platform, Events } 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 } from '@angular/fire/firestore'; import { AngularFirestore } from '@angular/fire/firestore';
...@@ -13,9 +13,11 @@ import { ServiceService } from './../config/service.service'; ...@@ -13,9 +13,11 @@ import { ServiceService } from './../config/service.service';
import { SubjectService } from './../config/subject.service'; import { SubjectService } from './../config/subject.service';
import { CategoriesService } from './../config/category.service'; import { CategoriesService } from './../config/category.service';
import { SearchmodalPage } from './searchmodal/searchmodal.page'; import { SearchmodalPage } from './searchmodal/searchmodal.page';
import { Location } from '@angular/common';
import { trigger, transition, animate, style } from '@angular/animations'; import { trigger, transition, animate, style } from '@angular/animations';
import { NavigationBar } from '@ionic-native/navigation-bar/ngx';
let AppComponent = class AppComponent { let AppComponent = class AppComponent {
constructor(platform, splashScreen, statusBar, router, afs, modalController, authService, service, categoryService, subjectService, route) { constructor(platform, splashScreen, statusBar, router, afs, modalController, authService, service, categoryService, subjectService, route, navigationBar, location, events) {
this.platform = platform; this.platform = platform;
this.splashScreen = splashScreen; this.splashScreen = splashScreen;
this.statusBar = statusBar; this.statusBar = statusBar;
...@@ -27,6 +29,9 @@ let AppComponent = class AppComponent { ...@@ -27,6 +29,9 @@ let AppComponent = class AppComponent {
this.categoryService = categoryService; this.categoryService = categoryService;
this.subjectService = subjectService; this.subjectService = subjectService;
this.route = route; this.route = route;
this.navigationBar = navigationBar;
this.location = location;
this.events = events;
this.isSearchOpen = false; this.isSearchOpen = false;
this.sec_active1 = true; this.sec_active1 = true;
this.sec_active2 = false; this.sec_active2 = false;
...@@ -36,7 +41,6 @@ let AppComponent = class AppComponent { ...@@ -36,7 +41,6 @@ let AppComponent = class AppComponent {
this.sec_active6 = false; this.sec_active6 = false;
this.tabData = true; this.tabData = true;
this.isShow = false; this.isShow = false;
console.log(this.router.url);
this.state = true; this.state = true;
this.initializeApp(); this.initializeApp();
this.subjectService.getLoginData().subscribe(loginData => { this.subjectService.getLoginData().subscribe(loginData => {
...@@ -61,10 +65,11 @@ let AppComponent = class AppComponent { ...@@ -61,10 +65,11 @@ let AppComponent = class AppComponent {
}); });
} }
ionViewWillEnter() { ionViewWillEnter() {
alert('enter');
} }
initializeApp() { initializeApp() {
this.platform.ready().then(() => { this.platform.ready().then(() => {
const autoHide = true;
this.navigationBar.setUp(autoHide);
this.statusBar.styleDefault(); this.statusBar.styleDefault();
this.statusBar.hide(); this.statusBar.hide();
this.statusBar.overlaysWebView(false); this.statusBar.overlaysWebView(false);
...@@ -105,8 +110,28 @@ let AppComponent = class AppComponent { ...@@ -105,8 +110,28 @@ let AppComponent = class AppComponent {
'review' 'review'
]; ];
const currentUrl = this.router.url.split('/'); const currentUrl = this.router.url.split('/');
if (currentUrl[1] === 'home') {
this.setActive1();
}
if (currentUrl[1] === 'catagory') {
this.setActive2();
}
if (currentUrl[1] === 'searchmodal') {
this.setActive3();
}
if (currentUrl[1] === 'cart') {
this.setActive4();
}
if (currentUrl[1] === 'cart') {
this.setActive4();
}
if (currentUrl[1] === 'myorder') {
this.setActive5();
}
if (currentUrl[1] === 'profile') {
this.setActive6();
}
const index = restrictedUrl.findIndex(x => x === currentUrl[1]); const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
// console.log(currentUrl[1], index, this.state);
if (index > -1 || this.tabData === false) { if (index > -1 || this.tabData === false) {
return true; return true;
} }
...@@ -182,6 +207,13 @@ let AppComponent = class AppComponent { ...@@ -182,6 +207,13 @@ let AppComponent = class AppComponent {
if (data.orderStatus === 7) { if (data.orderStatus === 7) {
this.finishpop(data); this.finishpop(data);
} }
else {
this.orderId = data.orderCode;
this.isShow = true;
setTimeout(() => {
this.isShow = false;
}, 3000);
}
} }
}); });
}); });
...@@ -255,7 +287,10 @@ AppComponent = tslib_1.__decorate([ ...@@ -255,7 +287,10 @@ AppComponent = tslib_1.__decorate([
ServiceService, ServiceService,
CategoriesService, CategoriesService,
SubjectService, SubjectService,
ActivatedRoute]) ActivatedRoute,
NavigationBar,
Location,
Events])
], AppComponent); ], AppComponent);
export { AppComponent }; export { AppComponent };
//# sourceMappingURL=app.component.js.map //# sourceMappingURL=app.component.js.map
\ No newline at end of file
dist/out-tsc/src/app/app.module.js
...@@ -8,6 +8,7 @@ import { StatusBar } from '@ionic-native/status-bar/ngx'; ...@@ -8,6 +8,7 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { IonicStorageModule } from '@ionic/storage'; import { IonicStorageModule } from '@ionic/storage';
import { GooglePlus } from '@ionic-native/google-plus/ngx'; import { GooglePlus } from '@ionic-native/google-plus/ngx';
import { NavigationBar } from '@ionic-native/navigation-bar/ngx';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { AngularFireModule } from '@angular/fire'; import { AngularFireModule } from '@angular/fire';
...@@ -25,6 +26,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module'; ...@@ -25,6 +26,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { CallNumber } from '@ionic-native/call-number/ngx'; import { CallNumber } from '@ionic-native/call-number/ngx';
import { sanitizeHtmlPipe } from './../config/safehtml'; import { sanitizeHtmlPipe } from './../config/safehtml';
import { Keyboard } from '@ionic-native/keyboard/ngx';
let AppModule = class AppModule { let AppModule = class AppModule {
}; };
AppModule = tslib_1.__decorate([ AppModule = tslib_1.__decorate([
...@@ -56,7 +58,9 @@ AppModule = tslib_1.__decorate([ ...@@ -56,7 +58,9 @@ AppModule = tslib_1.__decorate([
AuthService, AuthService,
GooglePlus, GooglePlus,
SocialSharing, SocialSharing,
sanitizeHtmlPipe sanitizeHtmlPipe,
NavigationBar,
Keyboard
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
......
dist/out-tsc/src/app/app.module.js.map
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../../../../src/app/app.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAkCxD,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAG,CAAA;AAAZ,SAAS;IAhCrB,QAAQ,CAAC;QACR,YAAY,EAAE,CAAC,YAAY,CAAC;QAC5B,eAAe,EAAE,EAAE;QACnB,OAAO,EAAE;YACP,aAAa;YACb,WAAW,CAAC,OAAO,EAAE;YACrB,kBAAkB,CAAC,OAAO,EAAE;YAC5B,gBAAgB;YAChB,uBAAuB;YACvB,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC;YACrD,qBAAqB;YACrB,qBAAqB;YACrB,sBAAsB;YACtB,wBAAwB;YACxB,qBAAqB;YACrB,WAAW;SACZ;QACD,SAAS,EAAE;YACT,UAAU;YACV,SAAS;YACT,YAAY;YACZ,WAAW;YACX,cAAc;YACd,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE;YAC7D,cAAc;YACd,WAAW;YACX,UAAU;YACV,aAAa;YACb,gBAAgB;SACjB;QACD,SAAS,EAAE,CAAC,YAAY,CAAC;KAC1B,CAAC;GACW,SAAS,CAAG;SAAZ,SAAS"} {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../../../../src/app/app.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAoCtD,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAI,CAAA;AAAb,SAAS;IAlCrB,QAAQ,CAAC;QACR,YAAY,EAAE,CAAC,YAAY,CAAC;QAC5B,eAAe,EAAE,EAAE;QACnB,OAAO,EAAE;YACP,aAAa;YACb,WAAW,CAAC,OAAO,EAAE;YACrB,kBAAkB,CAAC,OAAO,EAAE;YAC5B,gBAAgB;YAChB,uBAAuB;YACvB,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC;YACrD,qBAAqB;YACrB,qBAAqB;YACrB,sBAAsB;YACtB,wBAAwB;YACxB,qBAAqB;YACrB,WAAW;SACZ;QACD,SAAS,EAAE;YACT,UAAU;YACV,SAAS;YACT,YAAY;YACZ,WAAW;YACX,cAAc;YACd,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE;YAC7D,cAAc;YACd,WAAW;YACX,UAAU;YACV,aAAa;YACb,gBAAgB;YAChB,aAAa;YACb,QAAQ;SACT;QACD,SAAS,EAAE,CAAC,YAAY,CAAC;KAC1B,CAAC;GACW,SAAS,CAAI;SAAb,SAAS"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/cart/cart.page.js
...@@ -10,8 +10,9 @@ import { DeliverypopPage } from '../deliverypop/deliverypop.page'; ...@@ -10,8 +10,9 @@ import { DeliverypopPage } from '../deliverypop/deliverypop.page';
import { ServiceService } from './../../config/service.service'; import { ServiceService } from './../../config/service.service';
import { AddressService } from './../../config/address.service'; import { AddressService } from './../../config/address.service';
import { trigger, transition, animate, style } from '@angular/animations'; import { trigger, transition, animate, style } from '@angular/animations';
import { Events } from '@ionic/angular';
let CartPage = class CartPage { let CartPage = class CartPage {
constructor(router, route, location, cartService, orderService, modalController, service, addressService) { constructor(router, route, location, cartService, orderService, modalController, service, addressService, event) {
this.router = router; this.router = router;
this.route = route; this.route = route;
this.location = location; this.location = location;
...@@ -20,6 +21,7 @@ let CartPage = class CartPage { ...@@ -20,6 +21,7 @@ let CartPage = class CartPage {
this.modalController = modalController; this.modalController = modalController;
this.service = service; this.service = service;
this.addressService = addressService; this.addressService = addressService;
this.event = event;
this.isShow = false; this.isShow = false;
this.loader = false; this.loader = false;
this.cartwizard = { this.cartwizard = {
...@@ -34,7 +36,7 @@ let CartPage = class CartPage { ...@@ -34,7 +36,7 @@ let CartPage = class CartPage {
this.gateway = 1; this.gateway = 1;
this.deliveryCharge = 0; this.deliveryCharge = 0;
this.taxAmount = 0; this.taxAmount = 0;
this.discountApplied = false; this.discountApplied = 0;
this.discount = 0; this.discount = 0;
this.paymentMethod = 'PayPal'; this.paymentMethod = 'PayPal';
// this.cartService.cartList(); // this.cartService.cartList();
...@@ -43,29 +45,39 @@ let CartPage = class CartPage { ...@@ -43,29 +45,39 @@ let CartPage = class CartPage {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid; this.custId = data.uid;
this.service.get('cartCenter').then((centerData) => { /* this.service.get('cartCenter').then((centerData) => {
this.addressService.defaultAddress(this.custId); this.addressService.defaultAddress(this.custId);
this.addressService.getNearBy(centerData, this.custId); this.addressService.getNearBy(centerData, this.custId);
}); }); */
} }
}); });
setTimeout(() => { setTimeout(() => {
this.loader = false; this.loader = false;
}, 1000); }, 1000);
this.setCurrentLocation();
} }
ngOnInit() { ngOnInit() {
const This = this; /* const This = this;
console.log(this.addressService.nearestList); console.log(this.addressService.nearestList);
setTimeout(() => { setTimeout(() => {
this.setAddress(); this.setAddress();
}, 1000); }, 1000); */
}
setCurrentLocation() {
const This = this;
if ('geolocation' in navigator) {
navigator.geolocation.getCurrentPosition(position => {
this.lat = position.coords.latitude;
this.lng = position.coords.longitude;
});
}
} }
ionViewWillEnter() { ionViewWillEnter() {
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
const This = this; const This = this;
this.cartService.cartList(); this.cartService.cartList(data.uid);
setTimeout(() => { setTimeout(() => {
if (this.cartService.carts.length > 0) { if (this.cartService.carts.length > 0) {
const cart = this.cartService.carts[0]; const cart = this.cartService.carts[0];
...@@ -74,17 +86,6 @@ let CartPage = class CartPage { ...@@ -74,17 +86,6 @@ let CartPage = class CartPage {
} }
}); });
} }
setAddress() {
console.log(this.addressService.nearestList);
if (this.addressService.nearestList.length > 0) {
let address = this.addressService.nearestList.find(x => x.defaultVal === 1);
if (!address) {
address = this.addressService.nearestList[0];
}
this.loader = false;
this.custAddress = address;
}
}
getwaypaypal() { getwaypaypal() {
this.gateway = 1; this.gateway = 1;
this.paymentMethod = 'PayPal'; this.paymentMethod = 'PayPal';
...@@ -103,7 +104,7 @@ let CartPage = class CartPage { ...@@ -103,7 +104,7 @@ let CartPage = class CartPage {
return this.deliveryCharge.toFixed(2); return this.deliveryCharge.toFixed(2);
} }
getTax(amount) { getTax(amount) {
return Math.round((this.taxAmount = (amount * 10) / 100)).toFixed(2); return (this.taxAmount = (amount * 10) / 100).toFixed(2);
} }
getwaypayk() { getwaypayk() {
this.gateway = 3; this.gateway = 3;
...@@ -122,16 +123,20 @@ let CartPage = class CartPage { ...@@ -122,16 +123,20 @@ let CartPage = class CartPage {
}); });
} }
goToPage(path, data = null) { goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data }); if (path === 'nearby') {
this.addressService.addressState = 1;
}
this.router.navigateByUrl(path, { queryParams: data, replaceUrl: true });
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
} }
goBack() { goBack() {
this.event.publish('home');
this.location.back(); this.location.back();
} }
setDefault(addressId, index) { setDefault(addressId, index) {
console.log('loading....'); console.log('loading....');
this.loader = true; this.loader = true;
this.custAddress = this.addressService.nearestList[index]; this.addressService.custAddress = this.addressService.addressList[index];
console.log(this.custAddress); console.log(this.custAddress);
this.istoggle(); this.istoggle();
setTimeout(() => { setTimeout(() => {
...@@ -146,21 +151,23 @@ let CartPage = class CartPage { ...@@ -146,21 +151,23 @@ let CartPage = class CartPage {
}, 500); }, 500);
console.log(index); console.log(index);
if (index === 2) { if (index === 2) {
if (this.custAddress !== undefined) { if (this.addressService.custAddress !== undefined) {
if (this.addressService.custAddress.nearest === true) {
const otherCharges = { const otherCharges = {
deliveryCharge: this.deliveryCharge, deliveryCharge: this.deliveryCharge,
taxAmount: this.taxAmount, taxAmount: this.taxAmount,
discount: this.discount, discount: this.discount,
discountApplied: this.discountApplied, discountApplied: this.discountApplied === 1 ? true : false,
totalAmt: this.totalAmt, totalAmt: this.totalAmt,
custAddress: this.custAddress, custAddress: this.addressService.custAddress,
paymentMethod: this.paymentMethod paymentMethod: this.paymentMethod
}; };
const state = this.orderService const state = this.orderService
.checkOut(this.cartService.carts, otherCharges) .checkOut(this.cartService.carts, otherCharges, this.addressService.centerLoc)
.then(data => { .then(data => {
this.cartService.cartCenter = '';
const cartCount = this.orderService.cartCount; const cartCount = this.orderService.cartCount;
const timer = ((cartCount - 1) * 20) + 60; const timer = (cartCount - 1) * 20 + 60;
const totalTime = this.add_minutes(timer); const totalTime = this.add_minutes(timer);
console.log('ready for slide'); console.log('ready for slide');
this.timeinterval = setInterval(() => { this.timeinterval = setInterval(() => {
...@@ -170,7 +177,11 @@ let CartPage = class CartPage { ...@@ -170,7 +177,11 @@ let CartPage = class CartPage {
}); });
} }
else { else {
alert('Please choose delivery location'); this.service.showToast('Not delivered to the selected location', 'top', 'my-error', 1000);
}
}
else {
this.istoggle();
} }
} }
else { else {
...@@ -195,7 +206,7 @@ let CartPage = class CartPage { ...@@ -195,7 +206,7 @@ let CartPage = class CartPage {
} }
getTimeRemaining(endtime, currDate) { getTimeRemaining(endtime, currDate) {
const t = Date.parse(endtime) - Date.parse(currDate); const t = Date.parse(endtime) - Date.parse(currDate);
const hours = Math.floor((((t / 1000) / 60) / 60) % 60); const hours = Math.floor((t / 1000 / 60 / 60) % 60);
const seconds = Math.floor((t / 1000) % 60); const seconds = Math.floor((t / 1000) % 60);
const minutes = Math.floor((t / 1000 / 60) % 60); const minutes = Math.floor((t / 1000 / 60) % 60);
return { return {
...@@ -241,7 +252,7 @@ let CartPage = class CartPage { ...@@ -241,7 +252,7 @@ let CartPage = class CartPage {
this.cartService.checkPromo(code).subscribe(value => { this.cartService.checkPromo(code).subscribe(value => {
if (value.length > 0) { if (value.length > 0) {
const promo = value[0]; const promo = value[0];
this.discountApplied = true; this.discountApplied = 1;
if (value[0].type === 1) { if (value[0].type === 1) {
const rate = value[0].amount; const rate = value[0].amount;
const upto = value[0].amount; const upto = value[0].amount;
...@@ -253,6 +264,10 @@ let CartPage = class CartPage { ...@@ -253,6 +264,10 @@ let CartPage = class CartPage {
} }
this.discount.toFixed(2); this.discount.toFixed(2);
} }
else {
this.discountApplied = 0;
this.discount = 0;
}
}); });
} }
istoggle() { istoggle() {
...@@ -322,7 +337,8 @@ CartPage = tslib_1.__decorate([ ...@@ -322,7 +337,8 @@ CartPage = tslib_1.__decorate([
OrdersService, OrdersService,
ModalController, ModalController,
ServiceService, ServiceService,
AddressService]) AddressService,
Events])
], CartPage); ], CartPage);
export { CartPage }; export { CartPage };
//# sourceMappingURL=cart.page.js.map //# sourceMappingURL=cart.page.js.map
\ No newline at end of file
dist/out-tsc/src/app/catstorelist/catstorelist.page.js
...@@ -22,16 +22,20 @@ let CatStorelistPage = class CatStorelistPage { ...@@ -22,16 +22,20 @@ let CatStorelistPage = class CatStorelistPage {
this.slideOpts = { this.slideOpts = {
slidesPerView: 1.5 slidesPerView: 1.5
}; };
this.loader = true;
this.service.get('catParams').then(val => { this.service.get('catParams').then(val => {
this.data = val; this.data = val;
if (this.data.catId === '0') { if (this.data.catId === '0') {
this.shopperService.shopperList(true, 'status'); this.shopperService.shopperList(true, 'status');
} }
else { else {
console.log('error'); this.shopperService.categoryShopperList(this.data.catId);
this.shopperService.shopperList(this.data.catId, 'catId');
} }
}); });
const This = this;
setTimeout(() => {
This.loader = false;
}, 2000);
} }
clickSearch() { clickSearch() {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
......
dist/out-tsc/src/app/catstorelist/catstorelist.page.js.map
{"version":3,"file":"catstorelist.page.js","sourceRoot":"","sources":["../../../../../src/app/catstorelist/catstorelist.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"catstorelist.page.js","sourceRoot":"","sources":["../../../../../src/app/catstorelist/catstorelist.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/changedetails/changedetails.page.js
...@@ -49,7 +49,7 @@ let ChangedetailsPage = class ChangedetailsPage { ...@@ -49,7 +49,7 @@ let ChangedetailsPage = class ChangedetailsPage {
if (form.value.currentPassword && if (form.value.currentPassword &&
form.value.password && form.value.password &&
form.value.password === form.value.confirmPassword) { form.value.password === form.value.confirmPassword) {
this.register.updateData(form.value, this.userData.uid); this.register.updateData(form.value, this.userData);
this.register.updatePassword(form.value.currentPassword, form.value.password); this.register.updatePassword(form.value.currentPassword, form.value.password);
} }
else { else {
......
dist/out-tsc/src/app/changedetails/changedetails.page.js.map
{"version":3,"file":"changedetails.page.js","sourceRoot":"","sources":["../../../../../src/app/changedetails/changedetails.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"changedetails.page.js","sourceRoot":"","sources":["../../../../../src/app/changedetails/changedetails.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/home/home.module.js
...@@ -23,7 +23,7 @@ HomePageModule = tslib_1.__decorate([ ...@@ -23,7 +23,7 @@ HomePageModule = tslib_1.__decorate([
IonicModule, IonicModule,
AgmDirectionModule, AgmDirectionModule,
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: 'AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE' apiKey: 'AIzaSyBnCzDk6ec1OJFcW5FYgxP3LWVHMNumGDM'
}), }),
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
...@@ -31,4 +31,5 @@ HomePageModule = tslib_1.__decorate([ ...@@ -31,4 +31,5 @@ HomePageModule = tslib_1.__decorate([
}) })
], HomePageModule); ], HomePageModule);
export { HomePageModule }; export { HomePageModule };
// AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE
//# sourceMappingURL=home.module.js.map //# sourceMappingURL=home.module.js.map
\ No newline at end of file
dist/out-tsc/src/app/home/home.module.js.map
{"version":3,"file":"home.module.js","sourceRoot":"","sources":["../../../../../src/app/home/home.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAU,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMnD,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC;AAeF,IAAa,cAAc,GAA3B,MAAa,cAAc;CAAG,CAAA;AAAjB,cAAc;IAb1B,QAAQ,CAAC;QACR,OAAO,EAAE;YACP,YAAY;YACZ,WAAW;YACX,WAAW;YACX,kBAAkB;YAClB,aAAa,CAAC,OAAO,CAAC;gBACpB,MAAM,EAAE,yCAAyC;aAClD,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;SAC9B;QACD,YAAY,EAAE,CAAC,QAAQ,CAAC;KACzB,CAAC;GACW,cAAc,CAAG;SAAjB,cAAc"} {"version":3,"file":"home.module.js","sourceRoot":"","sources":["../../../../../src/app/home/home.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAU,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMnD,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC;AAeF,IAAa,cAAc,GAA3B,MAAa,cAAc;CAAI,CAAA;AAAlB,cAAc;IAb1B,QAAQ,CAAC;QACR,OAAO,EAAE;YACP,YAAY;YACZ,WAAW;YACX,WAAW;YACX,kBAAkB;YAClB,aAAa,CAAC,OAAO,CAAC;gBACpB,MAAM,EAAE,yCAAyC;aAClD,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;SAC9B;QACD,YAAY,EAAE,CAAC,QAAQ,CAAC;KACzB,CAAC;GACW,cAAc,CAAI;SAAlB,cAAc;AAC3B,0CAA0C"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/home/home.page.js
...@@ -41,6 +41,7 @@ let HomePage = class HomePage { ...@@ -41,6 +41,7 @@ let HomePage = class HomePage {
slidesPerView: 1.5 slidesPerView: 1.5
}; };
this.loader = false; this.loader = false;
this.address = 'Pick your Location';
} }
ngOnInit() { ngOnInit() {
this.mapsAPILoader.load().then(() => { this.mapsAPILoader.load().then(() => {
...@@ -62,7 +63,7 @@ let HomePage = class HomePage { ...@@ -62,7 +63,7 @@ let HomePage = class HomePage {
navigator.geolocation.getCurrentPosition(position => { navigator.geolocation.getCurrentPosition(position => {
this.lat = position.coords.latitude; this.lat = position.coords.latitude;
this.lng = position.coords.longitude; this.lng = position.coords.longitude;
this.centerService.getNearBy(this.lat, this.lng, 10); this.centerService.getNearBy(this.lat, this.lng, this.service.distance);
this.getAddress(this.lat, this.lng); this.getAddress(this.lat, this.lng);
}); });
} }
...@@ -73,7 +74,7 @@ let HomePage = class HomePage { ...@@ -73,7 +74,7 @@ let HomePage = class HomePage {
console.log(status); console.log(status);
if (status === 'OK') { if (status === 'OK') {
if (results[0]) { if (results[0]) {
const addressData = results[0].formatted_address.split(', '); const addressData = results[1].formatted_address.split(', ');
this.address = addressData[0] + ', ' + addressData[1]; this.address = addressData[0] + ', ' + addressData[1];
console.log(this.address); console.log(this.address);
} }
...@@ -88,12 +89,15 @@ let HomePage = class HomePage { ...@@ -88,12 +89,15 @@ let HomePage = class HomePage {
} }
setDefault(address) { setDefault(address) {
this.loader = true; this.loader = true;
this.addressService.setDefaultAddress(address.addressId, this.custId).then(() => { this.addressService
.setDefaultAddress(address.addressId, this.custId)
.then(() => {
this.address = address.address; this.address = address.address;
console.log(address.latLng); console.log(address.latLng);
this.centerService.getNearBy(address.latLng._lat, address.latLng._long, 10); this.centerService.getNearBy(address.latLng.latitude, address.latLng.longitude, this.service.distance);
this.loader = false; this.loader = false;
}).catch(err => { })
.catch(err => {
this.loader = false; this.loader = false;
this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000); this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000);
}); });
...@@ -130,7 +134,7 @@ let HomePage = class HomePage { ...@@ -130,7 +134,7 @@ let HomePage = class HomePage {
} }
istoggle() { istoggle() {
this.isShow = !this.isShow; this.isShow = !this.isShow;
console.log(this.isShow); console.log(this.isShow, 'Is SHow');
this.subjectService.setTabData(!this.isShow); this.subjectService.setTabData(!this.isShow);
} }
viewPage(datas) { viewPage(datas) {
......
dist/out-tsc/src/app/login/login.page.js.map
{"version":3,"file":"login.page.js","sourceRoot":"","sources":["../../../../../src/app/login/login.page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ1D,IAAa,SAAS,GAAtB,MAAa,SAAS;IAEpB,YACU,MAAc,EACd,KAAqB,EACtB,WAAwB,EACxB,QAAwB,EACvB,QAAkB;QAJlB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAgB;QACtB,gBAAW,GAAX,WAAW,CAAa;QACxB,aAAQ,GAAR,QAAQ,CAAgB;QACvB,aAAQ,GAAR,QAAQ,CAAU;IACxB,CAAC;IAEL,QAAQ,KAAK,CAAC;IAEd,gBAAgB;QACd,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,eAAe;QACb,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzB,6CAA6C;YAC7C,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;CACF,CAAA;AAhCY,SAAS;IALrB,SAAS,CAAC;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,mBAAmB;QAChC,SAAS,EAAE,CAAC,mBAAmB,CAAC;KACjC,CAAC;6CAIkB,MAAM;QACP,cAAc;QACT,WAAW;QACd,cAAc;QACb,QAAQ;GAPjB,SAAS,CAgCrB;SAhCY,SAAS"} {"version":3,"file":"login.page.js","sourceRoot":"","sources":["../../../../../src/app/login/login.page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO1D,IAAa,SAAS,GAAtB,MAAa,SAAS;IAEpB,YACU,MAAc,EACd,KAAqB,EACtB,WAAwB,EACxB,QAAwB,EACvB,QAAkB;QAJlB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAgB;QACtB,gBAAW,GAAX,WAAW,CAAa;QACxB,aAAQ,GAAR,QAAQ,CAAgB;QACvB,aAAQ,GAAR,QAAQ,CAAU;IACzB,CAAC;IAEJ,QAAQ,KAAI,CAAC;IAEb,gBAAgB;QACd,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,eAAe;QACb,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzB,6CAA6C;YAC7C,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;CACF,CAAA;AAhCY,SAAS;IALrB,SAAS,CAAC;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,mBAAmB;QAChC,SAAS,EAAE,CAAC,mBAAmB,CAAC;KACjC,CAAC;6CAIkB,MAAM;QACP,cAAc;QACT,WAAW;QACd,cAAc;QACb,QAAQ;GAPjB,SAAS,CAgCrB;SAhCY,SAAS"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/myorder/myorder.page.js
...@@ -105,6 +105,14 @@ let MyorderPage = class MyorderPage { ...@@ -105,6 +105,14 @@ let MyorderPage = class MyorderPage {
const regex = '%uFFFD'; const regex = '%uFFFD';
return unescape(text.replace(/%uFFFD/g, '')); return unescape(text.replace(/%uFFFD/g, ''));
} }
getProductTotal(products) {
let amtPrice = 0;
products.forEach(element => {
amtPrice += (element.price * element.qty);
});
const totalAmt = parseFloat(amtPrice.toFixed(2));
return 'A$' + (this.service.formatNumber(totalAmt));
}
}; };
MyorderPage = tslib_1.__decorate([ MyorderPage = tslib_1.__decorate([
Component({ Component({
......
dist/out-tsc/src/app/myorder/myorder.page.js.map
{"version":3,"file":"myorder.page.js","sourceRoot":"","sources":["../../../../../src/app/myorder/myorder.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"myorder.page.js","sourceRoot":"","sources":["../../../../../src/app/myorder/myorder.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/nearby/nearby.module.js
...@@ -23,7 +23,7 @@ NearbyPageModule = tslib_1.__decorate([ ...@@ -23,7 +23,7 @@ NearbyPageModule = tslib_1.__decorate([
IonicModule, IonicModule,
AgmDirectionModule, AgmDirectionModule,
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: "AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE" apiKey: 'AIzaSyBnCzDk6ec1OJFcW5FYgxP3LWVHMNumGDM'
}), }),
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
......
dist/out-tsc/src/app/nearby/nearby.module.js.map
{"version":3,"file":"nearby.module.js","sourceRoot":"","sources":["../../../../../src/app/nearby/nearby.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAU,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,UAAU;KACtB;CACF,CAAC;AAeF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAAG,CAAA;AAAnB,gBAAgB;IAb5B,QAAQ,CAAC;QACR,OAAO,EAAE;YACP,YAAY;YACZ,WAAW;YACX,WAAW;YACX,kBAAkB;YAClB,aAAa,CAAC,OAAO,CAAC;gBACpB,MAAM,EAAE,yCAAyC;aAClD,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;SAC9B;QACD,YAAY,EAAE,CAAC,UAAU,CAAC;KAC3B,CAAC;GACW,gBAAgB,CAAG;SAAnB,gBAAgB"} {"version":3,"file":"nearby.module.js","sourceRoot":"","sources":["../../../../../src/app/nearby/nearby.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAU,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,UAAU;KACtB;CACF,CAAC;AAeF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAAI,CAAA;AAApB,gBAAgB;IAb5B,QAAQ,CAAC;QACR,OAAO,EAAE;YACP,YAAY;YACZ,WAAW;YACX,WAAW;YACX,kBAAkB;YAClB,aAAa,CAAC,OAAO,CAAC;gBACpB,MAAM,EAAE,yCAAyC;aAClD,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;SAC9B;QACD,YAAY,EAAE,CAAC,UAAU,CAAC;KAC3B,CAAC;GACW,gBAAgB,CAAI;SAApB,gBAAgB"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/nearby/nearby.page.js
...@@ -6,10 +6,11 @@ import { MapsAPILoader } from '@agm/core'; ...@@ -6,10 +6,11 @@ import { MapsAPILoader } from '@agm/core';
import { Address } from './../../config/services/address'; import { Address } from './../../config/services/address';
import { AddressService } from './../../config/address.service'; import { AddressService } from './../../config/address.service';
import { ServiceService } from './../../config/service.service'; import { ServiceService } from './../../config/service.service';
import { AuthService } from './../../config/auth.service';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
/* import { google } from '@agm/core/services/google-maps-types'; */ /* import { google } from '@agm/core/services/google-maps-types'; */
let NearbyPage = class NearbyPage { let NearbyPage = class NearbyPage {
constructor(router, route, location, mapsAPILoader, ngZone, addressService, service) { constructor(router, route, location, mapsAPILoader, ngZone, addressService, service, authService) {
this.router = router; this.router = router;
this.route = route; this.route = route;
this.location = location; this.location = location;
...@@ -17,6 +18,7 @@ let NearbyPage = class NearbyPage { ...@@ -17,6 +18,7 @@ let NearbyPage = class NearbyPage {
this.ngZone = ngZone; this.ngZone = ngZone;
this.addressService = addressService; this.addressService = addressService;
this.service = service; this.service = service;
this.authService = authService;
this.addressData = new Address('', '', '', '', true, '', 0, ''); this.addressData = new Address('', '', '', '', true, '', 0, '');
this.successState = false; this.successState = false;
this.type = 0; this.type = 0;
...@@ -39,7 +41,13 @@ let NearbyPage = class NearbyPage { ...@@ -39,7 +41,13 @@ let NearbyPage = class NearbyPage {
} }
// google maps zoom level // google maps zoom level
setCurrentLocation() { setCurrentLocation() {
console.log('map-called');
if ('geolocation' in navigator) { if ('geolocation' in navigator) {
console.log(navigator);
this.latitude = -33.87276;
this.longitude = 151.20534;
this.zoom = 8;
this.getAddress(this.latitude, this.longitude);
navigator.geolocation.getCurrentPosition(position => { navigator.geolocation.getCurrentPosition(position => {
this.latitude = position.coords.latitude; this.latitude = position.coords.latitude;
this.longitude = position.coords.longitude; this.longitude = position.coords.longitude;
...@@ -55,6 +63,7 @@ let NearbyPage = class NearbyPage { ...@@ -55,6 +63,7 @@ let NearbyPage = class NearbyPage {
this.getAddress(this.latitude, this.longitude); this.getAddress(this.latitude, this.longitude);
} }
getAddress(latitude, longitude) { getAddress(latitude, longitude) {
this.geoCoder = new google.maps.Geocoder();
this.geoCoder.geocode({ location: { lat: latitude, lng: longitude } }, (results, status) => { this.geoCoder.geocode({ location: { lat: latitude, lng: longitude } }, (results, status) => {
console.log(results); console.log(results);
console.log(status); console.log(status);
...@@ -65,14 +74,26 @@ let NearbyPage = class NearbyPage { ...@@ -65,14 +74,26 @@ let NearbyPage = class NearbyPage {
console.log(this.address); console.log(this.address);
} }
else { else {
window.alert('No results found'); console.log('No results found');
} }
} }
else { else {
window.alert('Geocoder failed due to: ' + status); console.log('Geocoder failed due to: ' + status);
}
});
} }
mapReady(map) {
map.addListener('dragend', () => {
console.log(this.newCenterLat, this.newCenterLng);
this.getAddress(this.newCenterLat, this.newCenterLng);
}); });
} }
centerChange(e) {
console.log(e);
this.newCenterLat = e.lat;
this.newCenterLng = e.lng;
this.getAddress(this.newCenterLat, this.newCenterLng);
}
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;
...@@ -90,7 +111,7 @@ let NearbyPage = class NearbyPage { ...@@ -90,7 +111,7 @@ let NearbyPage = class NearbyPage {
landmark: data.landmark, landmark: data.landmark,
defaultVal: 0, defaultVal: 0,
uid: this.uid, uid: this.uid,
latLng: new firebase.firestore.GeoPoint(this.latitude, this.longitude), latLng: new firebase.firestore.GeoPoint(this.newCenterLat, this.newCenterLat),
status: true status: true
}; };
this.addressService.addressCreate(postData); this.addressService.addressCreate(postData);
...@@ -98,12 +119,18 @@ let NearbyPage = class NearbyPage { ...@@ -98,12 +119,18 @@ let NearbyPage = class NearbyPage {
setTimeout(() => { setTimeout(() => {
this.loader = false; this.loader = false;
this.successState = false; this.successState = false;
if (this.type === 1) { if (this.authService.regState === false) {
this.router.navigateByUrl('preference', { queryParams: null }); this.router.navigateByUrl('preference', { queryParams: null });
} }
else { else {
if (this.addressService.addressState === 1) {
this.addressService.addressState = 0;
this.router.navigateByUrl('cart', { replaceUrl: true });
}
else {
this.goBack(); this.goBack();
} }
}
}, 3000); }, 3000);
} }
}; };
...@@ -119,7 +146,8 @@ NearbyPage = tslib_1.__decorate([ ...@@ -119,7 +146,8 @@ NearbyPage = tslib_1.__decorate([
MapsAPILoader, MapsAPILoader,
NgZone, NgZone,
AddressService, AddressService,
ServiceService]) ServiceService,
AuthService])
], NearbyPage); ], NearbyPage);
export { NearbyPage }; export { NearbyPage };
//# sourceMappingURL=nearby.page.js.map //# sourceMappingURL=nearby.page.js.map
\ No newline at end of file
dist/out-tsc/src/app/nearby/nearby.page.js.map
{"version":3,"file":"nearby.page.js","sourceRoot":"","sources":["../../../../../src/app/nearby/nearby.page.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,SAAS,EAIT,MAAM,EACP,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAc,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,oEAAoE;AAOpE,IAAa,UAAU,GAAvB,MAAa,UAAU;IAcrB,YACU,MAAc,EACd,KAAqB,EACrB,QAAkB,EAClB,aAA4B,EAC5B,MAAc,EACf,cAA8B,EAC9B,OAAuB;QANtB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAgB;QACrB,aAAQ,GAAR,QAAQ,CAAU;QAClB,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;QACf,mBAAc,GAAd,cAAc,CAAgB;QAC9B,YAAO,GAAP,OAAO,CAAgB;QAdhC,gBAAW,GAAG,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAgBzD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjD,IAAI,IAAI,EAAE;gBACR,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;aACrB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,2BAA2B;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IACD,yBAAyB;IAEjB,kBAAkB;QACxB,IAAI,aAAa,IAAI,SAAS,EAAE;YAC9B,SAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE;gBAClD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACzC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC3C,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;gBACd,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,aAAa,CAAC,MAAkB;QAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAED,UAAU,CAAC,QAAQ,EAAE,SAAS;QAC5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CACnB,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAC/C,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpB,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;oBACd,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;oBACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;oBAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC3B;qBAAM;oBACL,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBAClC;aACF;iBAAM;gBACL,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,MAAM,CAAC,CAAC;aACnD;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,IAAS;QAChB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAY;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,CAAC;YACb,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,IAAI,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;YACtE,MAAM,EAAE,IAAI;SACb,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;aAChE;iBAAM;gBACL,IAAI,CAAC,MAAM,EAAE,CAAC;aACf;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;CACF,CAAA;AAxHY,UAAU;IALtB,SAAS,CAAC;QACT,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,oBAAoB;QACjC,SAAS,EAAE,CAAC,oBAAoB,CAAC;KAClC,CAAC;6CAgBkB,MAAM;QACP,cAAc;QACX,QAAQ;QACH,aAAa;QACpB,MAAM;QACC,cAAc;QACrB,cAAc;GArBrB,UAAU,CAwHtB;SAxHY,UAAU"} {"version":3,"file":"nearby.page.js","sourceRoot":"","sources":["../../../../../src/app/nearby/nearby.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/orderplaced/orderplaced.page.js
...@@ -18,9 +18,10 @@ let OrderplacedPage = class OrderplacedPage { ...@@ -18,9 +18,10 @@ let OrderplacedPage = class OrderplacedPage {
ionViewWillEnter() { ionViewWillEnter() {
this.deliveryTime = ''; this.deliveryTime = '';
this.service.get('order').then(val => { this.service.get('order').then(val => {
console.log(val);
this.data = val; this.data = val;
this.timeinterval = setInterval(() => { this.timeinterval = setInterval(() => {
this.getDeliveryTime(this.data.bookDate.seconds); this.getDeliveryTime(this.data.bookDate.seconds, this.data.time);
}, 1000); }, 1000);
}); });
} }
...@@ -28,15 +29,15 @@ let OrderplacedPage = class OrderplacedPage { ...@@ -28,15 +29,15 @@ let OrderplacedPage = class OrderplacedPage {
const regex = '%uFFFD'; const regex = '%uFFFD';
return unescape(text.replace(/%uFFFD/g, '')); return unescape(text.replace(/%uFFFD/g, ''));
} }
getDeliveryTime(timeStamp) { getDeliveryTime(timeStamp, minute) {
// console.log(timeStamp); let endDate = new Date(timeStamp * 1000);
const endDate = new Date(timeStamp * 1000); endDate = new Date(endDate.getTime() + minute * 60000);
// console.log(endDate); // console.log(endDate);
endDate.setHours(endDate.getHours() + 1);
const t = this.getTimeRemaining(endDate, new Date()); const t = this.getTimeRemaining(endDate, new Date());
const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes; const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;
const seconds = t.seconds < 10 ? '0' + t.seconds : t.seconds; const seconds = t.seconds < 10 ? '0' + t.seconds : t.seconds;
this.deliveryTime = minutes + ' : ' + seconds; const hours = t.hours < 10 ? '0' + t.hours : t.hours;
this.deliveryTime = t.hours + ' : ' + minutes + ' : ' + seconds;
if (t.t <= 0) { if (t.t <= 0) {
clearInterval(this.timeinterval); clearInterval(this.timeinterval);
} }
...@@ -44,10 +45,12 @@ let OrderplacedPage = class OrderplacedPage { ...@@ -44,10 +45,12 @@ let OrderplacedPage = class OrderplacedPage {
getTimeRemaining(endtime, currDate) { getTimeRemaining(endtime, currDate) {
const t = Date.parse(endtime) - Date.parse(currDate); const t = Date.parse(endtime) - Date.parse(currDate);
this.cancelDelivery = t; this.cancelDelivery = t;
const hours = Math.floor((((t / 1000) / 60) / 60) % 60);
const seconds = Math.floor((t / 1000) % 60); const seconds = Math.floor((t / 1000) % 60);
const minutes = Math.floor((t / 1000 / 60) % 60); const minutes = Math.floor((t / 1000 / 60) % 60);
return { return {
t, t,
hours,
minutes, minutes,
seconds seconds
}; };
......
dist/out-tsc/src/app/orderplaced/orderplaced.page.js.map
{"version":3,"file":"orderplaced.page.js","sourceRoot":"","sources":["../../../../../src/app/orderplaced/orderplaced.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"orderplaced.page.js","sourceRoot":"","sources":["../../../../../src/app/orderplaced/orderplaced.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/preference/preference.page.js
...@@ -2,12 +2,14 @@ import * as tslib_1 from "tslib"; ...@@ -2,12 +2,14 @@ import * as tslib_1 from "tslib";
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { CategoriesService } from './../../config/category.service'; import { CategoriesService } from './../../config/category.service';
import { ServiceService } from './../../config/service.service'; import { ServiceService } from './../../config/service.service';
import { AuthService } from './../../config/auth.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
let PreferencePage = class PreferencePage { let PreferencePage = class PreferencePage {
constructor(categoriesService, service, router) { constructor(categoriesService, service, router, authService) {
this.categoriesService = categoriesService; this.categoriesService = categoriesService;
this.service = service; this.service = service;
this.router = router; this.router = router;
this.authService = authService;
this.successState = false; this.successState = false;
this.userPrefence = []; this.userPrefence = [];
this.type = 0; this.type = 0;
...@@ -18,10 +20,10 @@ let PreferencePage = class PreferencePage { ...@@ -18,10 +20,10 @@ let PreferencePage = class PreferencePage {
this.categoriesService this.categoriesService
.preference(this.uid) .preference(this.uid)
.then(datas => { .then(datas => {
console.log(datas); // console.log(datas);
console.log(this.categoriesService.preferenceList); // console.log(this.categoriesService.preferenceList);
this.userPrefence = this.categoriesService.preferenceList; this.userPrefence = this.categoriesService.preferenceList;
console.log(this.userPrefence); // console.log(this.userPrefence);
}) })
.catch(err => { .catch(err => {
this.userPrefence = []; this.userPrefence = [];
...@@ -34,8 +36,8 @@ let PreferencePage = class PreferencePage { ...@@ -34,8 +36,8 @@ let PreferencePage = class PreferencePage {
} }
ngOnInit() { } ngOnInit() { }
selectPrefernce(preferenceId) { selectPrefernce(preferenceId) {
console.log(this.userPrefence); // console.log(this.userPrefence);
console.log(preferenceId); // console.log(preferenceId);
if (this.userPrefence) { if (this.userPrefence) {
const index = this.userPrefence.findIndex(x => x === preferenceId); const index = this.userPrefence.findIndex(x => x === preferenceId);
if (index > -1) { if (index > -1) {
...@@ -52,24 +54,26 @@ let PreferencePage = class PreferencePage { ...@@ -52,24 +54,26 @@ let PreferencePage = class PreferencePage {
} }
onSubmit() { onSubmit() {
this.loader = true; this.loader = true;
console.log(this.userPrefence); // console.log(this.userPrefence);
this.categoriesService.preferenceCreate(this.userPrefence, this.uid); this.categoriesService.preferenceCreate(this.userPrefence, this.uid);
this.successState = true; this.successState = true;
setTimeout(() => { setTimeout(() => {
this.loader = false; this.loader = false;
this.successState = false; this.successState = false;
this.service.set('type', 0); this.service.set('type', 0);
if (this.type === 1) { if (this.authService.regState === false) {
this.authService.regState = true;
this.router.navigateByUrl('home', { queryParams: null }); this.router.navigateByUrl('home', { queryParams: null });
} }
else { else {
this.authService.regState = true;
this.goBack(); this.goBack();
} }
}, 3000); }, 3000);
} }
selectedPref(preferenceId) { selectedPref(preferenceId) {
const index = this.userPrefence.findIndex(x => x === preferenceId); const index = this.userPrefence.findIndex(x => x === preferenceId);
console.log(index); // console.log(index);
if (index > -1) { if (index > -1) {
return true; return true;
} }
...@@ -89,7 +93,8 @@ PreferencePage = tslib_1.__decorate([ ...@@ -89,7 +93,8 @@ PreferencePage = tslib_1.__decorate([
}), }),
tslib_1.__metadata("design:paramtypes", [CategoriesService, tslib_1.__metadata("design:paramtypes", [CategoriesService,
ServiceService, ServiceService,
Router]) Router,
AuthService])
], PreferencePage); ], PreferencePage);
export { PreferencePage }; export { PreferencePage };
//# sourceMappingURL=preference.page.js.map //# sourceMappingURL=preference.page.js.map
\ No newline at end of file
dist/out-tsc/src/app/preference/preference.page.js.map
{"version":3,"file":"preference.page.js","sourceRoot":"","sources":["../../../../../src/app/preference/preference.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"preference.page.js","sourceRoot":"","sources":["../../../../../src/app/preference/preference.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/productdetail/productdetail.page.js
...@@ -34,12 +34,21 @@ let ProductdetailPage = class ProductdetailPage { ...@@ -34,12 +34,21 @@ let ProductdetailPage = class ProductdetailPage {
this.service.get('params').then(val => { this.service.get('params').then(val => {
this.data = val; this.data = val;
}); });
this.cartService.cartList();
setTimeout(() => { setTimeout(() => {
this.loader = false; this.loader = false;
}, 1000); }, 1000);
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
} }
ionViewWillEnter() {
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
const This = this;
this.cartService.cartList(data.uid);
}
});
}
ngOnInit() { ngOnInit() {
// console.log("[qwe]", this.prodService.selItem); // console.log("[qwe]", this.prodService.selItem);
const params = this.prodService.selItem; const params = this.prodService.selItem;
...@@ -106,14 +115,16 @@ let ProductdetailPage = class ProductdetailPage { ...@@ -106,14 +115,16 @@ let ProductdetailPage = class ProductdetailPage {
this.location.back(); this.location.back();
} }
buyNow(product, type) { buyNow(product, type) {
this.cartService.buyNow(product).then(() => { this.cartService.buyNow(product).then((data) => {
if (data === true) {
if (type === 1) { if (type === 1) {
this.router.navigateByUrl('cart'); this.router.navigateByUrl('cart', { replaceUrl: true });
} }
else { else {
this.service.showToast('Added into cart', 'top', 'my-toast', 2000); this.service.showToast('Added into cart', 'top', 'my-toast', 2000);
} }
this.cartService.cartList(); }
// this.cartService.cartList();
}); });
} }
viewProd(prod) { viewProd(prod) {
...@@ -124,30 +135,35 @@ let ProductdetailPage = class ProductdetailPage { ...@@ -124,30 +135,35 @@ let ProductdetailPage = class ProductdetailPage {
return state > -1 ? 'fav_active' : 'fav'; return state > -1 ? 'fav_active' : 'fav';
} }
changeFav(index) { changeFav(index) {
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
const state = this.prodService.fav.findIndex(x => x === index); const state = this.prodService.fav.findIndex(x => x === index);
// console.log(state); // console.log(state);
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
if (state > -1) { if (state > -1) {
this.prodService.fav.splice(state, 1); this.prodService.fav.splice(state, 1);
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
} }
else { else {
this.prodService.fav.push(index); this.prodService.fav.push(index);
this.prodService.changeFav(index, 'no'); this.prodService.changeFav(index, 'no', this.custId);
} }
return; return;
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
} }
socialShare(prodName, category, subCate, price, image) { socialShare(prodName, category, subCate, price, image) {
const desc = category + ', ' + subCate + ', ' + price; const desc = this.unEscape(prodName) + ', ' + category + ', ' + subCate + ', ' + 'AU$' + price;
console.log(image);
this.service.getBase64ImageFromUrl(image)
.then((result) => {
const content = { const content = {
message: desc, message: desc,
subject: prodName, subject: this.unEscape(prodName),
files: image, files: [result],
chooserTitle: 'GetMi' chooserTitle: 'GetMi'
}; };
console.log(content);
this.socialSharing.shareWithOptions(content); this.socialSharing.shareWithOptions(content);
}).catch(err => console.error(err));
} }
}; };
ProductdetailPage = tslib_1.__decorate([ ProductdetailPage = tslib_1.__decorate([
......
dist/out-tsc/src/app/productlist/productlist.page.js
...@@ -23,7 +23,7 @@ let ProductlistPage = class ProductlistPage { ...@@ -23,7 +23,7 @@ let ProductlistPage = class ProductlistPage {
this.isShow = false; this.isShow = false;
this.searchShow = false; this.searchShow = false;
this.loader = true; this.loader = true;
const users = this.service.get('user').then(data => { const users = this.service.get('userData').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid; this.custId = data.uid;
...@@ -48,8 +48,10 @@ let ProductlistPage = class ProductlistPage { ...@@ -48,8 +48,10 @@ let ProductlistPage = class ProductlistPage {
} }
}); });
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
console.log(data);
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid;
this.prodService.getFavlist(data.uid); this.prodService.getFavlist(data.uid);
} }
}); });
...@@ -98,11 +100,11 @@ let ProductlistPage = class ProductlistPage { ...@@ -98,11 +100,11 @@ let ProductlistPage = class ProductlistPage {
console.log(this.prodService.fav); console.log(this.prodService.fav);
if (state > -1) { if (state > -1) {
this.prodService.fav.splice(state, 1); this.prodService.fav.splice(state, 1);
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
} }
else { else {
this.prodService.fav.push(index); this.prodService.fav.push(index);
this.prodService.changeFav(index, 'no'); this.prodService.changeFav(index, 'no', this.custId);
} }
return; return;
console.log(this.prodService.fav); console.log(this.prodService.fav);
......
dist/out-tsc/src/app/profile/profile.page.js
...@@ -28,8 +28,6 @@ let ProfilePage = class ProfilePage { ...@@ -28,8 +28,6 @@ let ProfilePage = class ProfilePage {
this.service.get('user').then(data => { this.service.get('user').then(data => {
if (data) { if (data) {
this.userData = JSON.parse(data); this.userData = JSON.parse(data);
this.wishService.wishList(this.userData.uid);
console.log(this.userData);
} }
}); });
// Listens to url // Listens to url
...@@ -37,7 +35,9 @@ let ProfilePage = class ProfilePage { ...@@ -37,7 +35,9 @@ let ProfilePage = class ProfilePage {
// Get user Data // Get user Data
this.service.get('userData').then(data => { this.service.get('userData').then(data => {
if (data) { if (data) {
console.log(data);
this.loggedUser = JSON.parse(data); this.loggedUser = JSON.parse(data);
this.wishService.wishList(this.loggedUser.uid);
} }
}); });
}); });
......
dist/out-tsc/src/app/profile/profile.page.js.map
{"version":3,"file":"profile.page.js","sourceRoot":"","sources":["../../../../../src/app/profile/profile.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"profile.page.js","sourceRoot":"","sources":["../../../../../src/app/profile/profile.page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAO,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACL,kBAAkB,EAGnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAkB1E,IAAa,WAAW,GAAxB,MAAa,WAAW;IAWtB,YACU,KAAqB,EACrB,MAAc,EACd,OAA2B,EAC3B,UAAuB,EACvB,OAAuB,EACvB,WAAwB,EACxB,cAA8B,EAC9B,WAAwB,EACxB,QAAkB,EAClB,OAAuB;QATvB,UAAK,GAAL,KAAK,CAAgB;QACrB,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAoB;QAC3B,eAAU,GAAV,UAAU,CAAa;QACvB,YAAO,GAAP,OAAO,CAAgB;QACvB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,aAAQ,GAAR,QAAQ,CAAU;QAClB,YAAO,GAAP,OAAO,CAAgB;QAjBjC,WAAM,GAAG,KAAK,CAAC;QAmBb,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnC,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClC;QACH,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YAC3B,gBAAgB;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,IAAI,IAAI,EAAE;oBACR,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;IAChC,CAAC;IAED,QAAQ;QACN,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAClC,qCAAqC;YACrC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAEK,UAAU,CAAC,KAAK;;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,MAAM,QAAQ,GAAa,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAChC,IAAI,UAAU,CAAC;gBACf,MAAM,CAAC,MAAM,GAAG,CAAC,MAAW,EAAE,EAAE;oBAC9B,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gBACtD,CAAC,CAAC;gBAEF,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;gBAEjC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE5C,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvC,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,KAAK,EAAE;oBACpD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB;oBACxC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO;yBACtB,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC;yBAClB,eAAe,EAAE;yBACjB,IAAI,CACH,QAAQ,CAAC,GAAG,EAAE;wBACZ,GAAG,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;4BACnC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;4BACpB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;4BACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gCAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gCACvC,SAAS,CAAC,YAAY,GAAG,GAAG,CAAC;gCAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;gCACxD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;4BACvD,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CACH;yBACA,SAAS,EAAE,CAAC;oBAEf,6DAA6D;oBAC7D,iCAAiC;iBAClC;aACF;QACH,CAAC;KAAA;CACF,CAAA;AAlHY,WAAW;IAhBvB,SAAS,CAAC;QACT,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,qBAAqB;QAClC,SAAS,EAAE,CAAC,qBAAqB,CAAC;QAClC,UAAU,EAAE;YACV,OAAO,CAAC,YAAY,EAAE;gBACpB,UAAU,CAAC,QAAQ,EAAE;oBACnB,KAAK,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;oBACxC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;iBACjE,CAAC;gBACF,UAAU,CAAC,QAAQ,EAAE;oBACnB,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;iBACpE,CAAC;aACH,CAAC;SACH;KACF,CAAC;6CAaiB,cAAc;QACb,MAAM;QACL,kBAAkB;QACf,WAAW;QACd,cAAc;QACV,WAAW;QACR,cAAc;QACjB,WAAW;QACd,QAAQ;QACT,cAAc;GArBtB,WAAW,CAkHvB;SAlHY,WAAW"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/trackorder/trackorder.page.js
...@@ -24,8 +24,8 @@ let TrackorderPage = class TrackorderPage { ...@@ -24,8 +24,8 @@ let TrackorderPage = class TrackorderPage {
} }
getDirection() { getDirection() {
this.order = this.myorder.selItem; this.order = this.myorder.selItem;
this.origin = { lat: this.order.pickupLocation._lat, lng: this.order.pickupLocation._long }; this.origin = { lat: this.order.pickupLocation.latitude, lng: this.order.pickupLocation.longitude };
this.destination = { lat: this.order.deliveryLocation._lat, lng: this.order.deliveryLocation._long }; this.destination = { lat: this.order.deliveryLocation.latitude, lng: this.order.deliveryLocation.longitude };
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: {
......
dist/out-tsc/src/app/trackorder/trackorder.page.js.map
{"version":3,"file":"trackorder.page.js","sourceRoot":"","sources":["../../../../../src/app/trackorder/trackorder.page.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAiC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAUjE,IAAa,cAAc,GAA3B,MAAa,cAAc;IAazB,YACU,MAAc,EACd,KAAqB,EACrB,QAAkB,EACnB,OAAwB;QAHvB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAgB;QACrB,aAAQ,GAAR,QAAQ,CAAU;QACnB,YAAO,GAAP,OAAO,CAAiB;QAX1B,QAAG,GAAW,SAAS,CAAC;QACxB,QAAG,GAAW,QAAQ,CAAC;IAW1B,CAAC;IAGL,QAAQ;QACN,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAKD,YAAY;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5F,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACrG,IAAI,CAAC,aAAa,GAAG,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,qBAAqB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACxG,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,qBAAqB;aAC5B;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,0BAA0B;aACjC;SACF,CAAC;IACJ,CAAC;CAEF,CAAA;AApDY,cAAc;IAL1B,SAAS,CAAC;QACT,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,wBAAwB;QACrC,SAAS,EAAE,CAAC,wBAAwB,CAAC;KACtC,CAAC;6CAekB,MAAM;QACP,cAAc;QACX,QAAQ;QACV,eAAe;GAjBtB,cAAc,CAoD1B;SApDY,cAAc"} {"version":3,"file":"trackorder.page.js","sourceRoot":"","sources":["../../../../../src/app/trackorder/trackorder.page.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAiC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAUjE,IAAa,cAAc,GAA3B,MAAa,cAAc;IAazB,YACU,MAAc,EACd,KAAqB,EACrB,QAAkB,EACnB,OAAwB;QAHvB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAgB;QACrB,aAAQ,GAAR,QAAQ,CAAU;QACnB,YAAO,GAAP,OAAO,CAAiB;QAX1B,QAAG,GAAW,SAAS,CAAC;QACxB,QAAG,GAAW,QAAQ,CAAC;IAW1B,CAAC;IAGL,QAAQ;QACN,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;QACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAKD,YAAY;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;QACpG,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC7G,IAAI,CAAC,aAAa,GAAG,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,qBAAqB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACxG,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,qBAAqB;aAC5B;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,0BAA0B;aACjC;SACF,CAAC;IACJ,CAAC;CAEF,CAAA;AApDY,cAAc;IAL1B,SAAS,CAAC;QACT,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,wBAAwB;QACrC,SAAS,EAAE,CAAC,wBAAwB,CAAC;KACtC,CAAC;6CAekB,MAAM;QACP,cAAc;QACX,QAAQ;QACV,eAAe;GAjBtB,cAAc,CAoD1B;SApDY,cAAc"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/app/wishlist/wishlist.page.js
...@@ -65,6 +65,7 @@ let WishlistPage = class WishlistPage { ...@@ -65,6 +65,7 @@ let WishlistPage = class WishlistPage {
.then(datas => { .then(datas => {
this.loader = false; this.loader = false;
this.service.showToast('Added to cart', 'top', 'my-toast', 2000); this.service.showToast('Added to cart', 'top', 'my-toast', 2000);
this.router.navigateByUrl('cart', { replaceUrl: true, queryParams: data });
}) })
.catch(err => { .catch(err => {
this.loader = false; this.loader = false;
......
dist/out-tsc/src/app/wishlist/wishlist.page.js.map
{"version":3,"file":"wishlist.page.js","sourceRoot":"","sources":["../../../../../src/app/wishlist/wishlist.page.ts"],"names":[],"mappings":"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"} {"version":3,"file":"wishlist.page.js","sourceRoot":"","sources":["../../../../../src/app/wishlist/wishlist.page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/config/address.service.js
...@@ -7,6 +7,7 @@ let AddressService = class AddressService { ...@@ -7,6 +7,7 @@ let AddressService = class AddressService {
this.afs = afs; this.afs = afs;
this.addressList = []; this.addressList = [];
this.nearestList = []; this.nearestList = [];
this.addressState = 0;
} }
addList(userId) { addList(userId) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
...@@ -26,7 +27,8 @@ let AddressService = class AddressService { ...@@ -26,7 +27,8 @@ let AddressService = class AddressService {
defaultVal: item.defaultVal, defaultVal: item.defaultVal,
building: item.building, building: item.building,
landmark: item.landmark, landmark: item.landmark,
addressId: item.addressId addressId: item.addressId,
nearest: false
}; };
this.addressList.push(address); this.addressList.push(address);
}); });
...@@ -55,7 +57,8 @@ let AddressService = class AddressService { ...@@ -55,7 +57,8 @@ let AddressService = class AddressService {
defaultVal: item.defaultVal, defaultVal: item.defaultVal,
building: item.building, building: item.building,
landmark: item.landmark, landmark: item.landmark,
addressId: item.addressId addressId: item.addressId,
nearest: false
}; };
this.defaultAdd = address; this.defaultAdd = address;
console.log(this.defaultAdd); console.log(this.defaultAdd);
...@@ -119,10 +122,10 @@ let AddressService = class AddressService { ...@@ -119,10 +122,10 @@ let AddressService = class AddressService {
.doc(addId) .doc(addId)
.delete(); .delete();
} }
getNearBy(centerId, userId) { getNearBy(centerId, userId, distance) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
// latitude, longitude, distance, userId // latitude, longitude, distance, userId
console.log(centerId); console.log(centerId, userId, distance);
if (centerId) { if (centerId) {
this.afs.collection('centers').doc(centerId).ref.get().then((doc) => { this.afs.collection('centers').doc(centerId).ref.get().then((doc) => {
if (doc.exists) { if (doc.exists) {
...@@ -130,15 +133,26 @@ let AddressService = class AddressService { ...@@ -130,15 +133,26 @@ let AddressService = class AddressService {
const center = doc.data(); const center = doc.data();
const This = this; const This = this;
const state = true; const state = true;
const latitude = center.latLng._lat; this.centerLoc = {
const longitude = center.latLng._long; cId: center.cId,
centerImg: center.centerImg,
centerName: center.centerName,
description: center.description,
featured: center.featured,
latLng: center.latLng,
location: center.location,
status: center.status
};
const latitude = center.latLng.latitude;
const longitude = center.latLng.longitude;
const lat = 0.0144927536231884; const lat = 0.0144927536231884;
const lon = 0.0181818181818182; const lon = 0.0181818181818182;
const distance = 10; console.log(latitude + ' - ' + lat + ' * ' + distance);
const lowerLat = latitude - lat * distance; const lowerLat = latitude - lat * distance;
const lowerLon = longitude - lon * distance; const lowerLon = longitude - lon * distance;
const greaterLat = latitude + lat * distance; const greaterLat = latitude + lat * distance;
const greaterLon = longitude + lon * distance; const greaterLon = longitude + lon * distance;
console.log(lowerLat, lowerLon, greaterLat, greaterLon);
const lesserGeopoint = new firebase.firestore.GeoPoint(lowerLat, lowerLon); const lesserGeopoint = new firebase.firestore.GeoPoint(lowerLat, lowerLon);
const greaterGeopoint = new firebase.firestore.GeoPoint(greaterLat, greaterLon); const greaterGeopoint = new firebase.firestore.GeoPoint(greaterLat, greaterLon);
const addressRef = this.afs.collection('address', ref => ref const addressRef = this.afs.collection('address', ref => ref
...@@ -159,15 +173,30 @@ let AddressService = class AddressService { ...@@ -159,15 +173,30 @@ let AddressService = class AddressService {
defaultVal: item.defaultVal, defaultVal: item.defaultVal,
building: item.building, building: item.building,
landmark: item.landmark, landmark: item.landmark,
addressId: item.addressId addressId: item.addressId,
nearest: true
}; };
this.nearestList.push(address); this.nearestList.push(address);
}); });
this.setAddress();
console.log(this.nearestList); console.log(this.nearestList);
} }
else { else {
// alert('No Orders Found'); // alert('No Orders Found');
} }
if (this.addressList.length > 0 && this.nearestList.length > 0) {
this.addressList.forEach((address) => {
const index = this.nearestList.findIndex(x => x.addressId === address.addressId);
if (index >= 0) {
address.nearest = true;
}
});
}
console.log(this.addressList);
this.addressList = this.addressList.sort((a, b) => {
return b.nearest - a.nearest;
});
console.log(this.addressList);
}); });
} }
else { else {
...@@ -177,6 +206,16 @@ let AddressService = class AddressService { ...@@ -177,6 +206,16 @@ let AddressService = class AddressService {
} }
}); });
} }
setAddress() {
console.log(this.nearestList);
if (this.nearestList.length > 0) {
this.custAddress = this.nearestList.find(x => x.defaultVal === 1);
/* if (!address) {
address = this.nearestList[0];
}
this.custAddress = address; */
}
}
}; };
AddressService = tslib_1.__decorate([ AddressService = tslib_1.__decorate([
Injectable({ Injectable({
......
dist/out-tsc/src/config/auth.service.js
...@@ -18,6 +18,7 @@ let AuthService = class AuthService { ...@@ -18,6 +18,7 @@ let AuthService = class AuthService {
this.googlePlus = googlePlus; this.googlePlus = googlePlus;
this.loader = true; this.loader = true;
this.type = 1; this.type = 1;
this.regState = true;
this.afAuth.authState.subscribe(user => { this.afAuth.authState.subscribe(user => {
console.log('here'); console.log('here');
console.log(user); console.log(user);
...@@ -29,10 +30,12 @@ let AuthService = class AuthService { ...@@ -29,10 +30,12 @@ let AuthService = class AuthService {
this.SetUserData(user); this.SetUserData(user);
this.loader = false; this.loader = false;
if (this.type === 1) { if (this.type === 1) {
this.regState = true;
this.router.navigateByUrl('home', { replaceUrl: true }); this.router.navigateByUrl('home', { replaceUrl: true });
} }
else { else {
this.router.navigateByUrl('verification'); this.regState = false;
this.router.navigateByUrl('verification', { replaceUrl: true });
} }
} }
else { else {
...@@ -86,8 +89,9 @@ let AuthService = class AuthService { ...@@ -86,8 +89,9 @@ let AuthService = class AuthService {
.doc(this.userData.uid) .doc(this.userData.uid)
.update({ otp: '', phoneVerified: true }); .update({ otp: '', phoneVerified: true });
this.service.set('type', 1); this.service.set('type', 1);
this.type = 1;
this.loader = false; this.loader = false;
this.router.navigateByUrl('nearby'); this.router.navigateByUrl('nearby', { replaceUrl: true });
} }
else { else {
this.loader = false; this.loader = false;
...@@ -230,6 +234,10 @@ let AuthService = class AuthService { ...@@ -230,6 +234,10 @@ let AuthService = class AuthService {
this.afAuth.auth this.afAuth.auth
.createUserWithEmailAndPassword(userData.emailId, userData.password) .createUserWithEmailAndPassword(userData.emailId, userData.password)
.then(result => { .then(result => {
result.user.updateProfile({
displayName: userData.name,
photoURL: ''
});
console.log(result.user); console.log(result.user);
this.afAuth.auth.currentUser.sendEmailVerification(); this.afAuth.auth.currentUser.sendEmailVerification();
const currencyData = { const currencyData = {
...@@ -317,17 +325,21 @@ let AuthService = class AuthService { ...@@ -317,17 +325,21 @@ let AuthService = class AuthService {
} }
resetPassword(email) { resetPassword(email) {
this.loader = true; this.loader = true;
this.afAuth.auth.sendPasswordResetEmail(email) this.afAuth.auth
.sendPasswordResetEmail(email)
.then(() => { .then(() => {
this.service.showToast('Password reset mail has been sent your mail Id', 'top', 'my-toast', 2000); this.service.showToast('Password reset mail has been sent your mail Id', 'top', 'my-toast', 2000);
this.loader = false; this.loader = false;
this.router.navigateByUrl('login', { replaceUrl: true }); this.router.navigateByUrl('login', { replaceUrl: true });
}) })
.catch((error) => { .catch(error => {
this.service.showToast(error, 'top', 'my-error', 1000); this.service.showToast(error, 'top', 'my-error', 1000);
this.loader = false; this.loader = false;
}); });
} }
resend() {
this.service.showToast('OTP sent successfully', 'top', 'my-toast', 1000);
}
}; };
AuthService = tslib_1.__decorate([ AuthService = tslib_1.__decorate([
Injectable({ Injectable({
......
dist/out-tsc/src/config/cart.service.js
...@@ -3,26 +3,30 @@ import { Injectable } from '@angular/core'; ...@@ -3,26 +3,30 @@ import { Injectable } from '@angular/core';
import { AngularFirestore } from '@angular/fire/firestore'; import { AngularFirestore } from '@angular/fire/firestore';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ServiceService } from './service.service'; import { ServiceService } from './service.service';
import { AddressService } from './address.service';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
let CartsService = class CartsService { let CartsService = class CartsService {
constructor(afs, router, service) { constructor(afs, router, service, addressService) {
this.afs = afs; this.afs = afs;
this.router = router; this.router = router;
this.service = service; this.service = service;
this.addressService = addressService;
this.carts = []; this.carts = [];
this.custId = ''; this.custId = '';
this.cartCenter = '';
this.carts = []; this.carts = [];
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid; this.custId = data.uid;
// console.log(this.custId); console.log(this.custId);
} }
}); });
} }
buyNow(product) { buyNow(product) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
const promise = new Promise(resolve => {
this.prodId = product.prodId; this.prodId = product.prodId;
const prodRef = firebase const prodRef = firebase
.firestore() .firestore()
...@@ -30,10 +34,12 @@ let CartsService = class CartsService { ...@@ -30,10 +34,12 @@ let CartsService = class CartsService {
.doc(this.prodId); .doc(this.prodId);
this.size = this.size === undefined ? product.size[0] : this.size; this.size = this.size === undefined ? product.size[0] : this.size;
this.color = this.color === undefined ? product.color[0] : this.color; this.color = this.color === undefined ? product.color[0] : this.color;
this.service.get('cartCenter').then((centerData) => { if (this.cartCenter === '' || (this.cartCenter === product.centerId)) {
console.log(centerData); if (this.cartCenter === '') {
if (centerData === null || (centerData === product.centerId)) { this.cartCenter = product.centerId;
this.service.set('cartCenter', product.centerId).then(() => { this.addressService.defaultAddress(this.custId);
this.addressService.getNearBy(this.cartCenter, this.custId, this.service.distance);
}
const cartRef = this.afs.collection('carts', ref => ref const cartRef = this.afs.collection('carts', ref => ref
.where('size', '==', this.size) .where('size', '==', this.size)
.where('color', '==', this.color) .where('color', '==', this.color)
...@@ -59,6 +65,7 @@ let CartsService = class CartsService { ...@@ -59,6 +65,7 @@ let CartsService = class CartsService {
price: product.price, price: product.price,
prodName: product.prodName, prodName: product.prodName,
shopper: product.shopper, shopper: product.shopper,
centerId: product.centerId,
qty: 1, qty: 1,
size: this.size size: this.size
}; };
...@@ -76,9 +83,11 @@ let CartsService = class CartsService { ...@@ -76,9 +83,11 @@ let CartsService = class CartsService {
// console.log('Booking Successfully'); // console.log('Booking Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
}); });
resolve(true);
}) })
.catch(error => { .catch(error => {
console.error('Error adding document: ', error); console.error('Error adding document: ', error);
resolve(false);
}); });
} }
else { else {
...@@ -95,18 +104,21 @@ let CartsService = class CartsService { ...@@ -95,18 +104,21 @@ let CartsService = class CartsService {
// console.log('Booking Successfully'); // console.log('Booking Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
}); });
resolve(true);
} }
}); });
});
} }
else { else {
this.service.showToast('Your cart is not empty', 'top', 'my-error', 2000); this.service.showToast('Your cart is not empty', 'top', 'my-error', 2000);
resolve(false);
} }
}); });
return promise;
}); });
} }
cartList() { cartList(custId) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
this.custId = custId;
console.log('called'); console.log('called');
const cartRef = this.afs.collection('carts', ref => ref.where('custId', '==', this.custId)); const cartRef = this.afs.collection('carts', ref => ref.where('custId', '==', this.custId));
cartRef.valueChanges().subscribe(value => { cartRef.valueChanges().subscribe(value => {
...@@ -114,6 +126,11 @@ let CartsService = class CartsService { ...@@ -114,6 +126,11 @@ let CartsService = class CartsService {
const res = value; const res = value;
this.cartTotal = 0; this.cartTotal = 0;
if (res.length > 0) { if (res.length > 0) {
if (this.cartCenter === '') {
this.cartCenter = res[0].centerId;
this.addressService.defaultAddress(this.custId);
this.addressService.getNearBy(this.cartCenter, this.custId, this.service.distance);
}
res.forEach(item => { res.forEach(item => {
const cartItem = { const cartItem = {
cartId: item.cartId, cartId: item.cartId,
...@@ -144,7 +161,7 @@ let CartsService = class CartsService { ...@@ -144,7 +161,7 @@ let CartsService = class CartsService {
}); });
} }
else { else {
this.service.remove('cartCenter'); this.cartCenter = '';
// alert('No Products Found'); // alert('No Products Found');
} }
}); });
...@@ -200,7 +217,8 @@ CartsService = tslib_1.__decorate([ ...@@ -200,7 +217,8 @@ CartsService = tslib_1.__decorate([
}), }),
tslib_1.__metadata("design:paramtypes", [AngularFirestore, tslib_1.__metadata("design:paramtypes", [AngularFirestore,
Router, Router,
ServiceService]) ServiceService,
AddressService])
], CartsService); ], CartsService);
export { CartsService }; export { CartsService };
//# sourceMappingURL=cart.service.js.map //# sourceMappingURL=cart.service.js.map
\ No newline at end of file
dist/out-tsc/src/config/center.service.js
import * as tslib_1 from "tslib"; import * as tslib_1 from "tslib";
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AngularFirestore } from '@angular/fire/firestore'; import { AngularFirestore } from '@angular/fire/firestore';
import { ServiceService } from './service.service';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
let CenterService = class CenterService { let CenterService = class CenterService {
constructor(afs) { constructor(afs, service) {
this.afs = afs; this.afs = afs;
this.service = service;
this.centers = []; this.centers = [];
this.nearcenters = []; this.nearcenters = [];
console.log(this.service.distance);
this.centerList(); this.centerList();
this.getNearBy(10.0159, 76.3419, 10); this.getNearBy(10.0159, 76.3419, this.service.distance);
} }
centerList() { centerList() {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
...@@ -46,6 +49,7 @@ let CenterService = class CenterService { ...@@ -46,6 +49,7 @@ let CenterService = class CenterService {
} }
getNearBy(latitude, longitude, distance) { getNearBy(latitude, longitude, distance) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
console.log(distance);
const This = this; const This = this;
const state = true; const state = true;
const lat = 0.0144927536231884; const lat = 0.0144927536231884;
...@@ -94,7 +98,7 @@ CenterService = tslib_1.__decorate([ ...@@ -94,7 +98,7 @@ CenterService = tslib_1.__decorate([
Injectable({ Injectable({
providedIn: 'root' providedIn: 'root'
}), }),
tslib_1.__metadata("design:paramtypes", [AngularFirestore]) tslib_1.__metadata("design:paramtypes", [AngularFirestore, ServiceService])
], CenterService); ], CenterService);
export { CenterService }; export { CenterService };
//# sourceMappingURL=center.service.js.map //# sourceMappingURL=center.service.js.map
\ No newline at end of file
dist/out-tsc/src/config/center.service.js.map
{"version":3,"file":"center.service.js","sourceRoot":"","sources":["../../../../src/config/center.service.ts"],"names":[],"mappings":"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"} {"version":3,"file":"center.service.js","sourceRoot":"","sources":["../../../../src/config/center.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/config/myorder.service.js
...@@ -89,7 +89,7 @@ let MyordersService = class MyordersService { ...@@ -89,7 +89,7 @@ let MyordersService = class MyordersService {
this.orders = []; this.orders = [];
const orderRef = this.afs.collection('orders', ref => ref.where('custId', '==', custId).orderBy('orderDate', 'desc')); const orderRef = this.afs.collection('orders', ref => ref.where('custId', '==', custId).orderBy('orderDate', 'desc'));
orderRef.stateChanges().subscribe(value => { orderRef.stateChanges().subscribe(value => {
// console.log(value); console.log(value);
const res = value; const res = value;
// console.log(res); // console.log(res);
if (res.length > 0) { if (res.length > 0) {
...@@ -111,7 +111,7 @@ let MyordersService = class MyordersService { ...@@ -111,7 +111,7 @@ let MyordersService = class MyordersService {
orderId: item.orderId, orderId: item.orderId,
orderCode: item.orderCode, orderCode: item.orderCode,
product: this.service.key2Array(item.product), product: this.service.key2Array(item.product),
time: '60' time: item.timeRemain
}; };
// console.log(order); // console.log(order);
if (items.type === 'added') { if (items.type === 'added') {
...@@ -219,7 +219,7 @@ let MyordersService = class MyordersService { ...@@ -219,7 +219,7 @@ let MyordersService = class MyordersService {
const This = this; const This = this;
const lat = 0.0144927536231884; const lat = 0.0144927536231884;
const lon = 0.0181818181818182; const lon = 0.0181818181818182;
const distance = 10; const distance = this.service.distance;
const lowerLat = latitude - lat * distance; const lowerLat = latitude - lat * distance;
const lowerLon = longitude - lon * distance; const lowerLon = longitude - lon * distance;
const greaterLat = latitude + lat * distance; const greaterLat = latitude + lat * distance;
......
dist/out-tsc/src/config/myorder.service.js.map
{"version":3,"file":"myorder.service.js","sourceRoot":"","sources":["../../../../src/config/myorder.service.ts"],"names":[],"mappings":"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"} {"version":3,"file":"myorder.service.js","sourceRoot":"","sources":["../../../../src/config/myorder.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/config/order.service.js
...@@ -3,13 +3,15 @@ import { Injectable } from '@angular/core'; ...@@ -3,13 +3,15 @@ import { Injectable } from '@angular/core';
import { AngularFirestore } from '@angular/fire/firestore'; import { AngularFirestore } from '@angular/fire/firestore';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ServiceService } from './service.service'; import { ServiceService } from './service.service';
import { SubjectService } from './subject.service';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
let OrdersService = class OrdersService { let OrdersService = class OrdersService {
constructor(afs, router, service) { constructor(afs, router, service, subject) {
this.afs = afs; this.afs = afs;
this.router = router; this.router = router;
this.service = service; this.service = service;
this.subject = subject;
this.checkout = new BehaviorSubject(false); this.checkout = new BehaviorSubject(false);
this.size = 'small'; this.size = 'small';
this.color = 'Blue'; this.color = 'Blue';
...@@ -20,6 +22,8 @@ let OrdersService = class OrdersService { ...@@ -20,6 +22,8 @@ let OrdersService = class OrdersService {
this.users = data; this.users = data;
console.log(this.users); console.log(this.users);
this.custId = data.uid; this.custId = data.uid;
this.email = data.emailId;
this.displayName = data.name;
// console.log(this.custId); // console.log(this.custId);
} }
else { else {
...@@ -88,7 +92,7 @@ let OrdersService = class OrdersService { ...@@ -88,7 +92,7 @@ let OrdersService = class OrdersService {
}); });
}*/ }*/
checkOut(cart, otherCharge) { checkOut(cart, otherCharge, centerLoc) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
// console.log(cart); // console.log(cart);
// console.log(this.users); // console.log(this.users);
...@@ -110,12 +114,12 @@ let OrdersService = class OrdersService { ...@@ -110,12 +114,12 @@ let OrdersService = class OrdersService {
cartGroup[items.shopperId].push(items); cartGroup[items.shopperId].push(items);
}); });
this.cartCount = distinctShops.length; this.cartCount = distinctShops.length;
const timer = ((this.cartCount - 1) * 20) + 60;
// console.log(cartGroup); // console.log(cartGroup);
// console.log(cartCount); // console.log(cartCount);
const promise = new Promise(resolve => { const promise = new Promise(resolve => {
distinctShops.forEach(item => { distinctShops.forEach(item => {
console.log(item); const pickup = new firebase.firestore.GeoPoint(centerLoc.latLng.latitude, centerLoc.latLng.longitude);
const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
const products = {}; const products = {};
const cartItem = cartGroup[item]; const cartItem = cartGroup[item];
let prodPrice = 0; let prodPrice = 0;
...@@ -138,36 +142,41 @@ let OrdersService = class OrdersService { ...@@ -138,36 +142,41 @@ let OrdersService = class OrdersService {
const product = cartItem[0]; const product = cartItem[0];
this.custId = this.custId.trim(); this.custId = this.custId.trim();
const orderItem = { const orderItem = {
amount: 'A$ ' + otherCharge.totalAmt, amount: 'A$ ' + otherCharge.totalAmt.toFixed(2),
customer: firebase.firestore().doc('/customer/' + this.custId), customer: firebase.firestore().doc('/customer/' + this.custId),
shopper: product.shopper, shopper: product.shopper,
deliveryAddress: otherCharge.custAddress, deliveryAddress: otherCharge.custAddress,
deliveryCharge: 'A$ ' + otherCharge.deliveryCharge, deliveryCharge: 'A$ ' + otherCharge.deliveryCharge.toFixed(2),
deliveryLocation: otherCharge.custAddress.latLng, deliveryLocation: otherCharge.custAddress.latLng,
bookDate: firebase.firestore.FieldValue.serverTimestamp(), bookDate: firebase.firestore.FieldValue.serverTimestamp(),
orderDate: Math.floor(Date.now() / 1000), orderDate: Math.floor(Date.now() / 1000),
orderCode: this.orderCode(), orderCode: this.orderCode(),
orderId: '', orderId: '',
orderStatus: 1, orderStatus: 1,
pickupAddress: '', pickupAddress: centerLoc.location,
pickupLocation: pickup, pickupLocation: pickup,
center: firebase
.firestore()
.doc('/riders/qbTKza18mWVzYG9NLIbmjMbrYjG2'),
promoId: null, promoId: null,
rider: firebase rider: firebase
.firestore() .firestore()
.doc('/riders/qbTKza18mWVzYG9NLIbmjMbrYjG2'), .doc('/centers/' + centerLoc.cId),
status: 1, status: 1,
custId: this.custId, custId: this.custId,
riderId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2', riderId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2',
shopperId: product.shopperId, shopperId: product.shopperId,
custName: 'Customer', email: this.email,
custName: this.displayName,
riderName: 'John', riderName: 'John',
shopperState: 0, shopperState: 0,
paymentMethod: otherCharge.paymentMethod, paymentMethod: otherCharge.paymentMethod,
shopperName: '', shopperName: '',
product: products, product: products,
discount: 'A$ ' + otherCharge.discount, timeRemain: timer,
discount: 'A$ ' + otherCharge.discount.toFixed(2),
promoApplied: otherCharge.discountApplied, promoApplied: otherCharge.discountApplied,
tax: 'A$ ' + otherCharge.taxAmount tax: 'A$ ' + otherCharge.taxAmount.toFixed(2)
}; };
// console.log(orderItem); // console.log(orderItem);
this.afs this.afs
...@@ -182,7 +191,6 @@ let OrdersService = class OrdersService { ...@@ -182,7 +191,6 @@ let OrdersService = class OrdersService {
.then(() => { .then(() => {
// console.log('Booking Successfully'); // console.log('Booking Successfully');
// this.router.navigateByUrl('cart'); // this.router.navigateByUrl('cart');
this.service.remove('cartCenter');
resolve('Cart to Order Successfully'); resolve('Cart to Order Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
}); });
...@@ -228,7 +236,8 @@ OrdersService = tslib_1.__decorate([ ...@@ -228,7 +236,8 @@ OrdersService = tslib_1.__decorate([
}), }),
tslib_1.__metadata("design:paramtypes", [AngularFirestore, tslib_1.__metadata("design:paramtypes", [AngularFirestore,
Router, Router,
ServiceService]) ServiceService,
SubjectService])
], OrdersService); ], OrdersService);
export { OrdersService }; export { OrdersService };
//# sourceMappingURL=order.service.js.map //# sourceMappingURL=order.service.js.map
\ No newline at end of file
dist/out-tsc/src/config/products.service.js
...@@ -12,9 +12,10 @@ let ProductsService = class ProductsService { ...@@ -12,9 +12,10 @@ let ProductsService = class ProductsService {
this.product = []; this.product = [];
this.fav = []; this.fav = [];
this.prodSlideImg = []; this.prodSlideImg = [];
this.service.get('user').then(data => { this.service.get('userData').then(data => {
this.user = JSON.parse(data); this.user = JSON.parse(data);
this.getFavlist(this.user.uid); console.log(this.user);
// this.getFavlist(this.user.uid);
}); });
} }
// Fetches images for slide // Fetches images for slide
...@@ -239,13 +240,13 @@ let ProductsService = class ProductsService { ...@@ -239,13 +240,13 @@ let ProductsService = class ProductsService {
}); });
}); });
} }
changeFav(index, type) { changeFav(index, type, custId) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
// console.log(index, type, this.user.uid); console.log(index, type, custId);
if (type === 'no') { if (type === 'no') {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.valueChanges() .valueChanges()
.pipe(take(1) // Here you can limit to only emit once, using the take operator .pipe(take(1) // Here you can limit to only emit once, using the take operator
) )
...@@ -253,7 +254,7 @@ let ProductsService = class ProductsService { ...@@ -253,7 +254,7 @@ let ProductsService = class ProductsService {
if (value === undefined) { if (value === undefined) {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set({ .set({
[index]: true [index]: true
}); });
...@@ -264,7 +265,7 @@ let ProductsService = class ProductsService { ...@@ -264,7 +265,7 @@ let ProductsService = class ProductsService {
// console.log(value); // console.log(value);
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set(value); .set(value);
} }
}); });
...@@ -272,7 +273,7 @@ let ProductsService = class ProductsService { ...@@ -272,7 +273,7 @@ let ProductsService = class ProductsService {
else { else {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.valueChanges() .valueChanges()
.pipe(take(1) // Here you can limit to only emit once, using the take operator .pipe(take(1) // Here you can limit to only emit once, using the take operator
) )
...@@ -284,7 +285,7 @@ let ProductsService = class ProductsService { ...@@ -284,7 +285,7 @@ let ProductsService = class ProductsService {
// console.log(value); // console.log(value);
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set(value); .set(value);
} }
else { else {
......
dist/out-tsc/src/config/service.service.js
...@@ -2,11 +2,23 @@ import * as tslib_1 from "tslib"; ...@@ -2,11 +2,23 @@ import * as tslib_1 from "tslib";
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { ToastController } from '@ionic/angular'; import { ToastController } from '@ionic/angular';
import * as firebase from 'firebase';
let ServiceService = class ServiceService { let ServiceService = class ServiceService {
constructor(storage, toastController) { constructor(storage, toastController) {
this.storage = storage; this.storage = storage;
this.toastController = toastController; this.toastController = toastController;
this.state = true; this.state = true;
this.distance = 10;
this.storage.ready().then(() => {
this.get('user');
});
this.setting().then((data) => {
if (data) {
this.distance = data;
}
}).catch(err => {
this.distance = 10;
});
} }
set(settingName, value) { set(settingName, value) {
return this.storage.set(`setting:${settingName}`, value); return this.storage.set(`setting:${settingName}`, value);
...@@ -68,6 +80,39 @@ let ServiceService = class ServiceService { ...@@ -68,6 +80,39 @@ let ServiceService = class ServiceService {
formatNumber(num) { formatNumber(num) {
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,'); return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
} }
setting() {
const promise = new Promise(resolve => {
const prodRef = firebase
.firestore()
.collection('setting')
.doc('basic').onSnapshot(doc => {
console.log(doc.data());
if (doc.exists) {
const data = doc.data();
this.distance = data.distance;
resolve(this.distance);
}
});
});
return promise;
}
getBase64ImageFromUrl(imageUrl) {
return tslib_1.__awaiter(this, void 0, void 0, function* () {
const proxyUrl = 'https://cors-anywhere.herokuapp.com/';
const res = yield fetch(proxyUrl + imageUrl);
const blob = yield res.blob();
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.addEventListener('load', () => {
resolve(reader.result);
}, false);
reader.onerror = () => {
return reject(this);
};
reader.readAsDataURL(blob);
});
});
}
}; };
ServiceService = tslib_1.__decorate([ ServiceService = tslib_1.__decorate([
Injectable({ Injectable({
......
dist/out-tsc/src/config/service.service.js.map
{"version":3,"file":"service.service.js","sourceRoot":"","sources":["../../../../src/config/service.service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKjD,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGzB,YACS,OAAgB,EAChB,eAAgC;QADhC,YAAO,GAAP,OAAO,CAAS;QAChB,oBAAe,GAAf,eAAe,CAAiB;QAEvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAEM,GAAG,CAAC,WAAmB,EAAE,KAAU;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEY,GAAG,CAAC,WAAmB;;YAClC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;QAC1D,CAAC;KAAA;IAEY,MAAM,CAAC,WAAmB;;YACrC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;QAC7D,CAAC;KAAA;IAEM,KAAK;QACV,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC7B,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,SAAS,CAAC,IAAY;QAC3B,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC5B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aAC1B;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,QAAQ,CAAC,IAAY;QAC1B,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC5B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;QACnD,IAAI;YACF,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/C,IAAI,CAAC,eAAe;qBACjB,MAAM,CAAC;oBACN,OAAO,EAAE,GAAG;oBACZ,QAAQ,EAAE,SAAS;oBACnB,QAAQ,EAAE,SAAS;oBACnB,QAAQ,EAAE,SAAS;iBACpB,CAAC;qBACD,IAAI,CAAC,GAAG,CAAC,EAAE;oBACV,GAAG,CAAC,OAAO,EAAE,CAAC;oBACd,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC;SAChC;IACH,CAAC;IAED,YAAY,CAAC,GAAW;QACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;IACjE,CAAC;CACF,CAAA;AAxEY,cAAc;IAH1B,UAAU,CAAC;QACV,UAAU,EAAE,MAAM;KACnB,CAAC;6CAKkB,OAAO;QACC,eAAe;GAL9B,cAAc,CAwE1B;SAxEY,cAAc"} {"version":3,"file":"service.service.js","sourceRoot":"","sources":["../../../../src/config/service.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
dist/out-tsc/src/config/shopper.service.js
...@@ -2,16 +2,18 @@ import * as tslib_1 from "tslib"; ...@@ -2,16 +2,18 @@ import * as tslib_1 from "tslib";
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AngularFireAuth } from '@angular/fire/auth'; import { AngularFireAuth } from '@angular/fire/auth';
import { AngularFirestore } from '@angular/fire/firestore'; import { AngularFirestore } from '@angular/fire/firestore';
import { ServiceService } from './service.service';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
let ShoppersService = class ShoppersService { let ShoppersService = class ShoppersService {
constructor(afs, afAuth) { constructor(afs, afAuth, service) {
this.afs = afs; this.afs = afs;
this.afAuth = afAuth; this.afAuth = afAuth;
this.service = service;
this.shoppers = []; this.shoppers = [];
this.activeshoppers = []; this.activeshoppers = [];
this.nearshoppers = []; this.nearshoppers = [];
this.featuredshopperList(); this.featuredshopperList();
this.getNearBy(10.0159, 76.3419, 10); this.getNearBy(-33.87276, 151.20534, this.service.distance);
} }
shopperList(centerId, type) { shopperList(centerId, type) {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
...@@ -53,6 +55,130 @@ let ShoppersService = class ShoppersService { ...@@ -53,6 +55,130 @@ let ShoppersService = class ShoppersService {
}); });
}); });
} }
categoryShopperList(catId = null) {
return tslib_1.__awaiter(this, void 0, void 0, function* () {
const This = this;
const state = true;
this.shoppers = [];
const itemsFound = {};
console.log(this.shoppers);
const catRef = this.afs.collection('shopcategories').doc(catId).get().subscribe((data) => {
this.shoppers = [];
console.log(data.data());
const shoppeerList = [];
const shoppers = data.data();
if (shoppers && Object.keys(shoppers).length > 0) {
Object.keys(shoppers)
.forEach(function eachKey(key) {
shoppeerList.push(key);
});
if (shoppeerList.length > 0) {
const counter = Math.ceil(shoppeerList.length / 10);
for (let i = 0; i < counter; i++) {
const shopItems = [];
for (let j = 0; j < 10; j++) {
const k = j + (i * 10);
if (shoppeerList.length > k) {
shopItems.push(shoppeerList[k]);
}
else {
break;
}
}
console.log(shopItems);
const orderRef = this.afs.collection('shoppers', ref => ref.where('uid', 'in', shopItems).where('status', '==', state).orderBy('name', 'asc'));
/* this.documentosCol = this.afs.collection('shoppers', ref => ref.where('pagada', 'in', [true, false]));*/
orderRef.valueChanges().subscribe(value => {
console.log(value);
const res = value;
if (res.length > 0) {
res.forEach(item => {
// console.log(item);
const shopper = {
name: item.name,
emailId: item.emailId,
phone: item.phone,
uid: item.uid,
profilePhoto: item.profilePic,
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
caption: item.caption,
centre: item.centre,
location: item.location,
rate: item.rate,
centerId: item.centerId
};
if (!itemsFound[shopper.uid]) {
this.shoppers.push(shopper);
itemsFound[shopper.uid] = true;
}
});
}
else {
// alert('No Orders Found');
}
});
}
}
}
else {
this.shoppers = [];
this.shoppers.length = 0;
}
});
/* .then(doc => {
if (!doc.exists) {
console.log('No such document!');
} else {
console.log('Document data:', doc.data());
}
})
.catch(err => {
console.log('Error getting document', err);
}); */
/*const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
'shoppers',
ref => ref.where(type, '==', centerId).where('status', '==', state).orderBy('name', 'asc')
);
orderRef.valueChanges().subscribe(value => {
this.shoppers = [];
const res = value;
if (res.length > 0) {
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
phone: item.phone,
uid: item.uid,
profilePhoto: item.profilePic,
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
caption: item.caption,
centre: item.centre,
location: item.location,
rate: item.rate,
centerId: item.centerId
};
this.shoppers.push(shopper);
});
// console.log(this.shoppers);
} else {
// alert('No Orders Found');
}
});*/
});
}
featuredshopperList() { featuredshopperList() {
return tslib_1.__awaiter(this, void 0, void 0, function* () { return tslib_1.__awaiter(this, void 0, void 0, function* () {
const This = this; const This = this;
...@@ -149,7 +275,9 @@ ShoppersService = tslib_1.__decorate([ ...@@ -149,7 +275,9 @@ ShoppersService = tslib_1.__decorate([
Injectable({ Injectable({
providedIn: 'root' providedIn: 'root'
}), }),
tslib_1.__metadata("design:paramtypes", [AngularFirestore, AngularFireAuth]) tslib_1.__metadata("design:paramtypes", [AngularFirestore,
AngularFireAuth,
ServiceService])
], ShoppersService); ], ShoppersService);
export { ShoppersService }; export { ShoppersService };
//# sourceMappingURL=shopper.service.js.map //# sourceMappingURL=shopper.service.js.map
\ No newline at end of file
src/app/app.component.ts
...@@ -240,11 +240,13 @@ export class AppComponent { ...@@ -240,11 +240,13 @@ export class AppComponent {
if (data.orderStatus === 7) { if (data.orderStatus === 7) {
this.finishpop(data); this.finishpop(data);
} else { } else {
//if (data.orderStatus !== 1) {
this.orderId = data.orderCode; this.orderId = data.orderCode;
this.isShow = true; this.isShow = true;
setTimeout(() => { setTimeout(() => {
this.isShow = false; this.isShow = false;
}, 3000); }, 3000);
//}
} }
} }
}); });
......
src/app/cart/cart.page.html
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<ul *ngIf="addressService.addressList && addressService.addressList.length > 0"> <ul *ngIf="addressService.addressList && addressService.addressList.length > 0">
<li *ngFor="let address of addressService.addressList; let i = index" [ngClass]="{'no-devlivery': !address.nearest}"> <li *ngFor="let address of addressService.addressList; let i = index" [ngClass]="{'no-devlivery': !address.nearest}">
<h4 *ngIf="address.nearest === true">DELIVERS TO</h4> <h4 *ngIf="address.nearest === true">DELIVERS TO</h4>
<h4 *ngIf="address.nearest === false">NO DELIVERS TO</h4> <h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4>
<div class="floatLeft"> <div class="floatLeft">
{{address.default}} {{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" /> <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
......
src/app/changeaddress/changeaddress.module.ts
...@@ -23,10 +23,11 @@ const routes: Routes = [ ...@@ -23,10 +23,11 @@ const routes: Routes = [
IonicModule, IonicModule,
AgmDirectionModule, AgmDirectionModule,
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: 'AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE' apiKey: 'AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE',
libraries: ['geometry']
}), }),
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
declarations: [ChangeaddressPage] declarations: [ChangeaddressPage]
}) })
export class ChangeaddressPageModule {} export class ChangeaddressPageModule { }
src/app/changeaddress/changeaddress.page.html
...@@ -20,20 +20,25 @@ ...@@ -20,20 +20,25 @@
<ion-content> <ion-content>
<div class="nearby_map"> <div class="nearby_map">
<div class="map-inner"> <div class="map-inner">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'"> <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8"
[backgroundColor]="'rgba(29, 27, 130,0.2)'" (mapReady)="mapReady($event)"
(centerChange)="centerChange($event)">
<agm-marker [markerDraggable]="true" (dragEnd)="markerDragEnd($event)"></agm-marker> <agm-marker [markerDraggable]="true" (dragEnd)="markerDragEnd($event)"></agm-marker>
</agm-map> </agm-map>
<span class="map-pin"><img src="../../assets/pin.svg" alt=""></span> <span class="map-pin"><img src="../../assets/pin.svg" alt=""></span>
</div> </div>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal"> <form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post"
class="form-horizontal">
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5>DELIVERY</h5> <h5>DELIVERY</h5>
<p>{{address}}</p> <p>{{address}}</p>
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required placeholder="House No./ Building No" /> <input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required
placeholder="House No./ Building No" />
<div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start"> <div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
Building Name is required Building Name is required
</div> </div>
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required placeholder="Landmark" /> <input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required
placeholder="Landmark" />
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start"> <div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
Landmark is required Landmark is required
</div> </div>
...@@ -41,24 +46,31 @@ ...@@ -41,24 +46,31 @@
<ion-row> <ion-row>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required /> <input class="styled-checkbox" id="styled-check-1" type="radio" value="Home"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-1"><span>Home</span></label> <label for="styled-check-1"><span>Home</span></label>
</h6> </h6>
</ion-col> </ion-col>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required /> <input class="styled-checkbox" id="styled-check-2" type="radio" value="Work"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-2"><span>Office</span></label> <label for="styled-check-2"><span>Office</span></label>
</h6> </h6>
</ion-col> </ion-col>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required /> <input class="styled-checkbox" id="styled-check-3" type="radio" value="Other"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-3"><span>Others</span></label> <label for="styled-check-3"><span>Others</span></label>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" class="ion-padding-start"> <div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine"
class="ion-padding-start">
Address Type is required Address Type is required
</div> </div>
</ion-grid> </ion-grid>
......
src/app/changeaddress/changeaddress.page.ts
...@@ -36,6 +36,8 @@ export class ChangeaddressPage implements OnInit { ...@@ -36,6 +36,8 @@ export class ChangeaddressPage implements OnInit {
addressValid: any; addressValid: any;
lat: any; lat: any;
lng: any; lng: any;
newCenterLat: number;
newCenterLng: number;
public searchElementRef: ElementRef; public searchElementRef: ElementRef;
constructor( constructor(
...@@ -88,6 +90,19 @@ export class ChangeaddressPage implements OnInit { ...@@ -88,6 +90,19 @@ export class ChangeaddressPage implements OnInit {
} }
} }
mapReady(map) {
map.addListener('dragend', () => {
console.log(this.newCenterLat, this.newCenterLng);
this.getAddress(this.latitude, this.longitude);
});
}
centerChange(e) {
console.log(e);
this.newCenterLat = e.lat;
this.newCenterLng = e.lng;
this.getAddress(this.newCenterLat, this.newCenterLng);
}
markerDragEnd($event: MouseEvent) { markerDragEnd($event: MouseEvent) {
console.log($event); console.log($event);
this.latitude = $event.coords.lat; this.latitude = $event.coords.lat;
...@@ -126,7 +141,7 @@ export class ChangeaddressPage implements OnInit { ...@@ -126,7 +141,7 @@ export class ChangeaddressPage implements OnInit {
window.alert('No results found'); window.alert('No results found');
} }
} else { } else {
window.alert('Geocoder failed due to: ' + status); //window.alert('Geocoder failed due to: ' + status);
} }
} }
); );
...@@ -143,30 +158,44 @@ export class ChangeaddressPage implements OnInit { ...@@ -143,30 +158,44 @@ export class ChangeaddressPage implements OnInit {
onSubmit(data: any) { onSubmit(data: any) {
this.loader = true; this.loader = true;
this.service.get('orderId').then((orderId) => { this.service.get('order').then(val => {
console.log(val);
const This = this;
console.log(This.latitude, This.longitude, val.pickupLocation.O, val.pickupLocation.F);
setTimeout(() => {
// tslint:disable-next-line:max-line-length
const distanceNew = google.maps.geometry.spherical.computeDistanceBetween(new google.maps.LatLng(This.newCenterLat, This.newCenterLng), new google.maps.LatLng(val.pickupLocation.O, val.pickupLocation.F));
const distanceKM = (distanceNew / 1000).toFixed(2);
if (distanceKM < This.service.distance) {
const orderId = val.orderId;
const postData: Address = { const postData: Address = {
address: this.address, address: This.address,
addressType: data.addressType, addressType: data.addressType,
building: data.building, building: data.building,
landmark: data.landmark, landmark: data.landmark,
defaultVal: 0, defaultVal: 0,
uid: this.uid, uid: This.uid,
latLng: new firebase.firestore.GeoPoint(this.latitude, this.longitude), latLng: new firebase.firestore.GeoPoint(This.newCenterLat, This.newCenterLng),
status: true status: true
}; };
console.log(postData, orderId); console.log(postData, orderId);
this.addressService.changeAddress(postData, orderId); This.addressService.changeAddress(postData, orderId);
this.service.get('order').then(val => {
val.deliveryAddress = postData; val.deliveryAddress = postData;
this.service.set('order', val); This.service.set('order', val);
}); This.successState = true;
this.successState = true;
setTimeout(() => { setTimeout(() => {
this.loader = false; This.loader = false;
this.successState = false; This.successState = false;
this.goBack(); This.goBack();
}, 3000); }, 3000);
} else {
This.loader = false;
This.service.showToast('Does not delivered to choosed location', 'top', 'my-error', 2000);
}
}, 1000);
}); });
} }
} }
......
src/app/home/home.module.ts
...@@ -27,10 +27,11 @@ const routes: Routes = [ ...@@ -27,10 +27,11 @@ const routes: Routes = [
IonicModule, IonicModule,
AgmDirectionModule, AgmDirectionModule,
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: 'AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE' apiKey: 'AIzaSyBnCzDk6ec1OJFcW5FYgxP3LWVHMNumGDM'
}), }),
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
declarations: [HomePage] declarations: [HomePage]
}) })
export class HomePageModule {} export class HomePageModule { }
// AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE
\ No newline at end of file
src/app/home/home.page.ts
...@@ -67,21 +67,34 @@ export class HomePage implements OnInit { ...@@ -67,21 +67,34 @@ export class HomePage implements OnInit {
) { ) {
this.loader = false; this.loader = false;
this.address = 'Pick your Location'; this.address = 'Pick your Location';
}
ngOnInit() {
this.mapsAPILoader.load().then(() => {
this.setCurrentLocation();
this.geoCoder = new google.maps.Geocoder();
});
this.menuCtrl.enable(true);
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid; this.custId = data.uid;
this.addressService.addList(data.uid); this.addressService.addList(data.uid);
this.subjectService.getAddressStateData().subscribe((state) => {
console.log(state);
this.addressService.defaultAddress(data.uid).then((addressData) => {
console.log(this.addressService.defaultAdd);
const latLng = this.addressService.defaultAdd.latLng;
// tslint:disable-next-line:max-line-length
this.centerService.getNearBy(latLng.latitude, latLng.longitude, this.service.distance);
this.getAddress(latLng.latitude, latLng.longitude);
});
});
} }
}); });
}
ngOnInit() {
this.mapsAPILoader.load().then(() => {
this.setCurrentLocation();
this.geoCoder = new google.maps.Geocoder();
});
this.menuCtrl.enable(true);
} }
private setCurrentLocation() { private setCurrentLocation() {
...@@ -97,6 +110,7 @@ export class HomePage implements OnInit { ...@@ -97,6 +110,7 @@ export class HomePage implements OnInit {
} }
getAddress(latitude, longitude) { getAddress(latitude, longitude) {
console.log(latitude, longitude);
this.geoCoder.geocode( this.geoCoder.geocode(
{ location: { lat: latitude, lng: longitude } }, { location: { lat: latitude, lng: longitude } },
(results, status) => { (results, status) => {
......
src/app/nearby/nearby.module.ts
...@@ -23,7 +23,7 @@ const routes: Routes = [ ...@@ -23,7 +23,7 @@ const routes: Routes = [
IonicModule, IonicModule,
AgmDirectionModule, AgmDirectionModule,
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: 'AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE' apiKey: 'AIzaSyBnCzDk6ec1OJFcW5FYgxP3LWVHMNumGDM'
}), }),
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
......
src/app/nearby/nearby.page.ts
...@@ -149,7 +149,7 @@ export class NearbyPage implements OnInit { ...@@ -149,7 +149,7 @@ export class NearbyPage implements OnInit {
landmark: data.landmark, landmark: data.landmark,
defaultVal: 0, defaultVal: 0,
uid: this.uid, uid: this.uid,
latLng: new firebase.firestore.GeoPoint(this.latitude, this.longitude), latLng: new firebase.firestore.GeoPoint(this.newCenterLat, this.newCenterLng),
status: true status: true
}; };
this.addressService.addressCreate(postData); this.addressService.addressCreate(postData);
......
src/app/orderplaced/orderplaced.page.html
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
<ul> <ul>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('productlist')">
<div class="nearby_image"> <div class="nearby_image">
<img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" /> <img [src]="data.product[0].image"
onerror="this.src='../assets/[email protected]'" />
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
...@@ -91,9 +92,10 @@ ...@@ -91,9 +92,10 @@
</h6> </h6>
<h5>Quantity : <span>{{product.qty}}</span></h5> <h5>Quantity : <span>{{product.qty}}</span></h5>
<h5> <h5>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span> Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span
class="afterpay">{{data.paymentMode}}</span>
</h5> </h5>
<h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7"> <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7">
Delivery time : <span>{{deliveryTime}}</span> Delivery time : <span>{{deliveryTime}}</span>
</h5> </h5>
<h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5> <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5>
...@@ -103,7 +105,8 @@ ...@@ -103,7 +105,8 @@
<div class="delivery-wrap"> <div class="delivery-wrap">
<h4 class="floatLeft">DELIVERY</h4> <h4 class="floatLeft">DELIVERY</h4>
<span class="floatRight" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img <span class="floatRight"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span> class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span>
<div class="clear"></div> <div class="clear"></div>
...@@ -113,7 +116,8 @@ ...@@ -113,7 +116,8 @@
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}} <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
</h5> </h5>
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"> <button class="cancel_btn" (click)="cancelOrder(data.orderId)"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER CANCEL THIS ORDER
</button> </button>
<!-- <hr /> --> <!-- <hr /> -->
......
src/app/orderplaced/orderplaced.page.ts
...@@ -32,12 +32,14 @@ export class OrderplacedPage implements OnInit { ...@@ -32,12 +32,14 @@ export class OrderplacedPage implements OnInit {
}; };
ionViewWillEnter() { ionViewWillEnter() {
this.deliveryTime = ''; this.deliveryTime = '00:00:00';
this.service.get('order').then(val => { this.service.get('order').then(val => {
console.log(val); console.log(val);
this.data = val; this.data = val;
const This = this;
console.log(Math.round(Date.now() / 1000) + ' < ' + this.data.bookDate.seconds);
this.timeinterval = setInterval(() => { this.timeinterval = setInterval(() => {
this.getDeliveryTime(this.data.bookDate.seconds, this.data.time); This.getDeliveryTime(this.data.bookDate.seconds, this.data.time);
}, 1000); }, 1000);
}); });
} }
...@@ -48,9 +50,10 @@ export class OrderplacedPage implements OnInit { ...@@ -48,9 +50,10 @@ export class OrderplacedPage implements OnInit {
} }
getDeliveryTime(timeStamp, minute) { getDeliveryTime(timeStamp, minute) {
console.log(timeStamp, minute);
let endDate = new Date(timeStamp * 1000); let endDate = new Date(timeStamp * 1000);
endDate = new Date(endDate.getTime() + minute * 60000); endDate = new Date(endDate.getTime() + minute * 60000);
if (Math.round(Date.now() / 1000) < Math.round(endDate.getTime() / 1000)) {
// console.log(endDate); // console.log(endDate);
const t = this.getTimeRemaining(endDate, new Date()); const t = this.getTimeRemaining(endDate, new Date());
const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes; const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;
...@@ -62,9 +65,10 @@ export class OrderplacedPage implements OnInit { ...@@ -62,9 +65,10 @@ export class OrderplacedPage implements OnInit {
} }
} }
}
getTimeRemaining(endtime, currDate) { getTimeRemaining(endtime, currDate) {
const t = Date.parse(endtime) - Date.parse(currDate); const t = Date.parse(endtime) - Date.parse(currDate);
console.log(t);
this.cancelDelivery = t; this.cancelDelivery = t;
const hours = Math.floor((((t / 1000) / 60) / 60) % 60); const hours = Math.floor((((t / 1000) / 60) / 60) % 60);
const seconds = Math.floor((t / 1000) % 60); const seconds = Math.floor((t / 1000) % 60);
......
src/app/preference/preference.page.ts
...@@ -32,10 +32,10 @@ export class PreferencePage implements OnInit { ...@@ -32,10 +32,10 @@ export class PreferencePage implements OnInit {
this.categoriesService this.categoriesService
.preference(this.uid) .preference(this.uid)
.then(datas => { .then(datas => {
console.log(datas); // console.log(datas);
console.log(this.categoriesService.preferenceList); // console.log(this.categoriesService.preferenceList);
this.userPrefence = this.categoriesService.preferenceList; this.userPrefence = this.categoriesService.preferenceList;
console.log(this.userPrefence); // console.log(this.userPrefence);
}) })
.catch(err => { .catch(err => {
this.userPrefence = []; this.userPrefence = [];
...@@ -51,8 +51,8 @@ export class PreferencePage implements OnInit { ...@@ -51,8 +51,8 @@ export class PreferencePage implements OnInit {
ngOnInit() { } ngOnInit() { }
selectPrefernce(preferenceId) { selectPrefernce(preferenceId) {
console.log(this.userPrefence); // console.log(this.userPrefence);
console.log(preferenceId); // console.log(preferenceId);
if (this.userPrefence) { if (this.userPrefence) {
const index = this.userPrefence.findIndex(x => x === preferenceId); const index = this.userPrefence.findIndex(x => x === preferenceId);
if (index > -1) { if (index > -1) {
...@@ -68,7 +68,7 @@ export class PreferencePage implements OnInit { ...@@ -68,7 +68,7 @@ export class PreferencePage implements OnInit {
onSubmit() { onSubmit() {
this.loader = true; this.loader = true;
console.log(this.userPrefence); // console.log(this.userPrefence);
this.categoriesService.preferenceCreate(this.userPrefence, this.uid); this.categoriesService.preferenceCreate(this.userPrefence, this.uid);
this.successState = true; this.successState = true;
setTimeout(() => { setTimeout(() => {
...@@ -87,7 +87,7 @@ export class PreferencePage implements OnInit { ...@@ -87,7 +87,7 @@ export class PreferencePage implements OnInit {
selectedPref(preferenceId) { selectedPref(preferenceId) {
const index = this.userPrefence.findIndex(x => x === preferenceId); const index = this.userPrefence.findIndex(x => x === preferenceId);
console.log(index); // console.log(index);
if (index > -1) { if (index > -1) {
return true; return true;
} else { } else {
......
src/app/productdetail/productdetail.page.ts
...@@ -153,7 +153,7 @@ export class ProductdetailPage implements OnInit { ...@@ -153,7 +153,7 @@ export class ProductdetailPage implements OnInit {
this.cartService.buyNow(product).then((data) => { this.cartService.buyNow(product).then((data) => {
if (data === true) { if (data === true) {
if (type === 1) { if (type === 1) {
this.router.navigateByUrl('cart'); this.router.navigateByUrl('cart', { replaceUrl: true });
} else { } else {
this.service.showToast('Added into cart', 'top', 'my-toast', 2000); this.service.showToast('Added into cart', 'top', 'my-toast', 2000);
} }
......
src/config/address.service.ts
...@@ -7,6 +7,7 @@ import * as firebase from 'firebase'; ...@@ -7,6 +7,7 @@ import * as firebase from 'firebase';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
import { Address, AddressList } from './services/address'; import { Address, AddressList } from './services/address';
import { CenterData } from './services/center'; import { CenterData } from './services/center';
import { SubjectService } from './subject.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
...@@ -18,7 +19,7 @@ export class AddressService { ...@@ -18,7 +19,7 @@ export class AddressService {
custAddress: AddressList; custAddress: AddressList;
centerLoc: CenterData; centerLoc: CenterData;
addressState: number; addressState: number;
constructor(public afs: AngularFirestore) { constructor(public afs: AngularFirestore, public subject: SubjectService) {
this.addressState = 0; this.addressState = 0;
} }
...@@ -55,6 +56,7 @@ export class AddressService { ...@@ -55,6 +56,7 @@ export class AddressService {
} }
public async defaultAddress(userId: string) { public async defaultAddress(userId: string) {
await new Promise(resolve => {
const This = this; const This = this;
const state = true; const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection( const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
...@@ -77,11 +79,13 @@ export class AddressService { ...@@ -77,11 +79,13 @@ export class AddressService {
nearest: false nearest: false
}; };
this.defaultAdd = address; this.defaultAdd = address;
resolve(this.defaultAdd);
console.log(this.defaultAdd); console.log(this.defaultAdd);
} else { } else {
// alert('No Orders Found'); // alert('No Orders Found');
} }
}); });
});
} }
addressCreate(data: Address) { addressCreate(data: Address) {
...@@ -126,6 +130,7 @@ export class AddressService { ...@@ -126,6 +130,7 @@ export class AddressService {
.doc(addId) .doc(addId)
.update({ defaultVal: 1 }) .update({ defaultVal: 1 })
.then(() => { .then(() => {
this.subject.setAddressStateData(true);
resolve(true); resolve(true);
console.log('Address updated Successfully'); console.log('Address updated Successfully');
}); });
......
src/config/auth.service.ts
...@@ -108,6 +108,7 @@ export class AuthService { ...@@ -108,6 +108,7 @@ export class AuthService {
.doc(this.userData.uid) .doc(this.userData.uid)
.update({ otp: '', phoneVerified: true }); .update({ otp: '', phoneVerified: true });
this.service.set('type', 1); this.service.set('type', 1);
this.type = 1;
this.loader = false; this.loader = false;
this.router.navigateByUrl('nearby', { replaceUrl: true }); this.router.navigateByUrl('nearby', { replaceUrl: true });
} else { } else {
......
src/config/cart.service.ts
...@@ -134,7 +134,7 @@ export class CartsService { ...@@ -134,7 +134,7 @@ export class CartsService {
} }
}); });
} else { } else {
this.service.showToast('Your cart is not empty', 'top', 'my-error', 2000); this.service.showToast('You have items from another Shopping Centre', 'top', 'my-error', 2000);
resolve(false); resolve(false);
} }
}); });
......
src/config/subject.service.ts
...@@ -9,6 +9,7 @@ export class SubjectService { ...@@ -9,6 +9,7 @@ export class SubjectService {
private loginState = new BehaviorSubject<any>(null); private loginState = new BehaviorSubject<any>(null);
private DataState = new BehaviorSubject<any>(null); private DataState = new BehaviorSubject<any>(null);
private TabState = new BehaviorSubject<any>(null); private TabState = new BehaviorSubject<any>(null);
private AddressState = new BehaviorSubject<any>(null);
sendLoginData(state: any) { sendLoginData(state: any) {
this.loginState.next(state); this.loginState.next(state);
...@@ -33,4 +34,14 @@ export class SubjectService { ...@@ -33,4 +34,14 @@ export class SubjectService {
getTabData(): Observable<any> { getTabData(): Observable<any> {
return this.TabState.asObservable(); return this.TabState.asObservable();
} }
setAddressStateData(state: any) {
console.log(state);
return this.AddressState.next(state);
}
getAddressStateData(): Observable<any> {
console.log('new val');
return this.AddressState.asObservable();
}
} }
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