Merge branch 'amal' into 'master'

src/app/cart/cart.page.html

@@ -150,7 +150,7 @@
             </div>
         </div>
         <div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
-            <div class="continue" (click)="goToPage('storelist')">CONTINUE SHOPING</div>
+            <div class="continue" (click)="goToPage('productlist')">CONTINUE SHOPING</div>
             <div class="checkout" (click)="next(1)">CHECKOUT</div>
         </div>
         <div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">

src/global.scss

@@ -537,4 +537,5 @@ ion-header {
     padding-top: 50%;
     background-color: rgba(273, 273, 273, 0.9);
     text-align: center;
+    z-index: 99;
 }
\ No newline at end of file