Merge branch 'adarsh' into 'master'

src/app/app-routing.module.ts

@@ -138,4 +138,4 @@ const routes: Routes = [
   ],
   exports: [RouterModule]
 })
-export class AppRoutingModule {}
+export class AppRoutingModule { }

src/app/cart/cart.page.html

@@ -171,8 +171,8 @@
                             <hr />
                             <div class="coupon_code">
                                 <div class="promo-row">
-                                    <input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn"
-                                        (click)="promoApply(promo.value)">
+                                    <input class="" placeholder="COUPON CODE: GET50" #promo /><button
+                                        class="add_btn apply_btn" (click)="promoApply(promo.value)">
                                         APPLY
                                     </button>
                                 </div>

src/app/cart/cart.page.scss

@@ -236,6 +236,9 @@
                             font-size: 17px;
                             font-weight: bolder;
                         }
+                        .apply_btn {
+                            display: flex;
+                        }
                     }
                     .promo-success {
                         color: #31b131;

src/app/searchmodal/searchmodal.page.ts

@@ -60,7 +60,7 @@ export class SearchmodalPage implements OnInit {
       this.productsService.setProd(data);
     }
     this.searchClose();
-    this.router.navigateByUrl(url, { queryParams: data, replaceUrl: true });
+    this.router.navigateByUrl(url, { queryParams: data, skipLocationChange: true });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }