Skip to content

G
getme
Commit 0b541dde by Adarsh K
Options

Merge branch 'adarsh' into 'master'

Adarsh See merge request !57
parents e34368fe 9e070769
Showing with 952 additions and 436 deletions
package-lock.json
...@@ -1493,6 +1493,21 @@ ...@@ -1493,6 +1493,21 @@
"@types/cordova": "^0.0.34" "@types/cordova": "^0.0.34"
} }
}, },
"@ionic-native/social-sharing": {
"version": "5.20.0",
"resolved": "https://registry.npmjs.org/@ionic-native/social-sharing/-/social-sharing-5.20.0.tgz",
"integrity": "sha512-YPu4mLf/oOk7Te1A/bxXC5roozAstpRXGSD3G9NdnFVRF6Vd/IT6heKg+grtQCzQXAgr3XP5hcTVhUb+5Tp17w==",
"requires": {
"@types/cordova": "^0.0.34"
},
"dependencies": {
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
}
}
},
"@ionic-native/splash-screen": { "@ionic-native/splash-screen": {
"version": "5.19.1", "version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.19.1.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.19.1.tgz",
...@@ -3555,6 +3570,11 @@ ...@@ -3555,6 +3570,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
"integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==" "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
}, },
"cordova-plugin-x-socialsharing": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.6.3.tgz",
"integrity": "sha512-veAoIOgviGL9RCUyol9e6BxBRpyPV5OWaAmFKglbLjF2uGvj73k+jPe2+2p39ySPetxC8KERAz+1I6tfjk42Zg=="
},
"cordova-sqlite-storage": { "cordova-sqlite-storage": {
"version": "3.4.1", "version": "3.4.1",
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.1.tgz", "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.1.tgz",
...@@ -4304,6 +4324,11 @@ ...@@ -4304,6 +4324,11 @@
"integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
"dev": true "dev": true
}, },
"es6-promise-plugin": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
"integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
},
"es6-promisify": { "es6-promisify": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
...@@ -11655,7 +11680,8 @@ ...@@ -11655,7 +11680,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -11698,7 +11724,8 @@ ...@@ -11698,7 +11724,8 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
...@@ -11709,7 +11736,8 @@ ...@@ -11709,7 +11736,8 @@
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -11826,7 +11854,8 @@ ...@@ -11826,7 +11854,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -11838,6 +11867,7 @@ ...@@ -11838,6 +11867,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -11867,6 +11897,7 @@ ...@@ -11867,6 +11897,7 @@
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -11885,6 +11916,7 @@ ...@@ -11885,6 +11916,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -11978,6 +12010,7 @@ ...@@ -11978,6 +12010,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -12063,7 +12096,8 @@ ...@@ -12063,7 +12096,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -12099,6 +12133,7 @@ ...@@ -12099,6 +12133,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -12118,6 +12153,7 @@ ...@@ -12118,6 +12153,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -12161,12 +12197,14 @@ ...@@ -12161,12 +12197,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -12689,6 +12727,7 @@ ...@@ -12689,6 +12727,7 @@
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -12707,6 +12746,7 @@ ...@@ -12707,6 +12746,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -12886,7 +12926,8 @@ ...@@ -12886,7 +12926,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -12992,7 +13033,8 @@ ...@@ -12992,7 +13033,8 @@
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
package.json
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"@ionic-native/geolocation": "^5.19.1", "@ionic-native/geolocation": "^5.19.1",
"@ionic-native/google-plus": "^5.19.1", "@ionic-native/google-plus": "^5.19.1",
"@ionic-native/native-geocoder": "^5.19.1", "@ionic-native/native-geocoder": "^5.19.1",
"@ionic-native/social-sharing": "^5.20.0",
"@ionic-native/splash-screen": "^5.19.1", "@ionic-native/splash-screen": "^5.19.1",
"@ionic-native/status-bar": "^5.19.1", "@ionic-native/status-bar": "^5.19.1",
"@ionic/angular": "^4.11.8", "@ionic/angular": "^4.11.8",
...@@ -43,8 +44,10 @@ ...@@ -43,8 +44,10 @@
"cordova-plugin-splashscreen": "^5.0.3", "cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.3", "cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4", "cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-socialsharing": "^5.6.3",
"cordova-sqlite-storage": "^3.4.1", "cordova-sqlite-storage": "^3.4.1",
"core-js": "^2.6.11", "core-js": "^2.6.11",
"es6-promise-plugin": "^4.2.2",
"firebase": "^6.6.2", "firebase": "^6.6.2",
"rxjs": "^6.5.4", "rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4", "rxjs-compat": "^6.5.4",
...@@ -96,6 +99,9 @@ ...@@ -96,6 +99,9 @@
"cordova-plugin-googleplus": { "cordova-plugin-googleplus": {
"REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9", "REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9",
"PLAY_SERVICES_VERSION": "15.0.1" "PLAY_SERVICES_VERSION": "15.0.1"
},
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
} }
}, },
"platforms": [ "platforms": [
......
src/app/app.component.html
<ion-app> <ion-app>
<ion-split-pane> <ion-split-pane>
<ion-menu> <ion-menu>
<ion-content> <ion-content>
<div class="side_menu_wrapper"> <div class="side_menu_wrapper">
<ion-menu-toggle *ngIf="userData"> <ion-menu-toggle *ngIf="userData">
<div class="top_banner"> <div class="top_banner">
<div class="top_image"> <div class="top_image">
<img [src]="userData.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" /> <img
</div> [src]="userData.profilePhoto"
<div class="top_detail"> onerror="this.src='./../assets/asset_avatar.png'"
<h4>{{ userData.name }}</h4> />
<p>{{ userData.emailId }}</p> </div>
</div> <div class="top_detail">
<div class="clear"></div> <h4>{{ userData.name }}</h4>
</div> <p>{{ userData.emailId }}</p>
</ion-menu-toggle> </div>
<div class="sidemenu_list"> <div class="clear"></div>
<ul> </div>
<ion-menu-toggle (click)="hideTab()"> </ion-menu-toggle>
<li (click)="vieworder('home')">Shop</li> <div class="sidemenu_list">
</ion-menu-toggle> <ul>
<!-- <li>About us</li> --> <ion-menu-toggle>
<ion-menu-toggle> <li (click)="vieworder('home')">Shop</li>
<li (click)="vieworder('myorder')">View Order</li> </ion-menu-toggle>
</ion-menu-toggle> <!-- <li>About us</li> -->
<ion-menu-toggle>
<li (click)="vieworder('myorder')">View Order</li>
</ion-menu-toggle>
<div class="sub_menu"> <div class="sub_menu">
<ul *ngIf="categoryService.activecategories"> <ul *ngIf="categoryService.activecategories">
<ion-menu-toggle> <ion-menu-toggle>
<li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)"> <li
{{ category.catName }} *ngFor="let category of categoryService.activecategories"
</li> (click)="goToPage('catstorelist', category)"
</ion-menu-toggle> >
<!-- <li>Women's Fashion</li> {{ category.catName }}
</li>
</ion-menu-toggle>
<!-- <li>Women's Fashion</li>
<li>Features</li> <li>Features</li>
<li>Bags</li> <li>Bags</li>
<li>Shoes</li> <li>Shoes</li>
<li>Electronics</li> --> <li>Electronics</li> -->
</ul> </ul>
</div> </div>
<ion-menu-toggle> <ion-menu-toggle>
<li (click)="vieworder('feedback')">Complaints & Feedback</li> <li (click)="vieworder('feedback')">Complaints & Feedback</li>
</ion-menu-toggle> </ion-menu-toggle>
<li> <li>
<span class="floatLeft" (click)="authService.SignOut()">Logout</span> <span class="floatLeft" (click)="authService.SignOut()"
<span class="floatRight version">Version 0.1.0.2</span> >Logout</span
<div class="clear"></div> >
</li> <span class="floatRight version">Version 0.1.0.2</span>
</ul> <div class="clear"></div>
</div> </li>
</div> </ul>
</ion-content> </div>
</ion-menu> </div>
<ion-router-outlet main></ion-router-outlet> </ion-content>
</ion-split-pane> </ion-menu>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>
</ion-app> </ion-app>
<div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen"> <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
<ul> <ul>
<li (click)="goToPage('home')"> <li (click)="goToPage('home')">
<div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div> <div
</li> class="icon_sec m1_icon"
<li (click)="goToPage('catagory')"> [class.m1_icon_act]="sec_active1"
<div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div> (click)="setActive1()"
</li> ></div>
<li (click)="searchModal()"> </li>
<div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div> <li (click)="goToPage('catagory')">
</li> <div
<li (click)="goToPage('cart')"> class="icon_sec m2_icon"
<div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div> [class.m2_icon_act]="sec_active2"
</li> (click)="setActive2()"
<li (click)="goToPage('myorder')"> ></div>
<div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div> </li>
</li> <li (click)="searchModal()">
<li (click)="goToPage('profile')"> <div
<div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()" menuClose></div> class="icon_sec m3_icon"
</li> [class.m3_icon_act]="sec_active3"
</ul> (click)="setActive3()"
</div> ></div>
\ No newline at end of file </li>
<li (click)="goToPage('cart')">
<div
class="icon_sec m4_icon"
[class.m4_icon_act]="sec_active4"
(click)="setActive4()"
></div>
</li>
<li (click)="goToPage('myorder')">
<div
class="icon_sec m5_icon"
[class.m5_icon_act]="sec_active5"
(click)="setActive5()"
></div>
</li>
<li (click)="goToPage('profile')">
<div
class="icon_sec m6_icon"
[class.m6_icon_act]="sec_active6"
(click)="setActive6()"
menuClose
></div>
</li>
</ul>
</div>
src/app/app.component.ts
...@@ -89,10 +89,6 @@ export class AppComponent { ...@@ -89,10 +89,6 @@ export class AppComponent {
}); });
} }
hideTab() {
alert('asdasdas');
}
async finishpop(data: any) { async finishpop(data: any) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: DeliverypopPage, component: DeliverypopPage,
...@@ -114,7 +110,8 @@ export class AppComponent { ...@@ -114,7 +110,8 @@ export class AppComponent {
'signup', 'signup',
'address', 'address',
'forgot', 'forgot',
'feedback' 'feedback',
'wishlist'
]; ];
const currentUrl = this.router.url.split('/'); const currentUrl = this.router.url.split('/');
const index = restrictedUrl.findIndex(x => x === currentUrl[1]); const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
......
src/app/app.module.ts
...@@ -28,6 +28,7 @@ import { from } from 'rxjs'; ...@@ -28,6 +28,7 @@ import { from } from 'rxjs';
import { DeliverypopPageModule } from './deliverypop/deliverypop.module'; import { DeliverypopPageModule } from './deliverypop/deliverypop.module';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { SearchmodalPageModule } from './searchmodal/searchmodal.module'; import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
import { SocialSharing } from '@ionic-native/social-sharing/ngx';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent],
...@@ -54,7 +55,8 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module'; ...@@ -54,7 +55,8 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
ServiceService, ServiceService,
AuthService, AuthService,
GooglePlus GooglePlus,
SocialSharing
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
......
src/app/cart/cart.page.html
...@@ -134,8 +134,9 @@ ...@@ -134,8 +134,9 @@
id="cod" id="cod"
name="radio-group" name="radio-group"
checked="true" checked="true"
(click)="getwaycod()"
/> />
<label for="paypal"> <label for="cod">
<p>COD</p> <p>COD</p>
</label> </label>
</div> </div>
...@@ -145,19 +146,15 @@ ...@@ -145,19 +146,15 @@
name="payments" name="payments"
id="paypal" id="paypal"
name="radio-group" name="radio-group"
checked
(click)="getwaypaypal()" (click)="getwaypaypal()"
/> />
<label for="test1"> <label for="paypal">
<p>PayPal</p> <p>PayPal</p>
</label> </label>
</div> </div>
<div class="card_div" [hidden]="gateway !=1"> <!-- <div class="card_div" [hidden]="gateway !=1">
<input <input class="card_no borderNone widthFull" placeholder="PayPal ID" />
class="card_no borderNone widthFull" </div> -->
placeholder="PayPal ID"
/>
</div>
<div class="payment_method"> <div class="payment_method">
<input <input
type="radio" type="radio"
...@@ -166,14 +163,14 @@ ...@@ -166,14 +163,14 @@
name="radio-group" name="radio-group"
(click)="getwayafterpay()" (click)="getwayafterpay()"
/> />
<label for="test2"> <label for="afterpay">
<p>AfterPay</p> <p>AfterPay</p>
</label> </label>
</div> </div>
<div class="card_div" [hidden]="gateway !=2"> <!-- <div class="card_div" [hidden]="gateway !=2">
<input class="card_no" placeholder="**** **** **** 1458" /> <input class="card_no" placeholder="**** **** **** 1458" />
<input class="cv_number" placeholder="CVV" /> <input class="cv_number" placeholder="CVV" />
</div> </div> -->
<div class="payment_method"> <div class="payment_method">
<input <input
type="radio" type="radio"
...@@ -182,16 +179,16 @@ ...@@ -182,16 +179,16 @@
name="radio-group" name="radio-group"
(click)="getwaypayk()" (click)="getwaypayk()"
/> />
<label for="test3"> <label for="payk">
<p>PayK</p> <p>PayK</p>
</label> </label>
</div> </div>
<div class="card_div" [hidden]="gateway !=3"> <!-- <div class="card_div" [hidden]="gateway !=3">
<input <input
class="card_no borderNone widthFull" class="card_no borderNone widthFull"
placeholder="PafyK ID" placeholder="PafyK ID"
/> />
</div> </div> -->
<!-- <div class="delivery_time"> <!-- <div class="delivery_time">
<ul> <ul>
<li> <li>
...@@ -206,14 +203,13 @@ ...@@ -206,14 +203,13 @@
</div> --> </div> -->
<hr /> <hr />
<div class="coupon_code"> <div class="coupon_code">
<input class="" placeholder="COUPON CODE" #promo /><button <input
class="add_btn" class=""
(click)="promoApply(promo.value)" placeholder="COUPON CODE: GET50"
> #promo
ADD /><button class="add_btn" (click)="promoApply(promo.value)">
APPLY
</button> </button>
<br />&nbsp;
<h6>GET50</h6>
<span *ngIf="discountApplied" style="color: red" <span *ngIf="discountApplied" style="color: red"
>Promocode applied successfully >Promocode applied successfully
</span> </span>
...@@ -268,7 +264,7 @@ ...@@ -268,7 +264,7 @@
<h4>Order Placed</h4> <h4>Order Placed</h4>
<p>{{bookDate}}</p> <p>{{bookDate}}</p>
<h3>The product will be delivered in</h3> <h3>The product will be delivered in</h3>
<h1>60:00 Mins</h1> <h1>{{deliveryTime}} Mins</h1>
<button class="view_order" (click)="goToPage('myorder')"> <button class="view_order" (click)="goToPage('myorder')">
VIEW ORDERS</button VIEW ORDERS</button
><br /> ><br />
......
src/app/cart/cart.page.ts
...@@ -48,6 +48,7 @@ export class CartPage implements OnInit { ...@@ -48,6 +48,7 @@ export class CartPage implements OnInit {
discount: number; discount: number;
totalAmt: number; totalAmt: number;
bookDate: any; bookDate: any;
timeinterval: any;
constructor( constructor(
private router: Router, private router: Router,
...@@ -59,6 +60,7 @@ export class CartPage implements OnInit { ...@@ -59,6 +60,7 @@ export class CartPage implements OnInit {
public service: ServiceService, public service: ServiceService,
public addressService: AddressService public addressService: AddressService
) { ) {
console.log('cart loaded');
this.bookDate = this.formatDate(); this.bookDate = this.formatDate();
this.currentIndex = 0; this.currentIndex = 0;
this.count = 1; this.count = 1;
...@@ -67,7 +69,7 @@ export class CartPage implements OnInit { ...@@ -67,7 +69,7 @@ export class CartPage implements OnInit {
this.taxAmount = 0; this.taxAmount = 0;
this.discountApplied = false; this.discountApplied = false;
this.discount = 0; this.discount = 0;
this.cartService.cartList(); // this.cartService.cartList();
this.loader = true; this.loader = true;
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
if (data) { if (data) {
...@@ -86,6 +88,15 @@ export class CartPage implements OnInit { ...@@ -86,6 +88,15 @@ export class CartPage implements OnInit {
this.setAddress(); this.setAddress();
} }
ionViewWillEnter() {
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.cartService.cartList();
}
});
}
setAddress() { setAddress() {
if (this.addressService.addressList.length > 0) { if (this.addressService.addressList.length > 0) {
let address = this.addressService.addressList.find( let address = this.addressService.addressList.find(
...@@ -123,6 +134,10 @@ export class CartPage implements OnInit { ...@@ -123,6 +134,10 @@ export class CartPage implements OnInit {
this.gateway = 3; this.gateway = 3;
} }
getwaycod() {
this.gateway = 4;
}
async finishpop() { async finishpop() {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: DeliverypopPage component: DeliverypopPage
...@@ -167,6 +182,10 @@ export class CartPage implements OnInit { ...@@ -167,6 +182,10 @@ export class CartPage implements OnInit {
.checkOut(this.cartService.carts, otherCharges) .checkOut(this.cartService.carts, otherCharges)
.then(data => { .then(data => {
console.log('ready for slide'); console.log('ready for slide');
const timeStamp = Math.floor(Date.now() / 1000);
this.timeinterval = setInterval(() => {
this.getDeliveryTime(timeStamp);
}, 1000);
this.slides.slideNext(); this.slides.slideNext();
}); });
} else { } else {
...@@ -177,6 +196,31 @@ export class CartPage implements OnInit { ...@@ -177,6 +196,31 @@ export class CartPage implements OnInit {
} }
} }
getDeliveryTime(timeStamp) {
console.log(timeStamp);
const endDate = new Date(timeStamp * 1000);
console.log(endDate);
endDate.setHours(endDate.getHours() + 1);
const t = this.getTimeRemaining(endDate, new Date());
const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;
const seconds = t.seconds < 10 ? '0' + t.seconds : t.seconds;
this.deliveryTime = minutes + ' : ' + seconds;
if (t.t <= 0) {
clearInterval(this.timeinterval);
}
}
getTimeRemaining(endtime, currDate) {
const t = Date.parse(endtime) - Date.parse(currDate);
const seconds = Math.floor((t / 1000) % 60);
const minutes = Math.floor((t / 1000 / 60) % 60);
return {
t,
minutes,
seconds
};
}
prev() { prev() {
this.slides.slidePrev(); this.slides.slidePrev();
} }
......
src/app/ordercancelled/ordercancelled.page.html
<ion-content> <ion-content>
<div class="cart_wrapper"> <div class="cart_wrapper" *ngIf="data">
<div class="cart_head"> <div class="cart_head">
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> <button
<img src="../assets/arrow_white.png"> class="nav_btn nav_back_white floatLeft"
(click)="goToPage('myorder')"
>
<img src="../assets/arrow_white.png" />
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4></h4> <h4></h4>
</div>
<button class="nav_btn floatRight">
</button>
<div class="clear"></div>
</div>
<img src="../assets/[email protected]">
<h4>ORDER CANCELLED</h4>
<p>June 26th 2019, 03:00 PM</p>
</div>
<div class="nearby_shop_list">
<ul>
<li (click)="goToPage('productlist')">
<div class="nearby_image">
<img src="../assets/[email protected]">
</div>
<div class="nearby_detail">
<h5>
<span class="floatLeft">Carnival Life</span>
<span class="floatRight">4
<img src="../assets/Path61_2.png">
</span>
<div class="clear"></div>
</h5>
<p>Men's & Women's Fashion</p>
</div>
<div class="clear"></div>
</li>
</ul>
</div>
<div class="product_detail">
<h6>Green, Small</h6>
<h5>Quantity : <span>3</span></h5>
<h5>Amount : <strong>AU$99.00</strong></h5>
<h5>Delivery time : <span>Delivery in 1 hour</span></h5>
<h4>DELIVERY</h4>
<h5>
Shamjith KS<br> +00 0000 888 888<br> Carnival Infopark Infopark Kochi<br> 682030, Kerala, India
</h5>
<button class="cancel_btn" (click)="goToPage('productdetail')">BUY NOW</button>
<hr>
</div> </div>
<button class="nav_btn floatRight"></button>
<div class="related_product_slider"> <div class="clear"></div>
</div>
<img onerror="this.src='../assets/[email protected]'" />
<h4>ORDER CANCELLED</h4>
<p>{{orderCancelled | date:'MMMM dd, y'}}</p>
</div>
<div class="nearby_shop_list">
<ul>
<li (click)="goToPage('productlist')">
<div class="nearby_image">
<img
[src]="data.product[0].image"
onerror="this.src='../assets/[email protected]'"
/>
</div>
<div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">Related Products</span><span class="floatRight">MORE</span> <span class="floatLeft">{{data.shopperName}}</span>
<div class="clear"></div> <span class="floatRight"
>4
<img src="../assets/Path61_2.png" />
</span>
<div class="clear"></div>
</h5> </h5>
<ul> <p>Men's & Women's Fashion</p>
<ion-slides pager="false" [options]="relatedProd"> </div>
<ion-slide> <div class="clear"></div>
<li (click)="goToPage('productdetail')"> </li>
<div class="product_image"> </ul>
<img src="../assets/[email protected]">
<div class="fav_icon">
</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00</p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/Recommended-Ball-Gown-Floor-Length-V-Neck-Lace-Organza-Prom-Dress-OD850662@3x.png">
<div class="fav_icon">
</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00</p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]">
<div class="fav_icon">
</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00 <span class="offer">-8%</span></p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]">
<div class="fav_icon">
</div>
<div class="featured_badge">Featured</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00<span>AU$110.00</span></p>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
</div> </div>
</ion-content> <div class="product_detail" *ngFor="let product of data.product">
\ No newline at end of file <h6>
<span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span>
<span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span>
</h6>
<h5>Quantity : <span>{{product.qty}}</span></h5>
<h5>Amount : <strong>A$ {{product.price}}</strong></h5>
<h5>Delivery time : <span> 1 hour</span></h5>
<h4>DELIVERY</h4>
<h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br />
{{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}}
</h5>
<!-- <button
class="cancel_btn"
(click)="goToPage('ordercancelled')"
>
BUY NOW
</button> -->
<!-- <hr /> -->
</div>
<!-- <div class="related_product_slider">
<h5>
<span class="floatLeft">Related Products</span
><span class="floatRight">MORE</span>
<div class="clear"></div>
</h5>
<ul>
<ion-slides pager="false" [options]="relatedProd">
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]" />
<div class="fav_icon"></div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00</p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img
src="../assets/Recommended-Ball-Gown-Floor-Length-V-Neck-Lace-Organza-Prom-Dress-OD850662@3x.png"
/>
<div class="fav_icon"></div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00</p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]" />
<div class="fav_icon"></div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00 <span class="offer">-8%</span></p>
</li>
</ion-slide>
<ion-slide>
<li (click)="goToPage('productdetail')">
<div class="product_image">
<img src="../assets/[email protected]" />
<div class="fav_icon"></div>
<div class="featured_badge">Featured</div>
</div>
<h5>European Style V Neck</h5>
<p>AU$99.00<span>AU$110.00</span></p>
</li>
</ion-slide>
</ion-slides>
</ul>
</div> -->
</div>
</ion-content>
src/app/ordercancelled/ordercancelled.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { ServiceService } from './../../config/service.service';
@Component({ @Component({
selector: 'app-ordercancelled', selector: 'app-ordercancelled',
templateUrl: './ordercancelled.page.html', templateUrl: './ordercancelled.page.html',
styleUrls: ['./ordercancelled.page.scss'], styleUrls: ['./ordercancelled.page.scss']
}) })
export class OrdercancelledPage implements OnInit { export class OrdercancelledPage implements OnInit {
data: any;
orderCancelled = new Date();
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location private location: Location,
) { } private service: ServiceService
) {
ngOnInit() { this.service.get('order').then(val => {
this.data = val;
});
} }
ngOnInit() {}
relatedProd = { relatedProd = {
slidesPerView: 2 slidesPerView: 2
} };
goToPage(path, data = null) { goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data }); this.router.navigateByUrl(path, { queryParams: data });
...@@ -29,6 +35,5 @@ export class OrdercancelledPage implements OnInit { ...@@ -29,6 +35,5 @@ export class OrdercancelledPage implements OnInit {
goBack() { goBack() {
this.location.back(); this.location.back();
} }
} }
src/app/orderplaced/orderplaced.page.html
...@@ -89,7 +89,10 @@ ...@@ -89,7 +89,10 @@
Amount : <strong>A$ {{product.price}}</strong Amount : <strong>A$ {{product.price}}</strong
><span class="afterpay">COD</span> ><span class="afterpay">COD</span>
</h5> </h5>
<h5>Delivery time : <span>{{deliveryTime}}</span></h5> <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7">
Delivery time : <span>{{deliveryTime}}</span>
</h5>
<h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5>
<h4>DELIVERY</h4> <h4>DELIVERY</h4>
<h5 *ngIf="data.deliveryAddress"> <h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
...@@ -97,10 +100,14 @@ ...@@ -97,10 +100,14 @@
{{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}} {{data.deliveryAddress.landmark}}
</h5> </h5>
<button class="cancel_btn" (click)="goToPage('ordercancelled')"> <button
class="cancel_btn"
(click)="cancellOrder(data.orderId)"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"
>
CANCEL THIS ORDER CANCEL THIS ORDER
</button> </button>
<hr /> <!-- <hr /> -->
</div> </div>
<!-- <div class="related_product_slider"> <!-- <div class="related_product_slider">
......
src/app/orderplaced/orderplaced.page.ts
...@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; ...@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { ServiceService } from './../../config/service.service'; import { ServiceService } from './../../config/service.service';
import { MyordersService } from './../../config/myorder.service';
@Component({ @Component({
selector: 'app-orderplaced', selector: 'app-orderplaced',
...@@ -10,12 +11,14 @@ import { ServiceService } from './../../config/service.service'; ...@@ -10,12 +11,14 @@ import { ServiceService } from './../../config/service.service';
}) })
export class OrderplacedPage implements OnInit { export class OrderplacedPage implements OnInit {
deliveryTime: any; deliveryTime: any;
cancelDelivery: any;
timeinterval: any; timeinterval: any;
constructor( constructor(
private router: Router, private router: Router,
private route: ActivatedRoute, private route: ActivatedRoute,
private location: Location, private location: Location,
private service: ServiceService private service: ServiceService,
private myOrder: MyordersService
) { ) {
this.deliveryTime = ''; this.deliveryTime = '';
this.service.get('order').then(val => { this.service.get('order').then(val => {
...@@ -47,6 +50,7 @@ export class OrderplacedPage implements OnInit { ...@@ -47,6 +50,7 @@ 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);
this.cancelDelivery = t;
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 {
...@@ -66,4 +70,55 @@ export class OrderplacedPage implements OnInit { ...@@ -66,4 +70,55 @@ export class OrderplacedPage implements OnInit {
goBack() { goBack() {
this.location.back(); this.location.back();
} }
cancellOrder(orderId) {
console.log(orderId);
this.myOrder.cancelOrder(orderId).then(() => {
this.service.showToast('Order cancelled!', 'top', 'my-toast', 1000);
const This = this;
setTimeout(() => {
This.goToPage('ordercancelled');
}, 1100);
});
}
getStatus(status: number) {
switch (status) {
case 1:
return 'Booked';
break;
case 2:
return 'Shop Accepted';
break;
case 3:
return 'Rider Assigned';
break;
case 4:
return 'Reached Shop';
break;
case 5:
return 'Picked Up';
break;
case 6:
return 'Reached Location';
break;
case 7:
return 'Delivered';
break;
case 9:
return 'Completed';
break;
case 8:
return 'Rejected';
break;
case 10:
return 'Not Received';
break;
case 0:
return 'Cancelled';
break;
default:
return 'Finished';
}
}
} }
src/app/productdetail/productdetail.page.html
...@@ -272,11 +272,17 @@ ...@@ -272,11 +272,17 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
<ion-footer> <ion-footer *ngIf="product">
<div class="footer_div"> <div class="footer_div">
<div class="footer_options"> <div class="footer_options">
<button class="share"></button> <button
<button class="fav"></button> class="share"
(click)="socialShare(product.prodName, product.category, product.subCate, product.price, product.image)"
></button>
<button
[ngClass]="checkFavStatus(product.prodId)"
(click)="changeFav(product.prodId)"
></button>
<button class="cart" (click)="buyNow(product,0)"></button> <button class="cart" (click)="buyNow(product,0)"></button>
</div> </div>
<div class="footer_btn" (click)="buyNow(product,1)">BUY NOW</div> <div class="footer_btn" (click)="buyNow(product,1)">BUY NOW</div>
......
src/app/productdetail/productdetail.page.ts
...@@ -8,6 +8,7 @@ import { Order } from './../../config/services/order'; ...@@ -8,6 +8,7 @@ import { Order } from './../../config/services/order';
import { CartsService } from './../../config/cart.service'; import { CartsService } from './../../config/cart.service';
import { ProductsService } from './../../config/products.service'; import { ProductsService } from './../../config/products.service';
import { ServiceService } from './../../config/service.service'; import { ServiceService } from './../../config/service.service';
import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
@Component({ @Component({
...@@ -42,7 +43,8 @@ export class ProductdetailPage implements OnInit { ...@@ -42,7 +43,8 @@ export class ProductdetailPage implements OnInit {
private location: Location, private location: Location,
private cartService: CartsService, private cartService: CartsService,
private prodService: ProductsService, private prodService: ProductsService,
private service: ServiceService private service: ServiceService,
private socialSharing: SocialSharing
) { ) {
const params = this.prodService.selItem; const params = this.prodService.selItem;
this.service.state = true; this.service.state = true;
...@@ -132,7 +134,7 @@ export class ProductdetailPage implements OnInit { ...@@ -132,7 +134,7 @@ export class ProductdetailPage implements OnInit {
if (type === 1) { if (type === 1) {
this.router.navigateByUrl('cart'); this.router.navigateByUrl('cart');
} else { } else {
// alert('Product added to cart'); this.service.showToast('Added into cart', 'top', 'my-toast', 2000);
} }
this.cartService.cartList(); this.cartService.cartList();
}); });
...@@ -144,10 +146,11 @@ export class ProductdetailPage implements OnInit { ...@@ -144,10 +146,11 @@ export class ProductdetailPage implements OnInit {
checkFavStatus(index) { checkFavStatus(index) {
const state = this.prodService.fav.findIndex(x => x === index); const state = this.prodService.fav.findIndex(x => x === index);
return state > -1 ? 'fav_fill' : 'fav_icon'; return state > -1 ? 'fav_active' : 'fav';
} }
changeFav(index) { changeFav(index) {
this.prodService.changeFav(index, 'yes');
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);
...@@ -161,4 +164,15 @@ export class ProductdetailPage implements OnInit { ...@@ -161,4 +164,15 @@ export class ProductdetailPage implements OnInit {
return; return;
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
} }
socialShare(prodName, category, subCate, price, image) {
const desc = category + ', ' + subCate + ', ' + price;
const content = {
message: desc, // not supported on some apps (Facebook, Instagram)
subject: prodName, // fi. for email
files: image,
chooserTitle: 'GetMi'
};
this.socialSharing.shareWithOptions(content);
}
} }
src/app/productlist/productlist.page.html
...@@ -112,6 +112,17 @@ ...@@ -112,6 +112,17 @@
<li> <li>
<input <input
class="styled-checkbox" class="styled-checkbox"
id="styled-checkbox-1"
type="radio"
value="newest"
name="sort"
(click)="setValue($event.target.value)"
/>
<label for="styled-checkbox-1">Newest First</label>
</li>
<li>
<input
class="styled-checkbox"
id="styled-checkbox-5" id="styled-checkbox-5"
type="radio" type="radio"
value="a-z" value="a-z"
......
src/app/productlist/productlist.page.ts
...@@ -33,6 +33,7 @@ export class ProductlistPage implements OnInit { ...@@ -33,6 +33,7 @@ export class ProductlistPage implements OnInit {
sortValue: string; sortValue: string;
loader: boolean; loader: boolean;
shopperId: any; shopperId: any;
custId: any;
constructor( constructor(
private router: Router, private router: Router,
...@@ -54,10 +55,25 @@ export class ProductlistPage implements OnInit { ...@@ -54,10 +55,25 @@ export class ProductlistPage implements OnInit {
this.loader = false; this.loader = false;
}, 2000); }, 2000);
}); });
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
}
});
} }
ngOnInit() {} ngOnInit() {}
ionViewWillEnter() {
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.prodService.getFavlist(data.uid);
}
});
}
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;
......
src/app/profile/profile.page.html
<div class="nav_header"> <div class="nav_header">
<ion-menu-toggle> <ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button> <button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle> </ion-menu-toggle>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<img src="../../assets/Group [email protected]" /> <img src="../../assets/Group [email protected]" />
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="profile_wrapper" *ngIf="loggedUser"> <div class="profile_wrapper" *ngIf="loggedUser">
<div class="profile_banner"> <div class="profile_banner">
<!-- <div class="profile_circle"> <!-- <div class="profile_circle">
<div class="edit"></div> <div class="edit"></div>
</div> --> </div> -->
<div class="profile_circle"> <div class="profile_circle">
<img [src]="loggedUser.profilePhoto" onerror="this.src='./../../assets/profile_banner.png'" /> <img
<div class="edit"></div> [src]="loggedUser.profilePhoto"
<input type="file" accept="image/*" (change)="fileChange($event)" /> onerror="this.src='./../../assets/profile_banner.png'"
</div> />
<div class="edit"></div>
<h5>{{loggedUser.name}}</h5> <input type="file" accept="image/*" (change)="fileChange($event)" />
<p (click)="istoggle()">LOGOUT</p> </div>
</div>
<div class="account_wrapper">
<div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span class="floatRight" (click)="goToPage('changedetails', user && user)"><img
src="../../assets/edit.png" /></span>
<div class="clear"></div>
</div>
<div class="row">
<ion-row>
<ion-col class="textLeft p0">
<p>
Phone
</p> <h5>{{loggedUser.name}}</h5>
</ion-col> <p (click)="istoggle()">LOGOUT</p>
<ion-col class="textRight p0"> </div>
<h6>{{loggedUser.phone}}</h6> <div class="account_wrapper">
<span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span> <div class="account_header">
<span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span> <h5 class="floatLeft">ACCOUNT INFORMATION</h5>
</ion-col> <span
</ion-row> class="floatRight"
</div> (click)="goToPage('changedetails', user && user)"
<div class="row"> ><img src="../../assets/edit.png"
<ion-row> /></span>
<ion-col class="textLeft p0"> <div class="clear"></div>
<p> </div>
Email <div class="row">
</p> <ion-row>
</ion-col> <ion-col class="textLeft p0">
<ion-col class="textRight p0"> <p>
<h6>{{loggedUser.emailId}}</h6> Phone
<span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span> </p>
<span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span> </ion-col>
</ion-col> <ion-col class="textRight p0">
</ion-row> <h6>{{loggedUser.phone}}</h6>
</div> <span class="ar-span" *ngIf="loggedUser.phoneVerified == true"
<hr /> >Verified</span
<ion-row (click)="goToPage('wishlist')"> >
<ion-col class="textLeft p0"> <span class="ar-span" *ngIf="loggedUser.phoneVerified == false"
<p>Wishlist</p> >Not Verified yet</span
</ion-col> >
<ion-col class="textRight p0"> </ion-col>
<h6>(0)</h6> </ion-row>
</ion-col> </div>
</ion-row> <div class="row">
<hr /> <ion-row>
<ion-row (click)="goToPage('address')"> <ion-col class="textLeft p0">
<ion-col class="textLeft p0"> <p>
<p>Address</p> Email
</ion-col> </p>
<ion-col class="textRight p0"> </ion-col>
<h6 *ngIf="addressService.addList"> <ion-col class="textRight p0">
({{addressService.addressList.length}}) <h6>{{loggedUser.emailId}}</h6>
</h6> <span class="ar-span" *ngIf="loggedUser.emailVerified == true"
</ion-col> >Verified</span
</ion-row> >
<hr /> <span class="ar-span" *ngIf="loggedUser.emailVerified == false"
<!-- <ion-row> >Not Verified yet</span
>
</ion-col>
</ion-row>
</div>
<hr />
<ion-row (click)="goToPage('wishlist')">
<ion-col class="textLeft p0">
<p>Wishlist</p>
</ion-col>
<ion-col class="textRight p0">
<h6 *ngIf="wishService.whishItem">
({{wishService.whishItem.length}})
</h6>
</ion-col>
</ion-row>
<hr />
<ion-row (click)="goToPage('address')">
<ion-col class="textLeft p0">
<p>Address</p>
</ion-col>
<ion-col class="textRight p0">
<h6 *ngIf="addressService.addList">
({{addressService.addressList.length}})
</h6>
</ion-col>
</ion-row>
<hr />
<!-- <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Cards</p> <p>My Cards</p>
</ion-col> </ion-col>
...@@ -92,43 +107,46 @@ ...@@ -92,43 +107,46 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> --> <hr /> -->
<ion-row (click)="goToPage('myorder')"> <ion-row (click)="goToPage('myorder')">
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Order</p> <p>My Order</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<ion-icon name="arrow-forward"></ion-icon> <ion-icon name="arrow-forward"></ion-icon>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> <hr />
<ion-row> <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>Currency</p> <p>Currency</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<span>AUD</span> <span>AUD</span>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]> <div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]>
<div class="logout_inner"> <div class="logout_inner">
<h4>Logout</h4> <h4>Logout</h4>
<p>Are you sure to Logout ?</p> <p>Are you sure to Logout ?</p>
<div class="logout_footer"> <div class="logout_footer">
<button class="btn-cancel floatLeft" (click)="istoggle();"> <button class="btn-cancel floatLeft" (click)="istoggle();">
Cancel Cancel
</button> </button>
<button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> <button
class="btn-logout floatRight"
(click)="authService.SignOut(); istoggle()"
>
Logout Logout
</button> </button>
</div>
<div class="clear"></div>
</div>
</div> </div>
<div class="clear"></div>
</div>
</div> </div>
</ion-content> </div>
\ No newline at end of file </ion-content>
src/app/profile/profile.page.ts
...@@ -7,6 +7,7 @@ import { Router, ActivatedRoute } from '@angular/router'; ...@@ -7,6 +7,7 @@ import { Router, ActivatedRoute } from '@angular/router';
import { finalize, tap } from 'rxjs/operators'; import { finalize, tap } from 'rxjs/operators';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { AddressService } from './../../config/address.service'; import { AddressService } from './../../config/address.service';
import { WishService } from './../../config/wish.service';
import { import {
AngularFireStorage, AngularFireStorage,
AngularFireStorageReference, AngularFireStorageReference,
...@@ -48,11 +49,13 @@ export class ProfilePage implements OnInit { ...@@ -48,11 +49,13 @@ export class ProfilePage implements OnInit {
private service: ServiceService, private service: ServiceService,
private authService: AuthService, private authService: AuthService,
private addressService: AddressService, private addressService: AddressService,
private wishService: WishService,
private location: Location private location: Location
) { ) {
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); console.log(this.userData);
} }
}); });
......
src/app/wishlist/wishlist.page.html
...@@ -10,44 +10,50 @@ ...@@ -10,44 +10,50 @@
<ion-content> <ion-content>
<div class="wishlist-wrapper"> <div class="wishlist-wrapper">
<ul> <ul *ngIf="wishService.whishItem && wishService.whishItem.length > 0">
<li> <li *ngFor="let product of wishService.whishItem; let i = index">
<div class="wishlist_image"> <div class="wishlist_image" (click)="prodDetails(i)">
<img src="../../assets/img-list.png" /> <img
[src]="product.image"
onerror="this.src='../../assets/img-list.png'"
/>
</div> </div>
<div class="wishlist_detail"> <div class="wishlist_detail">
<p class="floatLeft">European Style V Neck</p> <p class="floatLeft" (click)="prodDetails(i)">{{product.prodName}}</p>
<span class="floatRight"><img src="../../assets/heart.png"/></span> <span class="floatRight"
><img
src="../../assets/heart.png"
(click)="removeItem(product.prodId)"
/></span>
<div class="clear"></div> <div class="clear"></div>
<p>Green, Small</p> <p (click)="prodDetails(i)">
<h1>AU$88.00</h1> <span *ngIf="product.color[0] !=='No-Color'"
</div> >{{product.color[0]}}</span
<div class="clear"></div> >,
</li> <span *ngIf="product.size[0] !=='Any-Size'"
<li> >{{product.size[0]}}</span
<div class="wishlist_image"> >
<img src="../../assets/img-list.png" /> </p>
</div> <h1 (click)="prodDetails(i)">A$ {{product.price}}</h1>
<div class="wishlist_detail">
<p class="floatLeft">European Style V Neck</p>
<span class="floatRight"><img src="../../assets/heart.png"/></span>
<div class="clear"></div>
<p>Green, Small</p>
<h1>AU$88.00</h1>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
</ul> </ul>
</div> </div>
<!-- <div class="empty-wishlist-wrapper" *ngIf="wishService.whishItem.length == 0">
<div class="empty-wishlist-wrapper">
<img src="../../assets/wishlist.png" /> <img src="../../assets/wishlist.png" />
<h1>There is no products added</h1> <h1>There is no products added</h1>
<button (click)="goToPage('home')">shop now</button> <button (click)="goToPage('home')">shop now</button>
</div> --> </div>
<div class="footer-btns-wrapper"> <div class="footer-btns-wrapper" *ngIf="wishService.whishItem.length > 0">
<button class="btn-clear">Clear All</button> <button class="btn-clear" (click)="clearAll()">Clear All</button>
<button class="btn-cart">add all to cart</button> <button class="btn-cart" (click)="addToCart()">add all to cart</button>
</div> </div>
</ion-content> </ion-content>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
<div></div>
<div></div>
</div>
</div>
src/app/wishlist/wishlist.page.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { ServiceService } from './../../config/service.service';
import { WishService } from './../../config/wish.service';
import { ProductsService } from './../../config/products.service';
@Component({ @Component({
selector: 'app-wishlist', selector: 'app-wishlist',
...@@ -8,7 +11,27 @@ import { Router, ActivatedRoute } from '@angular/router'; ...@@ -8,7 +11,27 @@ import { Router, ActivatedRoute } from '@angular/router';
styleUrls: ['./wishlist.page.scss'] styleUrls: ['./wishlist.page.scss']
}) })
export class WishlistPage implements OnInit { export class WishlistPage implements OnInit {
constructor(private location: Location, private router: Router) {} custId: any;
loader: boolean;
constructor(
private location: Location,
private router: Router,
public service: ServiceService,
public wishService: WishService,
public prodService: ProductsService
) {
this.loader = true;
setTimeout(() => {
this.loader = false;
}, 2000);
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
this.wishService.wishList(this.custId);
}
});
}
ngOnInit() {} ngOnInit() {}
...@@ -16,8 +39,80 @@ export class WishlistPage implements OnInit { ...@@ -16,8 +39,80 @@ export class WishlistPage implements OnInit {
this.location.back(); this.location.back();
} }
clearAll() {
this.loader = true;
this.wishService
.clearWish(this.custId)
.then(data => {
this.loader = false;
this.service.showToast(
'Wish list cleared successfully',
'top',
'my-toast',
2000
);
})
.catch(err => {
this.loader = false;
this.service.showToast('Something went wrong', 'top', 'my-error', 1000);
});
}
addToCart() {
this.loader = true;
this.wishService
.addToCart(this.custId, this.wishService.whishItem)
.then(data => {
this.wishService
.clearWish(this.custId)
.then(datas => {
this.loader = false;
this.service.showToast('Added to cart', 'top', 'my-toast', 2000);
})
.catch(err => {
this.loader = false;
this.service.showToast(
'Something went wrong',
'top',
'my-error',
1000
);
});
})
.catch(err => {
this.loader = false;
this.service.showToast('Something went wrong', 'top', 'my-error', 1000);
});
}
removeItem(prodId) {
this.loader = true;
this.wishService
.clearWishItem(this.custId, prodId)
.then(data => {
this.loader = false;
this.service.showToast(
'Wish list cleared successfully',
'top',
'my-toast',
2000
);
})
.catch(err => {
this.loader = false;
this.service.showToast('Something went wrong', 'top', 'my-error', 1000);
});
}
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;
} }
prodDetails(index: number) {
console.log(this.wishService.whishItem[index]);
this.prodService.setProd(this.wishService.whishItem[index]);
this.router.navigateByUrl('productdetail');
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
} }
src/config/cart.service.ts
...@@ -121,6 +121,7 @@ export class CartsService { ...@@ -121,6 +121,7 @@ export class CartsService {
} }
public async cartList() { public async cartList() {
console.log('called');
const cartRef: AngularFirestoreCollection<any> = this.afs.collection( const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
'carts', 'carts',
ref => ref.where('custId', '==', this.custId) ref => ref.where('custId', '==', this.custId)
......
src/config/myorder.service.ts
...@@ -79,6 +79,20 @@ export class MyordersService { ...@@ -79,6 +79,20 @@ export class MyordersService {
}); });
}*/ }*/
public async cancelOrder(orderId) {
const promise = new Promise(resolve => {
this.afs
.collection('orders')
.doc(orderId)
.update({
orderStatus: 0,
cancelTime: firebase.firestore.FieldValue.serverTimestamp()
});
resolve(true);
});
return promise;
}
public async orderList(custId) { public async orderList(custId) {
// console.log('called'); // console.log('called');
// console.log(custId); // console.log(custId);
...@@ -86,7 +100,7 @@ export class MyordersService { ...@@ -86,7 +100,7 @@ export class MyordersService {
this.orders = []; this.orders = [];
const orderRef: AngularFirestoreCollection<any> = this.afs.collection( const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
'orders', 'orders',
ref => ref.where('custId', '==', custId).orderBy('bookDate', 'desc') ref => ref.where('custId', '==', custId).orderBy('orderDate', 'desc')
); );
orderRef.stateChanges().subscribe(value => { orderRef.stateChanges().subscribe(value => {
// console.log(value); // console.log(value);
...@@ -100,6 +114,7 @@ export class MyordersService { ...@@ -100,6 +114,7 @@ export class MyordersService {
const order: Myorder = { const order: Myorder = {
amount: item.amount, amount: item.amount,
status: item.status, status: item.status,
orderDate: item.orderDate,
orderStatus: item.orderStatus, orderStatus: item.orderStatus,
bookDate: item.bookDate, bookDate: item.bookDate,
deliveryLocation: item.deliveryLocation, deliveryLocation: item.deliveryLocation,
...@@ -122,6 +137,7 @@ export class MyordersService { ...@@ -122,6 +137,7 @@ export class MyordersService {
} }
} }
}); });
this.orders.sort((a, b) => Number(b.orderDate) - Number(a.orderDate));
// console.log(this.orders); // console.log(this.orders);
} }
}); });
......
src/config/order.service.ts
...@@ -170,6 +170,7 @@ export class OrdersService { ...@@ -170,6 +170,7 @@ export class OrdersService {
deliveryCharge: 'A$ ' + otherCharge.deliveryCharge, deliveryCharge: 'A$ ' + otherCharge.deliveryCharge,
deliveryLocation: delivery, deliveryLocation: delivery,
bookDate: firebase.firestore.FieldValue.serverTimestamp(), bookDate: firebase.firestore.FieldValue.serverTimestamp(),
orderDate: Math.floor(Date.now() / 1000),
orderCode: this.orderCode(), orderCode: this.orderCode(),
orderId: neworderId, orderId: neworderId,
orderStatus: 1, orderStatus: 1,
......
src/config/products.service.ts
...@@ -125,6 +125,11 @@ export class ProductsService { ...@@ -125,6 +125,11 @@ export class ProductsService {
order = 'asc'; order = 'asc';
} }
if (sortValue === 'newest') {
field = 'createdAt';
order = 'asc';
}
// tslint:disable-next-line:max-line-length // tslint:disable-next-line:max-line-length
const prodRef: AngularFirestoreCollection<any> = this.afs.collection( const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
`products`, `products`,
......
src/config/services/myorder.ts
export interface Myorder { export interface Myorder {
amount: string; amount: string;
bookDate: any; bookDate: any;
pickupLocation: any; orderDate: any;
deliveryLocation: any; pickupLocation: any;
deliveryAddress: any; deliveryLocation: any;
status: number; deliveryAddress: any;
orderStatus: number; status: number;
riderName: string; orderStatus: number;
orderId: string; riderName: string;
time: string; orderId: string;
product: any; time: string;
orderCode: string; product: any;
orderCode: string;
} }
src/config/services/order.ts
...@@ -29,45 +29,43 @@ ...@@ -29,45 +29,43 @@
}*/ }*/
export interface CartProd { export interface CartProd {
prodName: any; prodName: any;
prodId: string; prodId: string;
image: string; image: string;
size: string; size: string;
color: string; color: string;
qty: number; qty: number;
discount: string; discount: string;
price: string; price: string;
productDoc: any; productDoc: any;
} }
export interface Order { export interface Order {
amount: string; amount: string;
customer: any; customer: any;
custName: string; custName: string;
deliveryAddress: string; deliveryAddress: string;
deliveryCharge: string; deliveryCharge: string;
deliveryLocation: object; deliveryLocation: object;
orderCode: string; orderCode: string;
orderId: string; orderId: string;
orderStatus: number; orderStatus: number;
pickupAddress: string; pickupAddress: string;
pickupLocation: object; pickupLocation: object;
bookDate: any; bookDate: any;
custId: string; orderDate: any;
promoId: any; custId: string;
rider: any; promoId: any;
riderName: string; rider: any;
riderId: string; riderName: string;
shopper: any; riderId: string;
shopperName: string; shopper: any;
shopperId: string; shopperName: string;
status: number; shopperId: string;
shopperState: number; status: number;
product: any; shopperState: number;
tax: string; product: any;
discount: string; tax: string;
promoApplied: boolean; discount: string;
promoApplied: boolean;
} }
src/config/services/wishlist.ts
export interface Wishlist { export interface Wishlist {
amount: string; prodId: string;
bookDate: any; shopperId: any;
pickupLocation: any; shopper: any;
deliveryLocation: any; prodName: any;
deliveryAddress: any; image: string;
status: number; size: any;
orderStatus: number; color: any;
riderName: string; qty: number;
orderId: string; price: number;
time: string;
product: any;
orderCode: string;
} }
src/config/wish.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import {
AngularFirestore,
AngularFirestoreDocument
} from '@angular/fire/firestore';
import { Router } from '@angular/router';
import { ServiceService } from './service.service';
import { CartsService } from './cart.service';
import { Products } from './services/product';
import { User } from './services/user';
import { take } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class WishService {
wish: Products;
user: User;
whishItem: Products[] = [];
wishItems: any;
constructor(
public afs: AngularFirestore,
public router: Router,
public service: ServiceService,
public cartService: CartsService
) {
this.whishItem = [];
}
public async wishList(custId) {
console.log(custId);
const cartRef: AngularFirestoreDocument<any> = this.afs
.collection('favourite')
.doc(custId);
this.whishItem = [];
cartRef.valueChanges().subscribe(value => {
this.whishItem = [];
console.log(value);
this.wishItems = value;
/* value = this.service.key2Array(value);
console.log(value); */
// tslint:disable-next-line:forin
for (const i in value) {
const prodRef: AngularFirestoreDocument<any> = this.afs
.collection('products')
.doc(i);
prodRef
.valueChanges()
.pipe(
take(1) // Here you can limit to only emit once, using the take operator
)
.subscribe(prodValue => {
console.log(prodValue);
if (prodValue) {
const item = prodValue;
const wishItem: Products = {
color: this.service.splitSep(item.color),
shopperId: item.shopperId,
shopper: item.shopper,
prodId: item.prodId,
price: item.price,
prodName: item.prodName,
image: item.image,
qty: 1,
brand: item.brand,
category: item.category,
discount: item.discount,
featured: item.featured,
prodCode: item.prodCode,
prodDesc: item.prodDesc,
prodStatus: item.prodStatus,
rating: item.rating,
skuCode: item.skuCode,
status: item.status,
subCate: item.subCate,
tag: this.service.splitSep(item.tag),
size: this.service.splitSep(item.size)
};
const found = this.whishItem.some(
el => el.prodId === item.prodId
);
if (!found) {
this.whishItem.push(wishItem);
}
console.log(this.whishItem);
} else {
// alert('No Products Found');
}
});
}
});
}
clearWish(custId) {
const promise = new Promise(resolve => {
this.afs
.collection('favourite')
.doc(custId)
.delete();
resolve(true);
});
return promise;
}
clearWishItem(custId, prodId) {
delete this.wishItems[prodId];
console.log(custId, prodId);
const promise = new Promise(resolve => {
this.afs
.collection('favourite')
.doc(custId)
.set(this.wishItems);
resolve(true);
}).catch(err => {
console.log(err);
});
return promise;
}
addToCart(custId, items) {
const promise = new Promise(resolve => {
items.forEach(item => {
this.cartService.buyNow(item);
});
resolve(true);
});
return promise;
}
}
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