verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-02-20 08:24:24 +01:00
parent c8623ef3da a33a63f866
commit d22a69f546
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/selectors.js
View File

@ -491,7 +491,7 @@ export default {
saveButton: `${components.vnSubmit}` saveButton: `${components.vnSubmit}`
}, },
orderLine: { orderLine: {
orderSubtotal: 'vn-order-line > vn-vertical > vn-card > div > vn-vertical > vn-horizontal > div > span', orderSubtotal: 'vn-order-line vn-horizontal.header p:nth-child(1)',
firstLineDeleteButton: 'vn-order-line vn-tbody > vn-tr:nth-child(1) vn-icon[icon="delete"]', firstLineDeleteButton: 'vn-order-line vn-tbody > vn-tr:nth-child(1) vn-icon[icon="delete"]',
confirmOrder: 'vn-order-line > vn-vertical > vn-button-bar > vn-button > button', confirmOrder: 'vn-order-line > vn-vertical > vn-button-bar > vn-button > button',
confirmButton: 'vn-order-line > vn-confirm button[response="ACCEPT"]', confirmButton: 'vn-order-line > vn-confirm button[response="ACCEPT"]',

17
modules/order/front/line/index.html
View File

@ -5,17 +5,12 @@
<vn-vertical> <vn-vertical>
<vn-card pad-large> <vn-card pad-large>
<vn-vertical> <vn-vertical>
<vn-horizontal> <vn-horizontal class="header">
<div class="totalBox"> <vn-one class="taxes" ng-if="$ctrl.rows.length > 0">
<vn-label translate>Subtotal</vn-label> <p><vn-label translate>Subtotal</vn-label> {{$ctrl.subtotal | currency: 'EUR':2}}</p>
<span>{{$ctrl.subtotal | currency: 'EUR':2}}</span> <p><vn-label translate>VAT</vn-label> {{$ctrl.VAT | currency: 'EUR':2}}</p>
<p> <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.order.total | currency: 'EUR':2}}</strong></p>
<vn-label translate>VAT</vn-label> </vn-one>
<span>{{$ctrl.VAT | currency: 'EUR':2}}</span>
</p>
<vn-label><strong>Total</strong></vn-label>
<strong>{{$ctrl.order.total | currency: 'EUR':2}}</strong>
</div>
</vn-horizontal> </vn-horizontal>
<vn-table> <vn-table>
<vn-thead> <vn-thead>

16
modules/order/front/line/style.scss
View File

@ -6,4 +6,20 @@ vn-order-line{
height: 50px; height: 50px;
} }
} }
.taxes {
max-width: 10em;
border: .1em solid #CCC;
text-align: right;
padding: .5em !important;
& > p {
font-size: 1.2em;
margin: .2em;
}
}
vn-horizontal.header {
justify-content: flex-end;
margin-bottom: 0.5em;
}
} }