Compare commits

..

4 commits

7 changed files with 35 additions and 14 deletions

View file

@ -39,8 +39,8 @@ export class DbExportComponent implements OnInit {
expiration: new Date(Date.now()).toISOString(), expiration: new Date(Date.now()).toISOString(),
payconf: false, payconf: false,
crmToken: '', crmToken: '',
viewkey: '', viewkey: '',
tips: false tips: false
}; };
_ordersOk = false; _ordersOk = false;
@ -140,6 +140,9 @@ export class DbExportComponent implements OnInit {
this.orders[i].total + ',' + this.orders[i].total + ',' +
this.orders[i].price! + ',' + this.orders[i].price! + ',' +
this.orders[i].totalZec + ',' + this.orders[i].totalZec + ',' +
this.orders[i].taxAmount + ',' +
this.orders[i].vatAmount + ',' +
this.orders[i].tipAmount + ',' +
paid + ',"' + paid + ',"' +
this.orders[i].externalInvoice + '"' + this.orders[i].externalInvoice + '"' +
'\n'; '\n';

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>

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

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>

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

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.receiptTax }}</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.receiptVAT }}</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.receiptTip }}</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>

View file

@ -56,7 +56,10 @@ export class ReceiptComponent implements OnInit {
receiptQtyLbl : '', receiptQtyLbl : '',
receiptOrderPrice : '', receiptOrderPrice : '',
receiptInvalidId : '', receiptInvalidId : '',
receiptInfoNotavail : '' receiptInfoNotavail : '',
receiptTax : '',
receiptVAT : '',
receiptTip : ''
} }
constructor( constructor(
@ -102,6 +105,9 @@ export class ReceiptComponent implements OnInit {
this.vE.receiptOrderPrice = response.data.receipt_order_price; this.vE.receiptOrderPrice = response.data.receipt_order_price;
this.vE.receiptInvalidId = response.data.receipt_invalid_id; this.vE.receiptInvalidId = response.data.receipt_invalid_id;
this.vE.receiptInfoNotavail = response.data.receipt_info_notavail; 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); } error => { console.log('Error >> ',error); }
); );