diff --git a/src/app/items/item-list/item-list.component.css b/src/app/items/item-list/item-list.component.css index 77b855e..1a8e670 100644 --- a/src/app/items/item-list/item-list.component.css +++ b/src/app/items/item-list/item-list.component.css @@ -34,3 +34,18 @@ p.price{ font-size: 16px; text-align: right; } + + /* Style buttons */ +.btn { + background-color: DodgerBlue; /* Blue background */ + border: none; /* Remove borders */ + color: white; /* White text */ + padding: 12px 16px; /* Some padding */ + font-size: 16px; /* Set a font size */ + cursor: pointer; /* Mouse pointer on hover */ +} + +/* Darker background on mouse-over */ +.btn:hover { + background-color: RoyalBlue; +} diff --git a/src/app/items/item-list/item-list.component.html b/src/app/items/item-list/item-list.component.html index fcc3f11..993d0e6 100644 --- a/src/app/items/item-list/item-list.component.html +++ b/src/app/items/item-list/item-list.component.html @@ -21,10 +21,10 @@
- {{item.cost | currency: getCurrency() }} - [{{(item.cost/price) | number: '1.0-6'}}] + height="16px">{{(item.cost/price) | number: '1.06'}} + [{{item.cost | number: '1.02' | currency: getCurrency() }}]

ⓩ(item.cost/price)*100000000 | number: '1.0-0'}}

@@ -42,6 +42,13 @@ + diff --git a/src/app/listorders/listorders.component.css b/src/app/listorders/listorders.component.css index 6c87d46..04c27d7 100644 --- a/src/app/listorders/listorders.component.css +++ b/src/app/listorders/listorders.component.css @@ -31,6 +31,7 @@ img.icon{ margin-bottom: -2px; + height: 18px; } .price{ diff --git a/src/app/listorders/listorders.component.html b/src/app/listorders/listorders.component.html index 1d2cd43..4e42ba8 100644 --- a/src/app/listorders/listorders.component.html +++ b/src/app/listorders/listorders.component.html @@ -16,7 +16,7 @@ - {{todayTotal | number: '1.0-6'}} + {{todayTotal | number: '1.06'}} @@ -25,7 +25,7 @@ - {{total | number: '1.0-6'}} + {{total | number: '1.06'}} @@ -63,17 +63,97 @@
Order Id: {{order._id}}
-
ZCash price: {{order.price | currency: order.currency.toUpperCase()}} -
- + + + + + + + + + + +
Order Total: + {{ order.totalZec | number: '1.06'}} +
+ 1.0 = {{ order.price | currency: order.currency.toUpperCase()}} + + {{ order.total | number: '1.02' | currency: order.currency.toUpperCase()}} +
+ + + + + + + + + + + + + + + + + + +
Item + Qty. + Total +
{{item.name}} + {{item.qty}} + {{item.qty * item.cost | number:'1.02' | currency: order.currency.toUpperCase() }} +
+
{{ item.name }} Qty.: {{ item.qty }}
+-->

No orders

diff --git a/src/app/listorders/listorders.component.ts b/src/app/listorders/listorders.component.ts index 20bf397..fdf4aee 100644 --- a/src/app/listorders/listorders.component.ts +++ b/src/app/listorders/listorders.component.ts @@ -77,7 +77,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{ getIconStyle(order : Order) { if( order.paid ) return "font-size: 14px; color: #72cc50; margin-bottom: -2px;"; - return "color: #88293d; cursor: pointer;"; + return "color: #FB4F14; margin-bottom: -2px; cursor: pointer;"; } diff --git a/src/app/order/order.component.html b/src/app/order/order.component.html index 910c5ee..a81ca57 100644 --- a/src/app/order/order.component.html +++ b/src/app/order/order.component.html @@ -12,23 +12,30 @@ - - - +
Order Total: - {{total | currency: getCurrency()}} + + {{(total/price) | number: '1.0-6'}}
- - {{(total/price) | number: '1.0-6'}} + font-size: 16px; + font-weight: 400; + height: 18px;"> + + 1.0 ≅ {{ price | currency: getCurrency()}} + + + {{total | currency: getCurrency()}}
@@ -64,7 +71,8 @@ --> - + {{item.name}} @@ -75,7 +83,7 @@ {{item.qty * item.cost | number:'1.02'}} + width="30%">{{item.qty * item.cost | number:'1.02' | currency: getCurrency() }} @@ -98,7 +106,7 @@