Commit modificaciones RVA - 20220714

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;
+}

src/app/items/item-list/item-list.component.html

@@ -21,10 +21,10 @@
 						</td>
 						<td>
 							<div class="rv_price" *ngIf="!owner.zats">
-  							   {{item.cost | currency: getCurrency() }}    
+								<img class="icon" 
-								[<img class="icon" 
 								     src="/assets/zec_rv.png" 
-								     height="18px" />{{(item.cost/price) | number: '1.0-6'}}]
+								     height="16px">{{(item.cost/price) | number: '1.06'}}
+								[{{item.cost | number: '1.02' | currency: getCurrency() }}]    
 							</div>
 							<p class="price" *ngIf="owner.zats"> &#x24e9;(item.cost/price)*100000000 | number: '1.0-0'}}</p>
 						</td>
@@ -42,6 +42,13 @@
 							</button>
 						</td>
 						<td align="right">
+<!--
+							<button class="btn">
+								<fa-icon  [icon]="getIcon(order)" >
+									
+								</fa-icon>
+							</button>	
+-->
 							<button mat-raised-button color="primary" class="icons" (click)="addToOrder(item._id!)">
 								<mat-icon>shopping_cart</mat-icon>
 							</button>

src/app/listorders/listorders.component.css

@@ -31,6 +31,7 @@
 
 img.icon{
 	margin-bottom: -2px;
+	height: 18px;
 }
 
 .price{

src/app/listorders/listorders.component.html

@@ -16,7 +16,7 @@
 				   <img src="/assets/zec_rv.png" 
 						style='height: 16px !important;
 						       margin: -2px;'/>
-				   {{todayTotal | number: '1.0-6'}}
+				   {{todayTotal | number: '1.06'}}
 				</div>
 			</td>
 			<td width="50%" align="center">
@@ -25,7 +25,7 @@
 				   <img src="/assets/zec_rv.png" 
 						style='height: 16px !important;
 						       margin: -2px;'/>
-				   {{total | number: '1.0-6'}}
+				   {{total | number: '1.06'}}
 				</div>
 			</td>
 		</tr>
@@ -63,17 +63,97 @@
 				</mat-expansion-panel-header>
 				<div class='orderheader'>
 					<div class="text2"> <b>Order Id</b>: {{order._id}}</div>
-					<div class="text2"><b>ZCash price</b>: {{order.price | currency: order.currency.toUpperCase()}}
-					</div>
 		  		</div>
-				<mat-list>
+<!-- 
+     order header
+-->      
+				<table style="width: 100%;" 
+				       cellspacing="0">
+					<tr style="font-family: Roboto Mono;
+					           font-size: 19px;
+					           font-weight: 700;
+					           height: 20px;">
+						<td width="50%">Order Total:</td>
+						<td align="right"
+						    width="50%">	
+							<img class="icon" src="/assets/zec_rv.png"
+							>{{ order.totalZec  | number: '1.06'}}
+						</td>
+					</tr>
+					<tr style="font-family: Roboto Mono;
+					           font-size: 16px;
+					           font-weight: 400;
+					           height: 18px;">
+						<td width="50%">
+							<img class="icon" 
+							     style="color: lightgray; 
+							            margin-bottom: -3px;" 
+							     src="/assets/zec_rv.png"
+							>1.0 = {{ order.price | currency: order.currency.toUpperCase()}}
+						</td>
+						<td width="50%" align="right">
+							{{ order.total | number: '1.02' | currency: order.currency.toUpperCase()}}
+						</td>
+					</tr>
+				</table>
+
+				<table style="width: 100%;">
+		<!--			
+					<div style="display: block;">
+		-->
+		            <thead style="width: 100%;">
+						<tr style="background: lightblue;">
+							<th style= "font-family:  Roboto Mono;
+										font-size: 14px;
+										font-weight: 700;
+										text-align: left;" 
+								width="55%">Item
+							</th>
+							<th style= "font-family:  Roboto Mono;
+										font-size: 14px;
+										font-weight: 700;
+										text-align: left;" 
+								width="15%">Qty.
+							</th>
+							<th style= "font-family:  Roboto Mono;
+										font-size: 14px;
+										font-weight: 700;
+										text-align: right;" 
+							    width="30%">Total
+							</th>
+						</tr>
+					</thead>	
+		<!--
+				    </div>
+		-->
+				    <tbody style="overflow-y: auto;    
+							      overflow-x: hidden;">
+						<tr style="height: 20px !important;" 
+						    *ngFor="let item of order.lines">
+							<td class="tbdetail" 
+							    style="text-align: left;" 
+								width="55%">{{item.name}}
+							</td>
+							<td class="tbdetail" 
+							    style="text-align: left;" 
+								width="15%">{{item.qty}}
+							</td>
+							<td class="tbdetail" 
+							    style="text-align: right;" 
+							    width="30%">{{item.qty * item.cost | number:'1.02' | currency: order.currency.toUpperCase() }} 
+							</td>
+						</tr>
+					</tbody>
+				</table>
 <!--					
+				<mat-list>
 					<mat-list-item class="text small" *ngFor="let item of order.lines">{{item.qty}} x {{item.name}}</mat-list-item>
--->
+
 					<div class="orderdetail" *ngFor="let item of order.lines">
 						{{ item.name }} Qty.: {{ item.qty }} 
 					</div>	
 				</mat-list>
+-->
 			</mat-expansion-panel>
 		</mat-accordion>
 		<p class="text" *ngIf = "orders.length <= 0">No orders</p>

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;";
 
 	}
 

