order details page

src/app/changeaddress/changeaddress.page.ts

@@ -100,12 +100,14 @@ export class ChangeaddressPage implements OnInit {
       if (this.latitude !== this.lat && this.longitude !== this.lng) {
         this.lat = this.latitude;
         this.lng = this.longitude;
-        this.myorder.getNearBy(this.latitude, this.longitude, this.order.orderId).then(resp => {
-          console.log(resp);
-          if (resp) {
-            this.addressValid = resp;
-          }
-        });
+        this.myorder
+          .getNearBy(this.latitude, this.longitude, this.order.orderId)
+          .then(resp => {
+            console.log(resp);
+            if (resp) {
+              this.addressValid = resp;
+            }
+          });
       }
     }
     return this.addressValid;
@@ -143,7 +145,7 @@ export class ChangeaddressPage implements OnInit {
 
   onSubmit(data: any) {
     this.loader = true;
-    this.service.get('orderId').then((orderId) => {
+    this.service.get('orderId').then(orderId => {
       const postData: Address = {
         address: this.address,
         addressType: data.addressType,

src/app/orderplaced/orderplaced.page.html

@@ -6,8 +6,8 @@
                     <ion-row class="no-gutter">
                         <ion-col class="no-gutter" size="2">
                             <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-                <img src="../assets/arrow_white.png" />
-              </button>
+                                <img src="../assets/arrow_white.png" />
+                            </button>
                         </ion-col>
                         <ion-col class="no-gutter" size="8">
                             <div class="nav_title floatLeft">
@@ -74,8 +74,8 @@
                         <h5>
                             <span class="floatLeft">{{data.shopperName}}</span>
                             <span class="floatRight">{{data.product[0].qty}}
-                <img src="../assets/Path61_2.png" />
-              </span>
+                                <img src="../assets/Path61_2.png" />
+                            </span>
                             <div class="clear"></div>
                         </h5>
                         <p class="prodName">{{unEscape(data.product[0].prodName)}}</p>
@@ -104,7 +104,7 @@
             <div class="delivery-wrap">
                 <h4 class="floatLeft">DELIVERY</h4>
                 <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>
+                        class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span>
 
                 <div class="clear"></div>
             </div>
@@ -113,9 +113,7 @@
                 {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
                 <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
             </h5>
-            <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
-        CANCEL THIS ORDER
-      </button>
+
             <!-- <hr /> -->
         </div>
 
@@ -175,4 +173,12 @@
             </ul>
         </div> -->
     </div>
-</ion-content>
+</ion-content>
\ No newline at end of file
+
+<ion-footer>
+    <div class="footer-btn">
+        <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
+            CANCEL THIS ORDER
+        </button>
+    </div>
+</ion-footer>
\ No newline at end of file

src/app/orderplaced/orderplaced.page.scss

@@ -159,19 +159,6 @@
             padding-top: 20px;
             padding-bottom: 10px;
         }
-        .cancel_btn {
-            border-radius: 8px;
-            height: 45px;
-            width: 100%;
-            background-color: #29285b;
-            color: #fff;
-            font-size: 18px;
-            font-weight: lighter;
-            padding-left: 20px;
-            padding-right: 20px;
-            margin-bottom: 20px;
-            margin-top: 20px;
-        }
         .delivery-wrap {
             img {
                 width: 20px;
@@ -281,4 +268,25 @@
     width: 200px;
     overflow: hidden;
     text-overflow: ellipsis;
+}
+
+.footer-btn {
+    padding: 0 20px;
+    .cancel_btn {
+        border-radius: 8px;
+        height: 45px;
+        width: 100%;
+        background-color: #29285b;
+        color: #fff;
+        font-size: 18px;
+        font-weight: lighter;
+        padding-left: 20px;
+        padding-right: 20px;
+        margin-bottom: 15px;
+        margin-top: 10px;
+    }
+}
+
+.footer-md:before {
+    background: none;
 }
\ No newline at end of file