Merge branch 'adarsh' into 'master'
Adarsh
See merge request !94
Showing
| ... | ... | @@ -68,7 +68,8 @@ |
| <ul> | ||
| <li (click)="goToPage('productlist')"> | ||
| <div class="nearby_image"> | ||
| <img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" /> | ||
| <img [src]="data.product[0].image" | ||
| onerror="this.src='../assets/[email protected]'" /> | ||
| </div> | ||
| <div class="nearby_detail"> | ||
| <h5> | ||
| ... | ... | @@ -91,9 +92,10 @@ |
| </h6> | ||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | ||
| <h5> | ||
| Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span> | ||
| Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span | ||
| class="afterpay">{{data.paymentMode}}</span> | ||
| </h5> | ||
| <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7"> | ||
| <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7"> | ||
| Delivery time : <span>{{deliveryTime}}</span> | ||
| </h5> | ||
| <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5> | ||
| ... | ... | @@ -103,7 +105,8 @@ |
| <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> | ||
| ... | ... | @@ -113,7 +116,8 @@ |
| {{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"> | ||
| <button class="cancel_btn" (click)="cancelOrder(data.orderId)" | ||
| *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"> | ||
| CANCEL THIS ORDER | ||
| </button> | ||
| <!-- <hr /> --> | ||
| ... | ... |
Please
register
or
sign in
to comment