diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html index abfffe1ae..cf307959a 100644 --- a/modules/invoiceOut/front/global-invoicing/index.html +++ b/modules/invoiceOut/front/global-invoicing/index.html @@ -1,4 +1,4 @@ - +
{{'Calculating packages to invoice...'}}
Invoicing
@@ -19,7 +19,7 @@ Nickname Address id Street - + Error @@ -41,20 +41,12 @@ {{::client.address.street}} - + - - - - + {{::client.error}} diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js index dd992a39c..9ae3b498c 100644 --- a/modules/invoiceOut/front/global-invoicing/index.js +++ b/modules/invoiceOut/front/global-invoicing/index.js @@ -10,10 +10,6 @@ class Controller extends Section { maxShipped: new Date(), companyFk: this.vnConfig.companyFk }; - - this.invoice.invoiceDate = new Date(); - this.invoice.companyFk = 442; - this.invoice.printerFk = 1; } $onInit() { @@ -84,7 +80,6 @@ class Controller extends Section { return this.$http.post(`InvoiceOuts/invoiceClient`, params) .then(() => { - this.$.data[index].status = 'ok'; this.$.data.shift(); }).catch(res => { this.$.data[index].status = 'error'; diff --git a/modules/invoiceOut/front/global-invoicing/style.scss b/modules/invoiceOut/front/global-invoicing/style.scss index 980c7bc5f..ae50adf6e 100644 --- a/modules/invoiceOut/front/global-invoicing/style.scss +++ b/modules/invoiceOut/front/global-invoicing/style.scss @@ -2,17 +2,14 @@ vn-invoice-out-global-invoicing{ - vn-td { - vn-icon[icon=clear] { - color: $color-alert; - } - vn-icon[icon=check] { - color: $color-success; - } - } - h5{ color: $color-primary; } + .vn-table vn-tbody > * > vn-td { + overflow: visible; + } + } + +