Skip to content

G
getme
Commit b3067227 by Adarsh K
Options

status

parent b79b7ad8
Showing with 111 additions and 67 deletions
src/app/app.component.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</ion-menu-toggle> </ion-menu-toggle>
<div class="sidemenu_list"> <div class="sidemenu_list">
<ul> <ul>
<ion-menu-toggle (click)="hideTab()"> <ion-menu-toggle>
<li (click)="vieworder('home')">Shop</li> <li (click)="vieworder('home')">Shop</li>
</ion-menu-toggle> </ion-menu-toggle>
<!-- <li>About us</li> --> <!-- <li>About us</li> -->
......
src/app/cart/cart.page.html
...@@ -134,39 +134,64 @@ ...@@ -134,39 +134,64 @@
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>
<!-- <div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="paypal" name="radio-group" checked (click)="getwaypaypal()"> <input
<label for="test1"> type="radio"
<p>PayPal</p> name="payments"
</label> id="paypal"
</div> name="radio-group"
<div class="card_div" [hidden]="gateway !=1"> (click)="getwaypaypal()"
<input class="card_no borderNone widthFull" placeholder="PayPal ID"> />
</div> <label for="paypal">
<div class="payment_method"> <p>PayPal</p>
<input type="radio" name="payments" id="afterpay" name="radio-group" (click)="getwayafterpay()"> </label>
<label for="test2"> </div>
<p>AfterPay</p> <div class="card_div" [hidden]="gateway !=1">
</label> <input
</div> class="card_no borderNone widthFull"
<div class="card_div" [hidden]="gateway !=2"> placeholder="PayPal ID"
<input class="card_no" placeholder="**** **** **** 1458"> />
<input class="cv_number" placeholder="CVV"> </div>
</div> <div class="payment_method">
<div class="payment_method"> <input
<input type="radio" name="payments" id="payk" name="radio-group" (click)="getwaypayk()"> type="radio"
<label for="test3"> name="payments"
<p>PayK</p> id="afterpay"
</label> name="radio-group"
</div> (click)="getwayafterpay()"
<div class="card_div" [hidden]="gateway !=3"> />
<input class="card_no borderNone widthFull" placeholder="PafyK ID"> <label for="afterpay">
</div> --> <p>AfterPay</p>
</label>
</div>
<div class="card_div" [hidden]="gateway !=2">
<input class="card_no" placeholder="**** **** **** 1458" />
<input class="cv_number" placeholder="CVV" />
</div>
<div class="payment_method">
<input
type="radio"
name="payments"
id="payk"
name="radio-group"
(click)="getwaypayk()"
/>
<label for="payk">
<p>PayK</p>
</label>
</div>
<div class="card_div" [hidden]="gateway !=3">
<input
class="card_no borderNone widthFull"
placeholder="PafyK ID"
/>
</div>
<!-- <div class="delivery_time"> <!-- <div class="delivery_time">
<ul> <ul>
<li> <li>
...@@ -181,14 +206,13 @@ ...@@ -181,14 +206,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
/><button class="add_btn" (click)="promoApply(promo.value)">
ADD ADD
</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>
......
src/app/cart/cart.page.ts
...@@ -123,6 +123,10 @@ export class CartPage implements OnInit { ...@@ -123,6 +123,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
......
src/app/ordercancelled/ordercancelled.page.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</button> </button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<img src="../assets/[email protected]"> <img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'">
<h4>ORDER CANCELLED</h4> <h4>ORDER CANCELLED</h4>
<p>June 26th 2019, 03:00 PM</p> <p>June 26th 2019, 03:00 PM</p>
</div> </div>
......
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/wishlist/wishlist.page.html
...@@ -9,36 +9,36 @@ ...@@ -9,36 +9,36 @@
</div> </div>
<ion-content> <ion-content>
<!-- <div class="wishlist-wrapper"> <div class="wishlist-wrapper">
<ul> <ul>
<li> <li>
<div class="wishlist_image"> <div class="wishlist_image">
<img src="../../assets/img-list.png"> <img 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">European Style V Neck</p>
<span class="floatRight"><img src="../../assets/heart.png"></span> <span class="floatRight"><img src="../../assets/heart.png"/></span>
<div class="clear"></div> <div class="clear"></div>
<p>Green, Small</p> <p>Green, Small</p>
<h1>AU$88.00</h1> <h1>AU$88.00</h1>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <li>
<div class="wishlist_image"> <div class="wishlist_image">
<img src="../../assets/img-list.png"> <img 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">European Style V Neck</p>
<span class="floatRight"><img src="../../assets/heart.png"></span> <span class="floatRight"><img src="../../assets/heart.png"/></span>
<div class="clear"></div> <div class="clear"></div>
<p>Green, Small</p> <p>Green, Small</p>
<h1>AU$88.00</h1> <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"> <div class="empty-wishlist-wrapper">
<img src="../../assets/wishlist.png" /> <img src="../../assets/wishlist.png" />
......
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`,
......
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