From 500b68162b6eaae7200af0e7738ed502b6ab0e97 Mon Sep 17 00:00:00 2001 From: jgallego Date: Tue, 15 Jun 2021 09:58:21 +0200 Subject: [PATCH] summary con chip --- .../invoiceIn/back/methods/invoice-in/summary.js | 2 +- modules/invoiceIn/front/routes.json | 2 +- modules/invoiceIn/front/summary/index.html | 15 ++++++++++----- modules/invoiceIn/front/tax/index.html | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/invoiceIn/back/methods/invoice-in/summary.js b/modules/invoiceIn/back/methods/invoice-in/summary.js index b99102ba1..692b66228 100644 --- a/modules/invoiceIn/back/methods/invoice-in/summary.js +++ b/modules/invoiceIn/back/methods/invoice-in/summary.js @@ -67,7 +67,7 @@ module.exports = Self => { { relation: 'currency', scope: { - fields: ['id', 'name'] + fields: ['id', 'code'] } } diff --git a/modules/invoiceIn/front/routes.json b/modules/invoiceIn/front/routes.json index 30f2b5dc8..504910aae 100644 --- a/modules/invoiceIn/front/routes.json +++ b/modules/invoiceIn/front/routes.json @@ -15,7 +15,7 @@ }, { "state": "invoiceIn.card.tax", - "icon": "contact_support" + "icon": "icon-lines" }, { "state": "invoiceIn.card.log", diff --git a/modules/invoiceIn/front/summary/index.html b/modules/invoiceIn/front/summary/index.html index 507f1bcea..47b89f7e8 100644 --- a/modules/invoiceIn/front/summary/index.html +++ b/modules/invoiceIn/front/summary/index.html @@ -18,7 +18,7 @@ - + @@ -45,10 +45,15 @@ - -

Subtotal {{$ctrl.summary.totalWithoutVat | currency: 'EUR':2}}

-

VAT {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}

-

Total {{$ctrl.summary.totalWithVat | currency: 'EUR':2}}

+ + taxable base {{2 | currency: 'EUR':2}} +

total {{3 | currency: $ctrl.summary.currency.code:2}}

+ Due day + {{2 | currency: 'EUR':2}} +
diff --git a/modules/invoiceIn/front/tax/index.html b/modules/invoiceIn/front/tax/index.html index 57ea04dd0..ffd590c9a 100644 --- a/modules/invoiceIn/front/tax/index.html +++ b/modules/invoiceIn/front/tax/index.html @@ -38,6 +38,7 @@ {{id}}: {{name}}