Merge branch 'arjunlatest' into 'master'
Arjunlatest
See merge request !88
Showing
| <ion-content> | <ion-content> | ||
| <div class="cart_wrapper" *ngIf="data"> | <div class="cart_wrapper" *ngIf="data"> | ||
| <div class="cart_head"> | <div class="cart_head"> | ||
| <div class="nav_header"> | <div class="nav_header"> | ||
| <button | <ion-grid class="no-gutter"> | ||
| class="nav_btn nav_back_white floatLeft" | <ion-row class="no-gutter"> | ||
| (click)="goToPage('myorder')" | <ion-col class="no-gutter" size="2"> | ||
| > | <button class="nav_btn nav_back_white floatLeft" (click)="goToPage('myorder')"> | ||
| <img src="../assets/arrow_white.png" /> | <img src="../assets/arrow_white.png" /> | ||
| </button> | </button> | ||
| <div class="nav_title floatLeft"> | </ion-col> | ||
| <h4></h4> | <ion-col class="no-gutter" size="8"> | ||
| <div class="nav_title floatLeft"> | |||
| <h4></h4> | |||
| </div> | |||
| </ion-col> | |||
| <ion-col class="no-gutter" size="2"> | |||
| <button class="nav_btn floatRight"></button> | |||
| </ion-col> | |||
| </ion-row> | |||
| </ion-grid> | |||
| </div> | |||
| <img onerror="this.src='../assets/[email protected]'" /> | |||
| <h4>ORDER CANCELLED</h4> | |||
| <p>{{orderCancelled | date:'MMMM dd, y'}}</p> | |||
| </div> | </div> | ||
| <button class="nav_btn floatRight"></button> | <div class="nearby_shop_list"> | ||
| <div class="clear"></div> | <ul> | ||
| </div> | <li (click)="goToPage('productlist')"> | ||
| <img onerror="this.src='../assets/[email protected]'" /> | <div class="nearby_image"> | ||
| <h4>ORDER CANCELLED</h4> | <img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" /> | ||
| <p>{{orderCancelled | date:'MMMM dd, y'}}</p> | </div> | ||
| </div> | <div class="nearby_detail"> | ||
| <div class="nearby_shop_list"> | <h5> | ||
| <ul> | <span class="floatLeft">{{data.shopperName}}</span> | ||
| <li (click)="goToPage('productlist')"> | <span class="floatRight">4 | ||
| <div class="nearby_image"> | |||
| <img | |||
| [src]="data.product[0].image" | |||
| onerror="this.src='../assets/[email protected]'" | |||
| /> | |||
| </div> | |||
| <div class="nearby_detail"> | |||
| <h5> | |||
| <span class="floatLeft">{{data.shopperName}}</span> | |||
| <span class="floatRight" | |||
| >4 | |||
| <img src="../assets/Path61_2.png" /> | <img src="../assets/Path61_2.png" /> | ||
| </span> | </span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </h5> | |||
| <p>Men's & Women's Fashion</p> | |||
| </div> | |||
| <div class="clear"></div> | |||
| </li> | |||
| </ul> | |||
| </div> | |||
| <div class="product_detail" *ngFor="let product of data.product"> | |||
| <h6> | |||
| <span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span> | |||
| <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span> | |||
| </h6> | |||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | |||
| <h5>Amount : <strong>A$ {{product.price}}</strong></h5> | |||
| <h5>Delivery time : <span> 1 hour</span></h5> | |||
| <h4>DELIVERY</h4> | |||
| <h5 *ngIf="data.deliveryAddress"> | |||
| {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | |||
| <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}} | |||
| </h5> | </h5> | ||
| <p>Men's & Women's Fashion</p> | <!-- <button | ||
| </div> | |||
| <div class="clear"></div> | |||
| </li> | |||
| </ul> | |||
| </div> | |||
| <div class="product_detail" *ngFor="let product of data.product"> | |||
| <h6> | |||
| <span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span> | |||
| <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span> | |||
| </h6> | |||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | |||
| <h5>Amount : <strong>A$ {{product.price}}</strong></h5> | |||
| <h5>Delivery time : <span> 1 hour</span></h5> | |||
| <h4>DELIVERY</h4> | |||
| <h5 *ngIf="data.deliveryAddress"> | |||
| {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | |||
| <br /> | |||
| {{data.deliveryAddress.building}}, <br /> | |||
| {{data.deliveryAddress.landmark}} | |||
| </h5> | |||
| <!-- <button | |||
| class="cancel_btn" | class="cancel_btn" | ||
| (click)="goToPage('ordercancelled')" | (click)="goToPage('ordercancelled')" | ||
| > | > | ||
| BUY NOW | BUY NOW | ||
| </button> --> | </button> --> | ||
| <!-- <hr /> --> | <!-- <hr /> --> | ||
| </div> | </div> | ||
| <!-- <div class="related_product_slider"> | <!-- <div class="related_product_slider"> | ||
| <h5> | <h5> | ||
| <span class="floatLeft">Related Products</span | <span class="floatLeft">Related Products</span | ||
| ><span class="floatRight">MORE</span> | ><span class="floatRight">MORE</span> | ||
| ... | @@ -120,5 +120,5 @@ | ... | @@ -120,5 +120,5 @@ |
| </ion-slides> | </ion-slides> | ||
| </ul> | </ul> | ||
| </div> --> | </div> --> | ||
| </div> | </div> | ||
| </ion-content> | </ion-content> | ||
| \ No newline at end of file |
| <ion-content> | <ion-content> | ||
| <div class="cart_wrapper" *ngIf="data"> | <div class="cart_wrapper" *ngIf="data"> | ||
| <div class="cart_head"> | <div class="cart_head"> | ||
| <div class="nav_header"> | <div class="nav_header"> | ||
| <button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> | <ion-grid class="no-gutter"> | ||
| <img src="../assets/arrow_white.png" /> | <ion-row class="no-gutter"> | ||
| </button> | <ion-col class="no-gutter" size="2"> | ||
| <div class="nav_title floatLeft"> | <button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> | ||
| <h4></h4> | <img src="../assets/arrow_white.png" /> | ||
| </button> | |||
| </ion-col> | |||
| <ion-col class="no-gutter" size="8"> | |||
| <div class="nav_title floatLeft"> | |||
| <h4></h4> | |||
| </div> | |||
| </ion-col> | |||
| <ion-col class="no-gutter" size="2"> | |||
| <button class="nav_btn floatRight"></button> | |||
| </ion-col> | |||
| </ion-row> | |||
| </ion-grid> | |||
| </div> | |||
| <img src="../assets/white_tick.png" /> | |||
| <h4>ORDER IS PLACED</h4> | |||
| <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p> | |||
| </div> | </div> | ||
| <button class="nav_btn floatRight"></button> | <div class="order_status"> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | <div class="status_div go_green"> | ||
| <img src="../assets/white_tick.png" /> | <h4>{{data.orderCode}}</h4> | ||
| <h4>ORDER IS PLACED</h4> | <h6>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6> | ||
| <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p> | </div> | ||
| </div> | <!-- <div class="status_gap go_green"> | ||
| <div class="order_status"> | |||
| <div class="clear"></div> | |||
| <div class="status_div go_green"> | |||
| <h4>{{data.orderCode}}</h4> | |||
| <h6>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6> | |||
| </div> | |||
| <!-- <div class="status_gap go_green"> | |||
| </div> | </div> | ||
| <div class="status_div go_green"> | <div class="status_div go_green"> | ||
| <h4>Retailer Accepted</h4> | <h4>Retailer Accepted</h4> | ||
| ... | @@ -54,67 +63,63 @@ | ... | @@ -54,67 +63,63 @@ |
| <div class="status_div"> | <div class="status_div"> | ||
| <h4>Your product is delivered</h4> | <h4>Your product is delivered</h4> | ||
| </div> --> | </div> --> | ||
| </div> | </div> | ||
| <div class="nearby_shop_list"> | <div class="nearby_shop_list"> | ||
| <ul> | <ul> | ||
| <li (click)="goToPage('productlist')"> | <li (click)="goToPage('productlist')"> | ||
| <div class="nearby_image"> | <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> | ||
| <div class="nearby_detail"> | <div class="nearby_detail"> | ||
| <h5> | <h5> | ||
| <span class="floatLeft">{{data.shopperName}}</span> | <span class="floatLeft">{{data.shopperName}}</span> | ||
| <span class="floatRight">{{data.product[0].qty}} | <span class="floatRight">{{data.product[0].qty}} | ||
| <img src="../assets/Path61_2.png" /> | <img src="../assets/Path61_2.png" /> | ||
| </span> | </span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </h5> | |||
| <p class="prodName">{{unEscape(data.product[0].prodName)}}</p> | |||
| </div> | |||
| <div class="clear"></div> | |||
| </li> | |||
| </ul> | |||
| </div> | |||
| <div class="product_detail" *ngFor="let product of data.product"> | |||
| <h6> | |||
| <span *ngIf="product.color !== 'No-Color'">Color: {{product.color}}, </span> | |||
| <span *ngIf="product.size !== 'Any-Size'">Size: {{product.size}}</span> | |||
| </h6> | |||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | |||
| <h5> | |||
| Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span> | |||
| </h5> | </h5> | ||
| <p class="prodName">{{unEscape(data.product[0].prodName)}}</p> | <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7"> | ||
| </div> | Delivery time : <span>{{deliveryTime}}</span> | ||
| <div class="clear"></div> | </h5> | ||
| </li> | <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5> | ||
| </ul> | </div> | ||
| </div> | |||
| <div class="product_detail" *ngFor="let product of data.product"> | |||
| <h6> | |||
| <span *ngIf="product.color !== 'No-Color'">Color: {{product.color}}, </span> | |||
| <span *ngIf="product.size !== 'Any-Size'">Size: {{product.size}}</span> | |||
| </h6> | |||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | |||
| <h5> | |||
| Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span | |||
| class="afterpay">{{data.paymentMode}}</span> | |||
| </h5> | |||
| <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7"> | |||
| Delivery time : <span>{{deliveryTime}}</span> | |||
| </h5> | |||
| <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5> | |||
| </div> | |||
| <div class="product_detail"> | <div class="product_detail"> | ||
| <div class="delivery-wrap"> | <div class="delivery-wrap"> | ||
| <h4 class="floatLeft">DELIVERY</h4> | <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> | class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <h5 *ngIf="data.deliveryAddress"> | <h5 *ngIf="data.deliveryAddress"> | ||
| {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | ||
| <br /> | <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}} | ||
| {{data.deliveryAddress.building}}, <br /> | </h5> | ||
| {{data.deliveryAddress.landmark}} | <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"> | ||
| </h5> | |||
| <button class="cancel_btn" (click)="cancelOrder(data.orderId)" | |||
| *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"> | |||
| CANCEL THIS ORDER | CANCEL THIS ORDER | ||
| </button> | </button> | ||
| <!-- <hr /> --> | <!-- <hr /> --> | ||
| </div> | </div> | ||
| <!-- <div class="related_product_slider"> | <!-- <div class="related_product_slider"> | ||
| <h5> | <h5> | ||
| <span class="floatLeft">Related Products</span><span class="floatRight">MORE</span> | <span class="floatLeft">Related Products</span><span class="floatRight">MORE</span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| ... | @@ -169,5 +174,5 @@ | ... | @@ -169,5 +174,5 @@ |
| </ion-slides> | </ion-slides> | ||
| </ul> | </ul> | ||
| </div> --> | </div> --> | ||
| </div> | </div> | ||
| </ion-content> | </ion-content> | ||
| \ No newline at end of file |
| <ion-header> | <ion-header> | ||
| <div class="nav_header"> | <div class="nav_header"> | ||
| <ion-menu-toggle> | <ion-grid class="no-gutter"> | ||
| <button class="nav_btn nav_menu floatLeft"></button> | <ion-row class="no-gutter"> | ||
| </ion-menu-toggle> | <ion-col class="no-gutter" size="2"> | ||
| <div class="nav_title floatLeft"> | <ion-menu-toggle> | ||
| <img src="../../assets/Group [email protected]" /> | <button class="nav_btn nav_menu floatLeft"></button> | ||
| </div> | </ion-menu-toggle> | ||
| <div class="clear"></div> | </ion-col> | ||
| <ion-col class="no-gutter" size="8"> | |||
| <div class="nav_title floatLeft"> | |||
| <img src="../../assets/Group [email protected]" /> | |||
| </div> | |||
| </ion-col> | |||
| <ion-col class="no-gutter" size="2"></ion-col> | |||
| </ion-row> | |||
| </ion-grid> | |||
| </div> | </div> | ||
| </ion-header> | </ion-header> | ||
| ... | @@ -20,8 +28,9 @@ | ... | @@ -20,8 +28,9 @@ |
| <div class="profile_circle"> | <div class="profile_circle"> | ||
| <img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" /> | <img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" /> | ||
| <div class="edit"></div> | <div class="edit"> | ||
| <input type="file" accept="image/*;capture=camera" (change)="fileChange($event)" /> | <input type="file" accept="image/*;capture=camera" (change)="fileChange($event)" /> | ||
| </div> | |||
| </div> | </div> | ||
| <h5>{{loggedUser.name}}</h5> | <h5>{{loggedUser.name}}</h5> | ||
| ... | @@ -31,7 +40,7 @@ | ... | @@ -31,7 +40,7 @@ |
| <div class="account_header"> | <div class="account_header"> | ||
| <h5 class="floatLeft">ACCOUNT INFORMATION</h5> | <h5 class="floatLeft">ACCOUNT INFORMATION</h5> | ||
| <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img | <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img | ||
| src="../../assets/edit.png" /></span> | src="../../assets/edit.png" /></span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| ... | @@ -135,11 +144,11 @@ | ... | @@ -135,11 +144,11 @@ |
| <p>Are you sure to Logout ?</p> | <p>Are you sure to Logout ?</p> | ||
| <div class="logout_footer"> | <div class="logout_footer"> | ||
| <button class="btn-cancel floatLeft" (click)="istoggle();"> | <button class="btn-cancel floatLeft" (click)="istoggle();"> | ||
| Cancel | Cancel | ||
| </button> | </button> | ||
| <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> | <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> | ||
| Logout | Logout | ||
| </button> | </button> | ||
| </div> | </div> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| ... | ... |
Please
register
or
sign in
to comment