Commit aad75dad by Arjun

order details page

parent 88d20df1
...@@ -100,7 +100,9 @@ export class ChangeaddressPage implements OnInit { ...@@ -100,7 +100,9 @@ export class ChangeaddressPage implements OnInit {
if (this.latitude !== this.lat && this.longitude !== this.lng) { if (this.latitude !== this.lat && this.longitude !== this.lng) {
this.lat = this.latitude; this.lat = this.latitude;
this.lng = this.longitude; this.lng = this.longitude;
this.myorder.getNearBy(this.latitude, this.longitude, this.order.orderId).then(resp => { this.myorder
.getNearBy(this.latitude, this.longitude, this.order.orderId)
.then(resp => {
console.log(resp); console.log(resp);
if (resp) { if (resp) {
this.addressValid = resp; this.addressValid = resp;
...@@ -143,7 +145,7 @@ export class ChangeaddressPage implements OnInit { ...@@ -143,7 +145,7 @@ export class ChangeaddressPage implements OnInit {
onSubmit(data: any) { onSubmit(data: any) {
this.loader = true; this.loader = true;
this.service.get('orderId').then((orderId) => { this.service.get('orderId').then(orderId => {
const postData: Address = { const postData: Address = {
address: this.address, address: this.address,
addressType: data.addressType, addressType: data.addressType,
......
...@@ -113,9 +113,7 @@ ...@@ -113,9 +113,7 @@
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}} <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
</h5> </h5>
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER
</button>
<!-- <hr /> --> <!-- <hr /> -->
</div> </div>
...@@ -176,3 +174,11 @@ ...@@ -176,3 +174,11 @@
</div> --> </div> -->
</div> </div>
</ion-content> </ion-content>
<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
...@@ -159,19 +159,6 @@ ...@@ -159,19 +159,6 @@
padding-top: 20px; padding-top: 20px;
padding-bottom: 10px; 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 { .delivery-wrap {
img { img {
width: 20px; width: 20px;
...@@ -282,3 +269,24 @@ ...@@ -282,3 +269,24 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment