Merge branch 'master' of https://gitlab.techware.co.in/amal/getmiretailer

.angulardoc.json

+{
+  "repoId": "531034bf-4923-4de7-83bd-27d59f59b76f",
+  "lastSync": 0
+}
\ No newline at end of file

src/app/forgotpass/forgotpass.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>FORGOT PASSWORD</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/home/home.page.html

-<ion-content>
-    <div class="home_header">
+<div class="home_header">
     <div class="shop_image">
 
     </div>
@@ -12,7 +11,9 @@
         <span>4</span>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div *ngIf="myorder.orders" class="notification new_order" [hidden]="myorder.orders.length == 0">
         YOU HAVE NEW ORDER
     </div>
@@ -54,7 +55,7 @@
                             <hr>
                             <ul>
                                 <li class="textLeft" [ngClass]="{'green': order.shopperState >= 1}"><span>Order Accepted</span></li>
-                                <li class="textCenter" [ngClass]="{'green': order.shopperState >= 2}" ><span>Product Packed</span></li>
+                                <li class="textCenter" [ngClass]="{'green': order.shopperState >= 2}"><span>Product Packed</span></li>
                                 <li class="textRight" [ngClass]="{'green': order.shopperState >= 3}"><span>Rider Picked</span></li>
                             </ul>
                         </div>
@@ -68,7 +69,8 @@
                     </div>
                 </div>
             </ion-slide>
-            </ion-slides><!-- -->            
+        </ion-slides>
+        <!-- -->
     </div>
     <div class="order_header" *ngIf="myorder.pastOrders &&  myorder.pastOrders.length > 0">
         <h5 class="floatLeft">PAST SALES</h5>

src/app/login/login.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn floatLeft">
     </button>
     <div class="nav_title floatLeft">
         <h4>RETAILER LOGIN</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="login_wrapper">
         <div class="logo_wrapper">
             <img src="../../assets/[email protected]">

src/app/password/password.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>PASSWORD</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/pastsales/pastsales.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>PAST SALES</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="past_orders">
         <div class="date_head">
             <div class="date_btn"></div>

src/app/signup/signup.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>RETAILER SIGNUP</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/trackorder/trackorder.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>TRACK ORDER</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="trackmap_wrapper">
         <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng">
             <agm-direction [origin]="origin" [destination]="destination" [renderOptions]="renderOptions" [markerOptions]="markerOptions">

src/app/upload/upload.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
    </button>
     <div class="nav_title floatLeft">
         <h4>DOCUMENTS</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="document_upload_wrapper">
         <div class="row">
             <div class="document_upload_box">

src/app/verification/verification.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
     <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-    </button>
+</button>
     <div class="nav_title floatLeft">
         <h4>VERIFICATION</h4>
     </div>
     <div class="clear"></div>
-    </div>
+</div>
+<ion-content>
+
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">