verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

summary con chip
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Javi Gallego 2021-06-15 09:58:21 +02:00
parent 5369e8d97e
commit 500b68162b
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoiceIn/back/methods/invoice-in/summary.js
View File

@ -67,7 +67,7 @@ module.exports = Self => {
{
relation: 'currency',
scope: {
fields: ['id', 'name']
fields: ['id', 'code']
}
}

2
modules/invoiceIn/front/routes.json
View File

@ -15,7 +15,7 @@
},
{
"state": "invoiceIn.card.tax",
"icon": "contact_support"
"icon": "icon-lines"
},
{
"state": "invoiceIn.card.log",

15
modules/invoiceIn/front/summary/index.html
View File

@ -18,7 +18,7 @@
</vn-label-value>
<vn-label-value label="Supplier ref" value="{{$ctrl.summary.supplierRef}}">
</vn-label-value>
<vn-label-value label="Currency" value="{{$ctrl.summary.currency.name}}">
<vn-label-value label="Currency" value="{{$ctrl.summary.currency.code}}">
</vn-label-value>
<vn-label-value label="Doc number" value="{{$ctrl.summary.serial}}/{{$ctrl.summary.serialNumber}}">
</vn-label-value>
@ -45,10 +45,15 @@
</vn-check>
</vn-vertical>
</vn-one>
<vn-one class="taxes">
<p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.totalWithoutVat | currency: 'EUR':2}}</p>
<p><vn-label translate>VAT</vn-label> {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}</p>
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.totalWithVat | currency: 'EUR':2}}</strong></p>
<vn-one tbody class="taxes">
<span td class="chip"><vn-label translate>taxable base</vn-label> {{2 | currency: 'EUR':2}}</spant>
<p><vn-label translate>total</vn-label> {{3 | currency: $ctrl.summary.currency.code:2}}</p>
<vn-label>Due day</vn-label>
<vn-chip
class="transparent"
translate-attr=" 1 != 2 && 2 != 3 ? {title: 'No coinciden'} : {title: 'Vencimiento'}"
ng-class="{'alert': 1 != 2 && 2 != 3}">{{2 | currency: 'EUR':2}}
</vn-chip>
</vn-one>
</vn-horizontal>
</vn-auto>

1
modules/invoiceIn/front/tax/index.html
View File

@ -38,6 +38,7 @@
<tpl-item>{{id}}: {{name}}</tpl-item>
</vn-autocomplete>
<vn-input-number vn-one
disabled="$ctrl.currency.code != 'EUR'"
type="number"
label="taxable base"
ng-model="invoiceInTax.taxableBase"