src/app/order/order.component.html

@@ -12,23 +12,30 @@
 			<table style="width: 100%;" 
 			       cellspacing="0">
 				<tr style="font-family: Roboto Mono;
-				           font-size: 18px;
+				           font-size: 19px;
 				           font-weight: 700;
 				           height: 20px;">
 					<td width="50%">Order Total:</td>
-					<td width="50%" align="right">
+					<td align="right"
-						{{total | currency: getCurrency()}}
+					    width="50%">	
+						<img class="icon" src="/assets/zec_rv.png" 
+						>{{(total/price) | number: '1.0-6'}}
 					</td>
 				</tr>
 				<tr style="font-family: Roboto Mono;
-				           font-size: 18px;
+				           font-size: 16px;
-				           font-weight: 700;
+				           font-weight: 400;
-				           height: 20px;">
+				           height: 18px;">
-					<td width="50%"> </td>
+					<td width="50%">
-					<td align="right"
+						<img class="icon" 
-					    width="50%">	
+						     style="color: lightgray; 
-						<img class="icon" src="/assets/zec_rv.png" >
+						            margin-bottom: -3px;" 
-						{{(total/price) | number: '1.0-6'}}
+						     src="/assets/zec_rv.png"
+						>1.0 &cong; {{ price | currency: getCurrency()}}
+
+					</td>
+					<td width="50%" align="right">
+						{{total | currency: getCurrency()}}
 					</td>
 				</tr>
 			</table>
@@ -64,7 +71,8 @@
 -->
 		    <tbody style="overflow-y: auto;    
 					      overflow-x: hidden;">
-				<tr style="height: 20px !important;" *ngFor="let item of order.lines">
+				<tr style="height: 20px !important;" 
+				    *ngFor="let item of order.lines">
 					<td class="tbdetail" 
 					    style="text-align: left;" 
 						width="55%">{{item.name}}
@@ -75,7 +83,7 @@
 					</td>
 					<td class="tbdetail" 
 					    style="text-align: right;" 
-					    width="30%">{{item.qty * item.cost | number:'1.02'}} 
+					    width="30%">{{item.qty * item.cost | number:'1.02' | currency: getCurrency() }} 
 					</td>
 				</tr>
 			</tbody>
@@ -98,7 +106,7 @@
 	</mat-card-actions>
 </mat-card>
 <div style="font-family: Roboto Mono;
-            font-size: 14PX;
+            font-size: 18px;
             font-weight: 700;
             margin-left: 10px;
             margin-top: 5px;" >