status

src/app/app.component.html

@@ -20,7 +20,7 @@
           </ion-menu-toggle>
           <div class="sidemenu_list">
             <ul>
-              <ion-menu-toggle (click)="hideTab()">
+              <ion-menu-toggle>
                 <li (click)="vieworder('home')">Shop</li>
               </ion-menu-toggle>
               <!-- <li>About us</li> -->

src/app/cart/cart.page.html

@@ -134,39 +134,64 @@
                   id="cod"
                   name="radio-group"
                   checked="true"
+                  (click)="getwaycod()"
                 />
-                <label for="paypal">
+                <label for="cod">
                   <p>COD</p>
                 </label>
               </div>
-              <!-- <div class="payment_method">
-                                <input type="radio" name="payments" id="paypal" name="radio-group" checked (click)="getwaypaypal()">
-                                <label for="test1">
+              <div class="payment_method">
+                <input
+                  type="radio"
+                  name="payments"
+                  id="paypal"
+                  name="radio-group"
+                  (click)="getwaypaypal()"
+                />
+                <label for="paypal">
                   <p>PayPal</p>
                 </label>
               </div>
               <div class="card_div" [hidden]="gateway !=1">
-                                <input class="card_no borderNone widthFull" placeholder="PayPal ID">
+                <input
+                  class="card_no borderNone widthFull"
+                  placeholder="PayPal ID"
+                />
               </div>
               <div class="payment_method">
-                                <input type="radio" name="payments" id="afterpay" name="radio-group" (click)="getwayafterpay()">
-                                <label for="test2">
+                <input
+                  type="radio"
+                  name="payments"
+                  id="afterpay"
+                  name="radio-group"
+                  (click)="getwayafterpay()"
+                />
+                <label for="afterpay">
                   <p>AfterPay</p>
                 </label>
               </div>
               <div class="card_div" [hidden]="gateway !=2">
-                                <input class="card_no" placeholder="**** **** **** 1458">
-                                <input class="cv_number" placeholder="CVV">
+                <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="test3">
+                <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> -->
+                <input
+                  class="card_no borderNone widthFull"
+                  placeholder="PafyK ID"
+                />
+              </div>
               <!-- <div class="delivery_time">
                                 <ul>
                                     <li>
@@ -181,14 +206,13 @@
                             </div> -->
               <hr />
               <div class="coupon_code">
-                <input class="" placeholder="COUPON CODE" #promo /><button
-                  class="add_btn"
-                  (click)="promoApply(promo.value)"
-                >
+                <input
+                  class=""
+                  placeholder="COUPON CODE: GET50"
+                  #promo
+                /><button class="add_btn" (click)="promoApply(promo.value)">
                   ADD
                 </button>
-                <br />&nbsp;
-                <h6>GET50</h6>
                 <span *ngIf="discountApplied" style="color: red"
                   >Promocode applied successfully
                 </span>

src/app/cart/cart.page.ts

@@ -123,6 +123,10 @@ export class CartPage implements OnInit {
     this.gateway = 3;
   }
 
+  getwaycod() {
+    this.gateway = 4;
+  }
+
   async finishpop() {
     const modal = await this.modalController.create({
       component: DeliverypopPage

src/app/ordercancelled/ordercancelled.page.html

@@ -12,7 +12,7 @@
         </button>
                 <div class="clear"></div>
             </div>
-            <img src="../assets/[email protected]">
+            <img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'">
             <h4>ORDER CANCELLED</h4>
             <p>June 26th 2019, 03:00 PM</p>
         </div>

src/app/productlist/productlist.page.html

@@ -112,6 +112,17 @@
         <li>
           <input
             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"
             type="radio"
             value="a-z"

src/app/wishlist/wishlist.page.html

@@ -9,15 +9,15 @@
 </div>
 
 <ion-content>
-  <!-- <div class="wishlist-wrapper">
+  <div class="wishlist-wrapper">
     <ul>
       <li>
         <div class="wishlist_image">
-                    <img src="../../assets/img-list.png">
+          <img src="../../assets/img-list.png" />
         </div>
         <div class="wishlist_detail">
           <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>
           <p>Green, Small</p>
           <h1>AU$88.00</h1>
@@ -26,11 +26,11 @@
       </li>
       <li>
         <div class="wishlist_image">
-                    <img src="../../assets/img-list.png">
+          <img src="../../assets/img-list.png" />
         </div>
         <div class="wishlist_detail">
           <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>
           <p>Green, Small</p>
           <h1>AU$88.00</h1>
@@ -38,7 +38,7 @@
         <div class="clear"></div>
       </li>
     </ul>
-    </div> -->
+  </div>
 
   <div class="empty-wishlist-wrapper">
     <img src="../../assets/wishlist.png" />

src/config/products.service.ts

@@ -125,6 +125,11 @@ export class ProductsService {
       order = 'asc';
     }
 
+    if (sortValue === 'newest') {
+      field = 'createdAt';
+      order = 'asc';
+    }
+
     // tslint:disable-next-line:max-line-length
     const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
       `products`,