Merge branch 'muhsin' into 'master'
Muhsin
See merge request !41
Showing
| ... | ... | @@ -5,10 +5,8 @@ |
| <div class="side_menu_wrapper"> | ||
| <ion-menu-toggle> | ||
| <div class="top_banner"> | ||
| <div class="top_image"> | ||
| </div> | ||
| <div class="top_detail" > | ||
| <div class="top_image"></div> | ||
| <div class="top_detail"> | ||
| <h4>John Doe</h4> | ||
| <p>[email protected]</p> | ||
| </div> | ||
| ... | ... | @@ -28,7 +26,12 @@ |
| <div class="sub_menu"> | ||
| <ul *ngIf="categoryService.activecategories"> | ||
| <ion-menu-toggle> | ||
| <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">{{category.catName}}</li> | ||
| <li | ||
| *ngFor="let category of categoryService.activecategories" | ||
| (click)="goToPage('catstorelist', category)" | ||
| > | ||
| {{ category.catName }} | ||
| </li> | ||
| </ion-menu-toggle> | ||
| <!-- <li>Women's Fashion</li> | ||
| <li>Features</li> | ||
| ... | ... | @@ -39,7 +42,9 @@ |
| </div> | ||
| <li>Complaints & Feedback</li> | ||
| <li> | ||
| <span class="floatLeft" (click)="authService.SignOut()">Logout</span> | ||
| <span class="floatLeft" (click)="authService.SignOut()" | ||
| >Logout</span | ||
| > | ||
| <span class="floatRight version">Version 0.1.0.2</span> | ||
| <div class="clear"></div> | ||
| </li> | ||
| ... | ... | @@ -54,22 +59,42 @@ |
| <div class="common_tab" [hidden]="getState()"> | ||
| <ul> | ||
| <li (click)="goToPage('home')"> | ||
| <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div> | ||
| <div | ||
| class="icon_sec m1_icon" | ||
| [class.m1_icon_act]="sec_active1" | ||
| (click)="setActive1()" | ||
| ></div> | ||
| </li> | ||
| <li (click)="goToPage('catagory')"> | ||
| <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div> | ||
| <div | ||
| class="icon_sec m2_icon" | ||
| [class.m2_icon_act]="sec_active2" | ||
| (click)="setActive2()" | ||
| ></div> | ||
| </li> | ||
| <li (click)="goToPage('catagory')"> | ||
| <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div> | ||
| <div | ||
| class="icon_sec m3_icon" | ||
| [class.m3_icon_act]="sec_active3" | ||
| (click)="setActive3()" | ||
| ></div> | ||
| </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> | ||
| <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()"></div> | ||
| <div | ||
| class="icon_sec m6_icon" | ||
| [class.m6_icon_act]="sec_active6" | ||
| (click)="setActive6()" | ||
| ></div> | ||
| </li> | ||
| </ul> | ||
| </div> |
| <div class="nav_header"> | ||
| <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | ||
| <img src="../assets/Group17_2.png"> | ||
| <img src="../assets/Group17_2.png" /> | ||
| </button> | ||
| <div class="nav_title floatLeft"> | ||
| <h4>CHANGE DETAILS</h4> | ||
| ... | ... | @@ -9,34 +9,93 @@ |
| </div> | ||
| <ion-content> | ||
| <div class="login_wrapper"> | ||
| <div class="form_div"> | ||
| <form class="form_div" #updateForm="ngForm" novalidate> | ||
| <div class="row"> | ||
| <h6>Personal Details</h6> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="text" placeholder="John Doe"> | ||
| <input | ||
| name="name" | ||
| required | ||
| class="" | ||
| type="text" | ||
| [(ngModel)]="updateData.name" | ||
| placeholder="John Doe" | ||
| #name="ngModel" | ||
| /> | ||
| <div | ||
| class="md-errors-spacer" | ||
| [hidden]="name.valid || submitted == false" | ||
| class="ion-padding-start" | ||
| > | ||
| Name is required | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="mail" placeholder="[email protected]"> | ||
| <input | ||
| required | ||
| class="" | ||
| name="emailId" | ||
| type="mail" | ||
| [(ngModel)]="updateData.emailId" | ||
| placeholder="[email protected]" | ||
| pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}" | ||
| #emailId="ngModel" | ||
| /> | ||
| <div | ||
| class="md-errors-spacer" | ||
| [hidden]="emailId.valid || submitted == false" | ||
| > | ||
| <div *ngIf="emailId.errors && emailId.errors.required"> | ||
| Email is required | ||
| </div> | ||
| <div *ngIf="emailId.errors && emailId.errors.pattern"> | ||
| Email is invalid | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="number" placeholder="+00 9851 5871 6985"> | ||
| <input | ||
| required | ||
| class="" | ||
| name="phone" | ||
| type="number" | ||
| pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" | ||
| maxlength="10" | ||
| [(ngModel)]="updateData.phone" | ||
| placeholder="+00 9851 5871 6985" | ||
| #phone="ngModel" | ||
| /> | ||
| <div | ||
| class="md-errors-spacer" | ||
| [hidden]="phone.valid || submitted == false" | ||
| > | ||
| <div *ngIf="phone.errors && phone.errors.required"> | ||
| Phone number is required | ||
| </div> | ||
| <div *ngIf="phone.errors && phone.errors.pattern"> | ||
| Phone is invalid | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <h6>Change Password</h6> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="password" placeholder="Current Password"> | ||
| <input class="" type="password" placeholder="Current Password" /> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="password" placeholder="New Password"> | ||
| <input class="" type="password" placeholder="New Password" /> | ||
| </div> | ||
| <div class="row"> | ||
| <input class="" type="password" placeholder="Confirm Password"> | ||
| <input class="" type="password" placeholder="Confirm Password" /> | ||
| </div> | ||
| <div class="row"> | ||
| <button class="login_btn">UPDATE</button> | ||
| </div> | ||
| <button class="login_btn" (click)="onFormSubmit(updateForm)"> | ||
| UPDATE | ||
| </button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </ion-content> |
| <div class="nav_header"> | ||
| <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | ||
| <img src="../assets/Group17_2.png"> | ||
| <img src="../assets/Group17_2.png" /> | ||
| </button> | ||
| <div class="nav_title floatLeft"> | ||
| </div> | ||
| <div class="nav_title floatLeft"></div> | ||
| <button class="nav_btn nav_cart floatRight" (click)="goToPage('cart')"> | ||
| <div class="not" *ngIf="cartService.carts">{{cartService.carts.length}}</div> | ||
| <div class="not" *ngIf="cartService.carts"> | ||
| {{cartService.carts.length}} | ||
| </div> | ||
| </button> | ||
| <div class="clear"></div> | ||
| </div> | ||
| <ion-content> | ||
| <div class="product_detail_wrapper" *ngIf="product"> | ||
| <div class="product_banner"> | ||
| <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div> | ||
| <div | ||
| [ngClass]="checkFavStatus(product.prodId)" | ||
| (click)="changeFav(product.prodId)" | ||
| ></div> | ||
| <div class="featured_badge" *ngIf="product.featured">Featured</div> | ||
| <ion-slides pager="true" [options]="bannerOptions"> | ||
| <ion-slide> | ||
| <img [src]="product.image" onerror="this.src='../assets/[email protected]'"> | ||
| <img | ||
| [src]="product.image" | ||
| onerror="this.src='../assets/[email protected]'" | ||
| /> | ||
| </ion-slide> | ||
| <ion-slide> | ||
| <img [src]="product.image" onerror="this.src='../assets/[email protected]'"> | ||
| <img | ||
| [src]="product.image" | ||
| onerror="this.src='../assets/[email protected]'" | ||
| /> | ||
| </ion-slide> | ||
| <ion-slide> | ||
| <img [src]="product.image" onerror="this.src='../assets/[email protected]'"> | ||
| <img | ||
| [src]="product.image" | ||
| onerror="this.src='../assets/[email protected]'" | ||
| /> | ||
| </ion-slide> | ||
| </ion-slides> | ||
| </div> | ||
| ... | ... | @@ -30,14 +43,21 @@ |
| <ion-row> | ||
| <ion-col size="8"> | ||
| <h3>{{product.prodName}}</h3> | ||
| <p><strong><span><img src="../assets/Path61_2.png"></span>0</strong> {{product.category}}, {{product.subCate}} | ||
| <p> | ||
| <strong | ||
| ><span><img src="../assets/Path61_2.png"/></span>0</strong | ||
| > {{product.category}}, {{product.subCate}} | ||
| <br /> | ||
| <span *ngFor="let tag of product.tag">#{{tag}} </span> | ||
| </p> | ||
| </ion-col> | ||
| <ion-col size="4"> | ||
| <h5>A$ {{product.price}}</h5> | ||
| <p><span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p> | ||
| <p> | ||
| <span class="offer" *ngIf="product.discount > 0" | ||
| >-{{product.discount}}%</span | ||
| > | ||
| </p> | ||
| </ion-col> | ||
| </ion-row> | ||
| </div> | ||
| ... | ... | @@ -51,8 +71,14 @@ |
| <li> | ||
| <button id="custom_check_button"> | ||
| <label> | ||
| <input id="{{color}}" type="radio" name="color" value="{{color}}" | ||
| (click)="cartService.choose_color(color)" [checked]="i==0"> | ||
| <input | ||
| id="{{color}}" | ||
| type="radio" | ||
| name="color" | ||
| value="{{color}}" | ||
| (click)="cartService.choose_color(color)" | ||
| [checked]="i==0" | ||
| /> | ||
| <p>{{color}}</p> | ||
| </label> | ||
| </button> | ||
| ... | ... | @@ -69,8 +95,14 @@ |
| <li> | ||
| <button id="custom_check_button"> | ||
| <label> | ||
| <input id="{{size}}" type="radio" name="services" value="{{size}}" | ||
| (click)="cartService.choose_size(size)" [checked]="i==0"> | ||
| <input | ||
| id="{{size}}" | ||
| type="radio" | ||
| name="services" | ||
| value="{{size}}" | ||
| (click)="cartService.choose_size(size)" | ||
| [checked]="i==0" | ||
| /> | ||
| <p>{{size}}</p> | ||
| </label> | ||
| </button> | ||
| ... | ... | @@ -137,8 +169,7 @@ |
| </ul> | ||
| </div> --> | ||
| <h5>Description</h5> | ||
| <p>{{product.prodDesc}} | ||
| </p> | ||
| <p>{{product.prodDesc}}</p> | ||
| <!--<h5> | ||
| <span class="floatLeft">Reviews</span><span class="floatRight" (click)="goToPage('reviewlist')">MORE</span> | ||
| <div class="clear"></div> | ||
| ... | ... | @@ -204,7 +235,10 @@ |
| </ul> | ||
| </div> --> | ||
| <h5 *ngIf="product.similar && product.similar.length > 0"> | ||
| <span class="floatLeft">Related Products</span><span class="floatRight" (click)="goToPage('productlist', data)">MORE</span> | ||
| <span class="floatLeft">Related Products</span | ||
| ><span class="floatRight" (click)="goToPage('productlist', data)" | ||
| >MORE</span | ||
| > | ||
| <div class="clear"></div> | ||
| </h5> | ||
| <div class="related_product_slider"> | ||
| ... | ... | @@ -213,9 +247,14 @@ |
| <ion-slide *ngFor="let similar of product.similar"> | ||
| <li (click)="viewProd(similar)"> | ||
| <div class="product_image"> | ||
| <img [src]="similar.image" onerror="this.src='../assets/[email protected]'"> | ||
| <div [ngClass]="checkFavStatus(similar.prodId)" (click)="changeFav(similar.prodId)"> | ||
| </div> | ||
| <img | ||
| [src]="similar.image" | ||
| onerror="this.src='../assets/[email protected]'" | ||
| /> | ||
| <div | ||
| [ngClass]="checkFavStatus(similar.prodId)" | ||
| (click)="changeFav(similar.prodId)" | ||
| ></div> | ||
| </div> | ||
| <h5>{{similar.prodName}}</h5> | ||
| <p>{{similar.price}}</p> | ||
| ... | ... | @@ -226,7 +265,6 @@ |
| </div> | ||
| </div> | ||
| </div> | ||
| </ion-content> | ||
| <ion-footer> | ||
| <div class="footer_div"> | ||
| ... | ... |
| <div class="nav_header"> | ||
| <ion-menu-toggle> | ||
| <button class="nav_btn nav_menu floatLeft"> | ||
| </button> | ||
| <button class="nav_btn nav_menu floatLeft"></button> | ||
| </ion-menu-toggle> | ||
| <div class="nav_title floatLeft"> | ||
| <img src="../../assets/Group [email protected]"> | ||
| <img src="../../assets/Group [email protected]" /> | ||
| </div> | ||
| <div class="clear"></div> | ||
| </div> | ||
| ... | ... | @@ -14,36 +13,48 @@ |
| <div class="profile_circle"> | ||
| <div class="edit"></div> | ||
| </div> | ||
| <h5>JOHN DOE</h5> | ||
| <h5>{{user && user.name}}</h5> | ||
| <p>LOGOUT</p> | ||
| </div> | ||
| <div class="account_wrapper"> | ||
| <div class="account_header"> | ||
| <h5 class="floatLeft">ACCOUNT INFORMATION</h5> | ||
| <span class="floatRight"><img src="../../assets/edit.png"></span> | ||
| <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>Name<span>Verfied</span></p> | ||
| <p> | ||
| Name<span | ||
| >{{user && phoneVerified? "Verified": "Not Verified yet"}}</span | ||
| > | ||
| </p> | ||
| </ion-col> | ||
| <ion-col class="textRight p0"> | ||
| <h6>John Doe</h6> | ||
| <h6>{{user && user.name}}</h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| </div> | ||
| <div class="row"> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>Email<span>Not Verfied yet</span></p> | ||
| <p> | ||
| Email<span | ||
| >{{user && emailVerified? "Verified": "Not Verified yet"}}</span | ||
| > | ||
| </p> | ||
| </ion-col> | ||
| <ion-col class="textRight p0"> | ||
| <h6>[email protected]</h6> | ||
| <h6>{{user && user.emailId}}</h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| </div> | ||
| <hr> | ||
| <hr /> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>Wishlist</p> | ||
| ... | ... | @@ -52,7 +63,7 @@ |
| <h6>(3)</h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| <hr> | ||
| <hr /> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>Address</p> | ||
| ... | ... | @@ -61,7 +72,7 @@ |
| <h6>(1)</h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| <hr> | ||
| <hr /> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>My Cards</p> | ||
| ... | ... | @@ -72,7 +83,7 @@ |
| </h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| <hr> | ||
| <hr /> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>My Order</p> | ||
| ... | ... | @@ -83,7 +94,7 @@ |
| </h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| <hr> | ||
| <hr /> | ||
| <ion-row> | ||
| <ion-col class="textLeft p0"> | ||
| <p>Currency</p> | ||
| ... | ... | @@ -94,9 +105,6 @@ |
| </h6> | ||
| </ion-col> | ||
| </ion-row> | ||
| </div> | ||
| </div> | ||
| </ion-content> |
| import { Injectable } from '@angular/core'; | ||
| import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore'; | ||
| import { Router, ActivatedRoute } from '@angular/router'; | ||
| import { Products } from './services/product'; | ||
| import { Cart, CartItem } from './services/cart'; | ||
| import { ServiceService } from './service.service'; | ||
| import * as firebase from 'firebase'; | ||
| import { take } from 'rxjs/operators'; | ||
| import { User } from './services/user'; | ||
| import { from } from 'rxjs'; | ||
| import { Injectable } from "@angular/core"; | ||
| import { | ||
| AngularFirestore, | ||
| AngularFirestoreDocument, | ||
| AngularFirestoreCollection | ||
| } from "@angular/fire/firestore"; | ||
| import { Router, ActivatedRoute } from "@angular/router"; | ||
| import { Products } from "./services/product"; | ||
| import { Cart, CartItem } from "./services/cart"; | ||
| import { ServiceService } from "./service.service"; | ||
| import * as firebase from "firebase"; | ||
| import { take } from "rxjs/operators"; | ||
| import { User } from "./services/user"; | ||
| import { from } from "rxjs"; | ||
| @Injectable({ | ||
| providedIn: 'root' | ||
| providedIn: "root" | ||
| }) | ||
| export class CartsService { | ||
| size: string; | ||
| ... | ... | @@ -27,13 +31,13 @@ export class CartsService { |
| public router: Router, | ||
| public service: ServiceService | ||
| ) { | ||
| this.custId = ''; | ||
| this.custId = ""; | ||
| this.carts = []; | ||
| const users = this.service.get('user').then(data => { | ||
| const users = this.service.get("user").then(data => { | ||
| if (data) { | ||
| data = JSON.parse(data); | ||
| this.custId = data.uid; | ||
| console.log(this.custId); | ||
| // console.log(this.custId); | ||
| } | ||
| }); | ||
| } | ||
| ... | ... | @@ -42,30 +46,30 @@ export class CartsService { |
| this.prodId = product.prodId; | ||
| const prodRef = firebase | ||
| .firestore() | ||
| .collection('products') | ||
| .collection("products") | ||
| .doc(this.prodId); | ||
| this.size = this.size === undefined ? product.size[0] : this.size; | ||
| this.color = this.color === undefined ? product.color[0] : this.color; | ||
| const cartRef: AngularFirestoreCollection<any> = this.afs.collection( | ||
| 'carts', | ||
| "carts", | ||
| ref => | ||
| ref | ||
| .where('size', '==', this.size) | ||
| .where('color', '==', this.color) | ||
| .where('custId', '==', this.custId) | ||
| .where('product', '==', prodRef) | ||
| .where("size", "==", this.size) | ||
| .where("color", "==", this.color) | ||
| .where("custId", "==", this.custId) | ||
| .where("product", "==", prodRef) | ||
| ); | ||
| cartRef | ||
| .valueChanges() | ||
| .pipe(take(1)) | ||
| .subscribe(value => { | ||
| console.log(value); | ||
| // console.log(value); | ||
| if (value.length === 0) { | ||
| product.image = | ||
| product.image === undefined | ||
| ? '../assets/[email protected]' | ||
| ? "../assets/[email protected]" | ||
| : product.image; | ||
| const cart: Cart = { | ||
| color: this.color, | ||
| ... | ... | @@ -80,36 +84,36 @@ export class CartsService { |
| qty: 1, | ||
| size: this.size | ||
| }; | ||
| console.log(cart); | ||
| // console.log(cart); | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .add(cart) | ||
| .then(docRef => { | ||
| const neworderId = docRef.id; | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .doc(neworderId) | ||
| .update({ cartId: docRef.id }) | ||
| .then(() => { | ||
| console.log('Booking Successfully'); | ||
| // console.log('Booking Successfully'); | ||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| }); | ||
| }) | ||
| .catch(error => { | ||
| console.error('Error adding document: ', error); | ||
| console.error("Error adding document: ", error); | ||
| }); | ||
| } else { | ||
| console.log(value); | ||
| // console.log(value); | ||
| // alert('Item already added in the cart'); | ||
| const cartId = value[0].cartId; | ||
| // tslint:disable-next-line:radix | ||
| const qty = parseInt(value[0].qty) + 1; | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .doc(cartId) | ||
| .update({ qty: `${qty}` }) | ||
| .then(() => { | ||
| console.log('Booking Successfully'); | ||
| // console.log('Booking Successfully'); | ||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| }); | ||
| } | ||
| ... | ... | @@ -118,8 +122,8 @@ export class CartsService { |
| public async cartList() { | ||
| const cartRef: AngularFirestoreCollection<any> = this.afs.collection( | ||
| 'carts', | ||
| ref => ref.where('custId', '==', this.custId) | ||
| "carts", | ||
| ref => ref.where("custId", "==", this.custId) | ||
| ); | ||
| cartRef.valueChanges().subscribe(value => { | ||
| this.carts = []; | ||
| ... | ... | @@ -139,7 +143,7 @@ export class CartsService { |
| qty: item.qty, | ||
| size: item.size | ||
| }; | ||
| console.log(item.price, item.qty); | ||
| // console.log(item.price, item.qty); | ||
| if (item.price) { | ||
| this.cartTotal += item.price * item.qty; | ||
| } | ||
| ... | ... | @@ -175,9 +179,9 @@ export class CartsService { |
| ? this.carts[index].qty - 1 | ||
| : this.carts[index].qty; | ||
| this.carts[index].qty = qty; | ||
| console.log(this.carts[index].qty); | ||
| // console.log(this.carts[index].qty); | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .doc(this.carts[index].cartId) | ||
| .update({ | ||
| qty: this.carts[index].qty | ||
| ... | ... | @@ -189,7 +193,7 @@ export class CartsService { |
| this.cartTotal = 0; | ||
| this.carts[index].qty = qty; | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .doc(this.carts[index].cartId) | ||
| .update({ | ||
| qty: this.carts[index].qty | ||
| ... | ... | @@ -198,21 +202,19 @@ export class CartsService { |
| removeItem(index) { | ||
| this.afs | ||
| .collection('carts') | ||
| .collection("carts") | ||
| .doc(this.carts[index].cartId) | ||
| .delete(); | ||
| } | ||
| checkPromo(promoCode: string) { | ||
| console.log(promoCode); | ||
| // console.log(promoCode); | ||
| const state = true; | ||
| const promoRef: AngularFirestoreCollection<any> = this.afs.collection('promocode', ref => ref.where('promoCode', '==', promoCode) | ||
| .where('status', '==', state)); | ||
| const promoRef: AngularFirestoreCollection<any> = this.afs.collection( | ||
| "promocode", | ||
| ref => | ||
| ref.where("promoCode", "==", promoCode).where("status", "==", state) | ||
| ); | ||
| return promoRef.valueChanges(); | ||
| } | ||
| } |
src/config/services/slides.ts
0 → 100644
src/config/update.service.ts
0 → 100644
src/config/user.service.ts
0 → 100644
Please
register
or
sign in
to comment