Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
44d59d5e55
|
@ -130,4 +130,4 @@ input::-webkit-inner-spin-button {
|
||||||
appearance: none;
|
appearance: none;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
}
|
}
|
|
@ -499,6 +499,7 @@ export default {
|
||||||
request: 'Request',
|
request: 'Request',
|
||||||
weight: 'Weight',
|
weight: 'Weight',
|
||||||
goTo: 'Go to',
|
goTo: 'Go to',
|
||||||
|
summaryAmount: 'Summary',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
claim: {
|
claim: {
|
||||||
|
|
|
@ -498,6 +498,7 @@ export default {
|
||||||
request: 'Petición de compra',
|
request: 'Petición de compra',
|
||||||
weight: 'Peso',
|
weight: 'Peso',
|
||||||
goTo: 'Ir a',
|
goTo: 'Ir a',
|
||||||
|
summaryAmount: 'Resumen',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
claim: {
|
claim: {
|
||||||
|
|
|
@ -131,22 +131,6 @@ async function changeState(value) {
|
||||||
</QBtnDropdown>
|
</QBtnDropdown>
|
||||||
</template>
|
</template>
|
||||||
<template #body>
|
<template #body>
|
||||||
<QCard class="vn-max">
|
|
||||||
<div class="taxes">
|
|
||||||
<VnLv
|
|
||||||
:label="t('ticket.summary.subtotal')"
|
|
||||||
:value="toCurrency(ticket.totalWithoutVat)"
|
|
||||||
/>
|
|
||||||
<VnLv
|
|
||||||
:label="t('ticket.summary.vat')"
|
|
||||||
:value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
|
|
||||||
/>
|
|
||||||
<VnLv
|
|
||||||
:label="t('ticket.summary.total')"
|
|
||||||
:value="toCurrency(ticket.totalWithVat)"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</QCard>
|
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="ticketUrl + 'basic-data/step-one'"
|
:url="ticketUrl + 'basic-data/step-one'"
|
||||||
|
@ -236,7 +220,7 @@ async function changeState(value) {
|
||||||
:value="formattedAddress()"
|
:value="formattedAddress()"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one" v-if="ticket.notes.length">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="ticketUrl + 'observation'"
|
:url="ticketUrl + 'observation'"
|
||||||
:text="t('ticket.pageTitles.notes')"
|
:text="t('ticket.pageTitles.notes')"
|
||||||
|
@ -258,6 +242,23 @@ async function changeState(value) {
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
</QCard>
|
</QCard>
|
||||||
|
<QCard class="vn-one">
|
||||||
|
<VnTitle :text="t('ticket.summary.summaryAmount')" />
|
||||||
|
<div class="bodyCard">
|
||||||
|
<VnLv
|
||||||
|
:label="t('ticket.summary.subtotal')"
|
||||||
|
:value="toCurrency(ticket.totalWithoutVat)"
|
||||||
|
/>
|
||||||
|
<VnLv
|
||||||
|
:label="t('ticket.summary.vat')"
|
||||||
|
:value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
|
||||||
|
/>
|
||||||
|
<VnLv
|
||||||
|
:label="t('ticket.summary.total')"
|
||||||
|
:value="toCurrency(ticket.totalWithVat)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</QCard>
|
||||||
<QCard class="vn-max">
|
<QCard class="vn-max">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="ticketUrl + 'sale'"
|
:url="ticketUrl + 'sale'"
|
||||||
|
@ -448,21 +449,10 @@ async function changeState(value) {
|
||||||
.notes {
|
.notes {
|
||||||
width: max-content;
|
width: max-content;
|
||||||
}
|
}
|
||||||
.cardSummary .summaryBody > .q-card > .taxes {
|
|
||||||
border: 2px solid gray;
|
.q-card.q-card--dark.q-dark.vn-one {
|
||||||
padding: 0;
|
& > .bodyCard {
|
||||||
> .vn-label-value {
|
padding: 1%;
|
||||||
text-align: right;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
margin-top: 5px;
|
|
||||||
justify-content: flex-end;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.cardSummary .summaryBody > .q-card:has(.taxes) {
|
|
||||||
margin-top: 2px;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue