Vergara_Tech/zgo
Vergara_Tech
/
zgo
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Fix 0000073 - Tax, VAT and Tip fields added in listorders for translation module

This commit is contained in:
Rene V. Vergara A. 2023-10-24 20:05:07 -04:00
parent 58a5ca5656
commit f387604a04
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/listorders/listorders.component.html
View File

@ -155,19 +155,19 @@
</td> </td>
</tr> </tr>
<tr class="tbdetail" *ngIf="order.taxAmount > 0"> <tr class="tbdetail" *ngIf="order.taxAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersTax }}</td>
<td class="newOrdertbdetail" style="text-align: right;"></td> <td class="newOrdertbdetail" style="text-align: right;"></td>
<td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td> <td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
<td></td> <td></td>
</tr> </tr>
<tr class="tbdetail" *ngIf="order.vatAmount > 0"> <tr class="tbdetail" *ngIf="order.vatAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersVAT }}</td>
<td class="newOrdertbdetail" style="text-align: right;"></td> <td class="newOrdertbdetail" style="text-align: right;"></td>
<td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td> <td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
<td></td> <td></td>
</tr> </tr>
<tr class="tbdetail" *ngIf="order.tipAmount > 0"> <tr class="tbdetail" *ngIf="order.tipAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Tip</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersTip }}</td>
<td class="newOrdertbdetail" style="text-align: right;"></td> <td class="newOrdertbdetail" style="text-align: right;"></td>
<td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td> <td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
<td></td> <td></td>

8
src/app/listorders/listorders.component.ts
View File

@ -87,7 +87,10 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
listordersInvoiceBtn : '', listordersInvoiceBtn : '',
listordersReceiptBtn : '', listordersReceiptBtn : '',
listordersNoOrders : '', listordersNoOrders : '',
listordersEndDate : '' listordersEndDate : '',
listordersTax : '',
listordersVAT : '',
listordersTip : ''
} }
// //
@ -244,6 +247,9 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
this.vE.listordersReceiptBtn = response.data.listorders_receipt_btn; this.vE.listordersReceiptBtn = response.data.listorders_receipt_btn;
this.vE.listordersNoOrders = response.data.listorders_no_orders; this.vE.listordersNoOrders = response.data.listorders_no_orders;
this.vE.listordersEndDate = response.data.listorders_end_date; this.vE.listordersEndDate = response.data.listorders_end_date;
this.vE.listordersTax = response.data.listorders_tax;
this.vE.listordersVAT = response.data.listorders_vat;
this.vE.listordersTip = response.data.listorders_tip;
}, },
error: error => { console.log('Error >> ',error); } error: error => { console.log('Error >> ',error); }