Merge branch 'arjunlatest' into 'master'

src/app/home/home.page.html

@@ -16,8 +16,7 @@
                 </div>
             </div>
             <div class="search-sctn">
-                <button class="nav_btn nav_search floatRight" *ngIf="!searchShow"
-                    (click)="goToPage('searchmodal')"></button>
+                <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button>
                 <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
             </div>
         </div>
@@ -43,8 +42,7 @@
                         <h5>{{center.centerName}}</h5>
                         <p>{{center.description}}</p>
                     </div>
-                    <img [src]="center.centerImg"
-                        onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
+                    <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
                 </ion-slide>
             </ion-slides>
         </div>
@@ -52,12 +50,10 @@
             Featured Stores
         </div>
         <div class="featured_slider">
-            <ion-slides pager="false" [options]="slideOpts"
-                *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
+            <ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
                 <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
                     <div class="feature_product" (click)="goToPage('productlist', shopper)">
-                        <img [src]="shopper.featuredImage"
-                            onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
+                        <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
                         <div class="feature_overlay">
                             <h5>{{shopper.name}}</h5>
                             <p>{{shopper.caption}}</p>
@@ -86,8 +82,7 @@
             <ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
                 <li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
                     <div class="nearby_image">
-                        <img [src]="center.centerImg"
-                            onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
+                        <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
                     </div>
                     <div class="nearby_detail">
                         <h5>
@@ -108,10 +103,8 @@
         </div>
         <div class="featured_catagory_list">
             <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
-                <li *ngFor="let categories of categoriesService.activecategories"
-                    (click)="goToPage('catstorelist', categories)">
-                    <img [src]="categories.catImage"
-                        onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
+                <li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
+                    <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
                     <div class="featured_overlay">
                         <h4>{{categories.catName}}</h4>
                     </div>
@@ -143,12 +136,10 @@
     <ion-content class="sort_wrappper">
         <div class="location-finder">
 
-            <input type="text" placeholder="Search for location" (keydown.enter)="$event.preventDefault()"
-                autocorrect="off" autocapitalize="off" spellcheck="off" type="text" #building>
+            <input type="text" placeholder="Search for location" (keydown.enter)="$event.preventDefault()" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" #building>
 
         </div>
-        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
-            [backgroundColor]="'rgba(29, 27, 130,0.2)'">
+        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
             <agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
       {
         url: './assets/pin-2.svg',
@@ -166,19 +157,16 @@
             <div>
                 <ul class="address-ul" *ngIf="addressService.addressList && addressService.addressList.length > 0">
                     <li *ngFor="let address of addressService.addressList; let i = index">
-                        <div class="floatLeft">
+                        <div>
                             {{address.default}}
-                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
-                                (click)="setDefault(address)" [value]="address.addressId" #addressType
-                                [checked]="address.defaultVal == 1" />
+                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
                             <label for="styled-checkbox-{{i}}">
                                 {{address.addressType}}
                             </label>
                         </div>
-                        <div class="floatLeft">
+                        <div>
                             <p>
-                                {{address.building}}, <span
-                                    *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
+                                {{address.building}}, <span *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
                                 <!-- {{address.address}} -->
                             </p>
                         </div>

src/app/home/home.page.scss

@@ -256,41 +256,23 @@
     bottom: 0px;
     z-index: 99;
     .location-finder {
-
         position: absolute;
-
         top: 15px;
-
         left: 0;
-
         right: 0;
-
         padding: 0 20px;
-
         z-index: 1;
-
         input {
-
             width: 100%;
-
             border: 1px solid #e0e0e0;
-
             outline: none;
-
             padding: 8px 15px 8px 35px;
-
             border-radius: 25px;
-
             background-image: url('/assets/search_2.png');
-
             background-position: 15px;
-
             background-repeat: no-repeat;
-
             background-size: 15px;
-
         }
-
     }
     agm-map {
         width: 100%;
@@ -399,5 +381,4 @@
         white-space: nowrap;
         color: #6d6d6d;
     }
-
 }
\ No newline at end of file

src/app/orderplaced/orderplaced.page.html

@@ -107,8 +107,7 @@
 
             <div class="delivery-wrap">
                 <h4 class="floatLeft">DELIVERY</h4>
-                <span class="floatRight"
-                    *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
+                <span class="floatRight" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
                         class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span>
 
                 <div class="clear"></div>
@@ -117,8 +116,7 @@
             <h5 *ngIf="data.deliveryAddress">
                 {{data.deliveryAddress.addressType}}
                 <!-- ,<br />{{data.deliveryAddress.address}} -->,
-                <br /> {{data.deliveryAddress.building}}<span
-                    *ngIf="data.deliveryAddress.landmark && data.deliveryAddress.landmark!==''"><br />,
+                <br /> {{data.deliveryAddress.building}}<span *ngIf="data.deliveryAddress.landmark && data.deliveryAddress.landmark!==''"><br />,
                     {{data.deliveryAddress.landmark}}</span>
             </h5>
             <!-- <hr /> -->
@@ -184,8 +182,7 @@
 
 <ion-footer>
     <div class="footer-btn">
-        <button class="cancel_btn" (click)="cancelOrder(data.orderId)"
-            *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
+        <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
             CANCEL THIS ORDER
         </button>
     </div>