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

Fix 0000072 - Tax, VAT and Tip language translation completed for invoice component

Browse source
This commit is contained in:
Rene V. Vergara A. 2023-10-24 20:51:39 -04:00
parent f387604a04
commit a45cbed63c
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/invoice/invoice.component.html
View file

@ -52,19 +52,19 @@
</td> </td>
</tr> </tr>
<tr *ngIf="order.taxAmount > 0"> <tr *ngIf="order.taxAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceTax }}</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 *ngIf="order.vatAmount > 0"> <tr *ngIf="order.vatAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceVAT }}</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 *ngIf="order.tipAmount > 0"> <tr *ngIf="order.tipAmount > 0">
<td class="newOrdertbdetail" style="text-align: right;">Tip</td> <td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceTip }}</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/invoice/invoice.component.ts
View file

@ -90,7 +90,10 @@ export class InvoiceComponent implements OnInit {
invoiceCopyamountError : '', invoiceCopyamountError : '',
invoiceCopymemoError : '', invoiceCopymemoError : '',
invoiceInvalidId : '', invoiceInvalidId : '',
invoiceInfoNotavail : '' invoiceInfoNotavail : '',
invoiceTax : '',
invoiceVAT : '',
invoiceTip : ''
}; };
// //
constructor( constructor(
@ -278,6 +281,9 @@ export class InvoiceComponent implements OnInit {
this.vE.invoiceCopymemoError = response.data.invoice_copymemo_error; this.vE.invoiceCopymemoError = response.data.invoice_copymemo_error;
this.vE.invoiceInvalidId = response.data.invoice_invalid_id; this.vE.invoiceInvalidId = response.data.invoice_invalid_id;
this.vE.invoiceInfoNotavail = response.data.invoice_info_notavail; this.vE.invoiceInfoNotavail = response.data.invoice_info_notavail;
this.vE.invoiceTax = response.data.invoice_tax;
this.vE.invoiceVAT = response.data.invoice_vat;
this.vE.invoiceTip = response.data.invoice_tip;
}, },
error => { console.log('Error >> ',error); } error => { console.log('Error >> ',error); }