Merge branch 'master' into adarsh

src/app/nearby/nearby.page.html

 <div class="nav_header">
-  <button
-    class="nav_btn nav_back floatLeft"
-    (click)="goBack()"
-    *ngIf="type === 0"
-  >
+  <button class="nav_btn nav_back floatLeft" (click)="goBack()">
     <img src="../assets/Group17_2.png" />
   </button>
   <div class="nav_title floatLeft">

src/app/productdetail/productdetail.page.scss

@@ -408,6 +408,10 @@
     .fav {
       background-image: url('../../assets/Group56_2.png');
     }
+    .fav_active {
+      background-image: url('../../assets/heart.png');
+    }
+
     .share {
       background-image: url('../../assets/Group57_2.png');
     }

src/app/productlist/productlist.page.html

@@ -66,7 +66,7 @@
       </li>
     </ul>
   </div>
-  <ul
+  <!-- <ul
     [class.grid_view]="onGrid"
     *ngIf="prodService.product && prodService.product.length > 0"
   >
@@ -90,7 +90,7 @@
         >
       </p>
     </li>
-  </ul>
+  </ul> -->
 
   <div class="no-result-wrapper" *ngIf="prodService.product.length === 0">
     <img src="../../assets/basket.png" />

src/config/cart.service.ts

@@ -189,7 +189,7 @@ export class CartsService {
   }
 
   addCount(index) {
-    const qty = this.carts[index].qty + 1;
+    const qty = Number(this.carts[index].qty) + 1; // Converts string to Number
     this.cartTotal = 0;
     this.carts[index].qty = qty;
     this.afs