Merge branch 'arjunlatest' into 'master'

src/app/address/address.page.html

 <div class="nav_header">
-  <button class="nav_btn nav_back floatLeft" (click)="goBack()">
+    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
     <img src="../assets/Group17_2.png" />
   </button>
-  <div class="nav_title floatLeft">
-    <h4>Address</h4>
-  </div>
-  <div class="clear"></div>
+    <div class="nav_title floatLeft">
+        <h4>Address</h4>
+    </div>
+    <div class="clear"></div>
 </div>
 
 <ion-content>
-  <div class="address-wrapper" *ngIf="addressService.addressList">
-    <ion-grid *ngFor="let address of addressService.addressList; let i = index">
-      <ion-row>
-        <ion-col size="1">
-          <input type="radio" id="address_{{i}}" class="address-radio" name="address"
-            (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
-        </ion-col>
-        <ion-col size="9">
-          <h1>{{address.addressType}}</h1>
-          <h1>{{address.address}}</h1>
-          <p>{{address.building}}, {{address.landmark}}</p>
-        </ion-col>
-        <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn"
-            (click)="addressService.deleteAddress(address.addressId)">
+    <div class="address-wrapper" *ngIf="addressService.addressList">
+        <ion-grid *ngFor="let address of addressService.addressList; let i = index">
+            <ion-row>
+                <ion-col size="1">
+                    <input type="radio" id="address_{{i}}" class="address-radio" name="address" (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
+                </ion-col>
+                <ion-col size="9">
+                    <h1>{{address.addressType}}</h1>
+                    <h1>{{address.address}}</h1>
+                    <p>{{address.building}}, {{address.landmark}}</p>
+                </ion-col>
+                <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn" (click)="addressService.deleteAddress(address.addressId)">
             <img src="../../assets/delete.png" /></button></ion-col>
-      </ion-row>
-    </ion-grid>
-    <div class="address-btn-wrapper">
-      <button class="show-btn" (click)="goToPage('nearby')">
-        Add New Address
-      </button>
+            </ion-row>
+        </ion-grid>
+
     </div>
-  </div>
 </ion-content>
+
+<ion-footer>
+    <div class="address-btn-wrapper">
+        <button class="show-btn" (click)="goToPage('nearby')">
+      Add New Address
+    </button>
+    </div>
+</ion-footer>
 <div class="loader" *ngIf="loader">
-  <div class="lds-ripple">
-    <div></div>
-    <div></div>
-  </div>
+    <div class="lds-ripple">
+        <div></div>
+        <div></div>
+    </div>
 </div>
\ No newline at end of file

src/app/address/address.page.scss

 .address-wrapper {
-  padding: 15px;
-  padding-bottom: 11%;
-  .address-radio {
-    background-image: url('../../assets/radio.png');
-    -webkit-appearance: none;
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 25px;
-    height: auto;
     padding: 15px;
-    border-radius: 5px;
-    outline: none;
-    transition: all 0.6s ease-in-out;
-  }
-  .address-radio:checked {
-    background-image: url('../../assets/radio-checked.png');
-  }
-  .address-radio:checked + .show-btn {
-    opacity: 1;
-  }
-  h1 {
-    font-size: 18px;
-    margin-top: 6px;
-    padding-left: 10px;
-  }
-  p {
-    margin-top: 20px;
-    padding-left: 10px;
-    color: #b0aec7;
-  }
-  button {
-    background: none;
-    outline: none;
-  }
-  img {
-    width: 35px;
-  }
+    padding-bottom: 11%;
+    .address-radio {
+        background-image: url('../../assets/radio.png');
+        -webkit-appearance: none;
+        background-repeat: no-repeat;
+        background-position: center;
+        background-size: 25px;
+        height: auto;
+        padding: 15px;
+        border-radius: 50%;
+        outline: none;
+        transition: all 0.6s ease-in-out;
+    }
+    .address-radio:checked {
+        background-image: url('../../assets/radio-checked.png');
+    }
+    .address-radio:checked+.show-btn {
+        opacity: 1;
+    }
+    h1 {
+        font-size: 18px;
+        margin-top: 6px;
+        padding-left: 10px;
+    }
+    p {
+        margin-top: 20px;
+        padding-left: 10px;
+        color: #b0aec7;
+    }
+    button {
+        background: none;
+        outline: none;
+    }
+    img {
+        width: 35px;
+    }
 }
 
 .address-btn-wrapper {
-  padding: 15px;
-  padding-top: 0;
-  padding-bottom: 10px;
-  background-color: #fff;
-  position: fixed;
-  bottom: 0px;
-  left: 0;
-  right: 0;
-  button {
-    width: 100%;
-    background-color: #29285b;
-    color: #fff;
-    border-radius: 8px;
-    height: 45px;
-    font-size: 16px;
-    text-transform: uppercase;
-  }
-}
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #fff;
+    padding: 20px;
+    text-align: center;
+    z-index: 9;
+    button {
+        width: 100%;
+        background-color: #29285b;
+        color: #fff;
+        border-radius: 8px;
+        height: 45px;
+        font-size: 16px;
+        text-transform: uppercase;
+    }
+}
\ No newline at end of file

src/app/app.component.html

@@ -57,7 +57,7 @@
 </ion-app>
 
 <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
-    <button (click)="istoggle()"></button>
+    <!-- <button (click)="istoggle()"></button> -->
     <ul>
         <li (click)="goToPage('home')">
             <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div>

src/app/storelist/storelist.page.scss

@@ -145,12 +145,12 @@
                     width: 120px;
                     height: 125px;
                     float: left;
-                    background-color: #a8a8a8;
+                    // background-color: #f1f1f1;
                     border-radius: 8px;
                     img {
                         width: 100%;
                         height: 100%;
-                        object-fit: cover;
+                        object-fit: contain;
                         object-position: center;
                     }
                 }