Commit 157f1ec7 by Adarsh K

Orderplaced Design fix

parent ac89f925
...@@ -66,41 +66,42 @@ ...@@ -66,41 +66,42 @@
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
<ul> <ul>
<li> <li *ngFor="let product of data.product; let i = index">
<div class="nearby_image"> <div class="nearby_image">
<img [src]="data.product[0].image" <img [src]="product.image" onerror="this.src='../assets/[email protected]'" />
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">{{unEscape(product.prodName)}}</span>
<span class="floatRight">{{data.product[0].qty}} <span class="floatRight">0
<img src="../assets/Path61_2.png" /> <img src="../assets/Path61_2.png" />
</span> </span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<p class="prodName">{{unEscape(data.product[0].prodName)}}</p> <p class="prodName"></p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> <div class="product_detail">
</ul>
</div>
<div class="product_detail" *ngFor="let product of data.product; let i = index">
<h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7 && i == 0"> <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7 && i == 0">
Delivery time : <span><b>{{deliveryTime}}</b></span> Delivery time : <span><b>{{deliveryTime}}</b></span>
</h5> </h5>
<h6> <h6>
<!-- <span *ngIf="product.color !== 'No-Color'">Product: {{unEscape(product.prodName)}},
</span> -->
<span *ngIf="product.color !== 'No-Color'">Color: {{product.color}}, </span> <span *ngIf="product.color !== 'No-Color'">Color: {{product.color}}, </span>
<span *ngIf="product.size !== 'Any-Size'">Size: {{product.size}}</span> <span *ngIf="product.size !== 'Any-Size'">Size: {{product.size}}</span>
</h6> </h6>
<h5>Quantity : <span>{{product.qty}}</span></h5> <h5>Quantity : <span>{{product.qty}}</span></h5>
<h5> <h5>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong>
class="afterpay">{{data.paymentMode}}</span>
</h5> </h5>
<h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5> <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5>
</div> </div>
</li>
</ul>
</div>
<div class="product_detail"> <div class="product_detail">
......
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
padding-right: 10px; padding-right: 10px;
li { li {
list-style: none; list-style: none;
padding-bottom: 10px; border-bottom: 1px solid #e8e8e8;
margin-bottom: 30px;
.nearby_image { .nearby_image {
width: 120px; width: 120px;
height: 120px; height: 120px;
......
...@@ -34,7 +34,7 @@ export class OrderplacedPage implements OnInit { ...@@ -34,7 +34,7 @@ export class OrderplacedPage implements OnInit {
ionViewWillEnter() { ionViewWillEnter() {
this.deliveryTime = '00:00:00'; this.deliveryTime = '00:00:00';
this.service.get('order').then(val => { this.service.get('order').then(val => {
console.log(val); console.log('My Orders value', val);
this.data = val; this.data = val;
const This = this; const This = this;
console.log(Math.round(Date.now() / 1000) + ' < ' + this.data.bookDate.seconds); console.log(Math.round(Date.now() / 1000) + ' < ' + this.data.bookDate.seconds);
......
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