Compare commits
4 commits
518828be9d
...
0d5fa1a666
Author | SHA1 | Date | |
---|---|---|---|
0d5fa1a666 | |||
a45cbed63c | |||
f387604a04 | |||
58a5ca5656 |
7 changed files with 35 additions and 14 deletions
|
@ -140,6 +140,9 @@ export class DbExportComponent implements OnInit {
|
|||
this.orders[i].total + ',' +
|
||||
this.orders[i].price! + ',' +
|
||||
this.orders[i].totalZec + ',' +
|
||||
this.orders[i].taxAmount + ',' +
|
||||
this.orders[i].vatAmount + ',' +
|
||||
this.orders[i].tipAmount + ',' +
|
||||
paid + ',"' +
|
||||
this.orders[i].externalInvoice + '"' +
|
||||
'\n';
|
||||
|
|
|
@ -52,19 +52,19 @@
|
|||
</td>
|
||||
</tr>
|
||||
<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;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<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;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<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;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
|
|
|
@ -90,7 +90,10 @@ export class InvoiceComponent implements OnInit {
|
|||
invoiceCopyamountError : '',
|
||||
invoiceCopymemoError : '',
|
||||
invoiceInvalidId : '',
|
||||
invoiceInfoNotavail : ''
|
||||
invoiceInfoNotavail : '',
|
||||
invoiceTax : '',
|
||||
invoiceVAT : '',
|
||||
invoiceTip : ''
|
||||
};
|
||||
//
|
||||
constructor(
|
||||
|
@ -278,6 +281,9 @@ export class InvoiceComponent implements OnInit {
|
|||
this.vE.invoiceCopymemoError = response.data.invoice_copymemo_error;
|
||||
this.vE.invoiceInvalidId = response.data.invoice_invalid_id;
|
||||
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); }
|
||||
|
|
|
@ -155,19 +155,19 @@
|
|||
</td>
|
||||
</tr>
|
||||
<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;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<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;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<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;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
|
|
|
@ -87,7 +87,10 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
|
|||
listordersInvoiceBtn : '',
|
||||
listordersReceiptBtn : '',
|
||||
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.listordersNoOrders = response.data.listorders_no_orders;
|
||||
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); }
|
||||
|
|
|
@ -52,19 +52,19 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr *ngIf="order.taxAmount > 0">
|
||||
<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptTax }}</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;"></td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr *ngIf="order.vatAmount > 0">
|
||||
<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptVAT }}</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;"></td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr *ngIf="order.tipAmount > 0">
|
||||
<td class="newOrdertbdetail" style="text-align: right;">Tip</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptTip }}</td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;"></td>
|
||||
<td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
|
||||
<td></td>
|
||||
|
|
|
@ -56,7 +56,10 @@ export class ReceiptComponent implements OnInit {
|
|||
receiptQtyLbl : '',
|
||||
receiptOrderPrice : '',
|
||||
receiptInvalidId : '',
|
||||
receiptInfoNotavail : ''
|
||||
receiptInfoNotavail : '',
|
||||
receiptTax : '',
|
||||
receiptVAT : '',
|
||||
receiptTip : ''
|
||||
}
|
||||
|
||||
constructor(
|
||||
|
@ -102,6 +105,9 @@ export class ReceiptComponent implements OnInit {
|
|||
this.vE.receiptOrderPrice = response.data.receipt_order_price;
|
||||
this.vE.receiptInvalidId = response.data.receipt_invalid_id;
|
||||
this.vE.receiptInfoNotavail = response.data.receipt_info_notavail;
|
||||
this.vE.receiptTax = response.data.receipt_tax;
|
||||
this.vE.receiptVAT = response.data.receipt_vat;
|
||||
this.vE.receiptTip = response.data.receipt_tip;
|
||||
},
|
||||
error => { console.log('Error >> ',error); }
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue