refactor: refs #8225 requested changes
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:
parent
57c538c9c9
commit
413d567ffb
|
@ -52,7 +52,6 @@ onMounted(async () => {
|
||||||
<AccountDescriptorMenu :entity-id="entityId" />
|
<AccountDescriptorMenu :entity-id="entityId" />
|
||||||
</template>
|
</template>
|
||||||
<template #before>
|
<template #before>
|
||||||
<!-- falla id :id="entityId.value" collection="user" size="160x160" -->
|
|
||||||
<VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
|
<VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
|
||||||
<template #error>
|
<template #error>
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -9,6 +9,7 @@ import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||||
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
||||||
import useNotify from 'src/composables/useNotify.js';
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
import useHasAccount from 'src/composables/useHasAccount.js';
|
import useHasAccount from 'src/composables/useHasAccount.js';
|
||||||
|
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
entityId: {
|
entityId: {
|
||||||
|
@ -97,7 +98,7 @@ async function sync() {
|
||||||
<QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
|
<QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
|
||||||
</QIcon></QCheckbox
|
</QIcon></QCheckbox
|
||||||
>
|
>
|
||||||
<QInput
|
<VnInputPassword
|
||||||
v-if="shouldSyncPassword"
|
v-if="shouldSyncPassword"
|
||||||
:label="t('login.password')"
|
:label="t('login.password')"
|
||||||
v-model="syncPassword"
|
v-model="syncPassword"
|
||||||
|
|
|
@ -22,7 +22,7 @@ const entityId = computed(() => $props.id || +currentRoute.value.params.id);
|
||||||
const totalAmount = ref();
|
const totalAmount = ref();
|
||||||
const config = ref();
|
const config = ref();
|
||||||
const cplusRectificationTypes = ref([]);
|
const cplusRectificationTypes = ref([]);
|
||||||
const siiTypeInvoiceOuts = ref([]);
|
const siiTypeInvoiceIns = ref([]);
|
||||||
const invoiceCorrectionTypes = ref([]);
|
const invoiceCorrectionTypes = ref([]);
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
|
@ -144,9 +144,9 @@ const createInvoiceInCorrection = async () => {
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<FetchData
|
<FetchData
|
||||||
url="SiiTypeInvoiceOuts"
|
url="SiiTypeInvoiceIns"
|
||||||
:where="{ code: { like: 'R%' } }"
|
:where="{ code: { like: 'R%' } }"
|
||||||
@on-fetch="(data) => (siiTypeInvoiceOuts = data)"
|
@on-fetch="(data) => (siiTypeInvoiceIns = data)"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<FetchData
|
<FetchData
|
||||||
|
@ -248,7 +248,7 @@ const createInvoiceInCorrection = async () => {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="`${useCapitalize(t('globals.class'))}`"
|
:label="`${useCapitalize(t('globals.class'))}`"
|
||||||
v-model="correctionFormData.invoiceClass"
|
v-model="correctionFormData.invoiceClass"
|
||||||
:options="siiTypeInvoiceOuts"
|
:options="siiTypeInvoiceIns"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
:required="true"
|
:required="true"
|
||||||
|
|
|
@ -73,8 +73,8 @@ async function toUnbook() {
|
||||||
|
|
||||||
const type = isLinked ? 'warning' : 'positive';
|
const type = isLinked ? 'warning' : 'positive';
|
||||||
const message = isLinked
|
const message = isLinked
|
||||||
? t('InvoiceIn.descriptorMenu.isLinked', { bookEntry, accountingEntries })
|
? t('isLinked', { bookEntry })
|
||||||
: t('InvoiceIn.descriptorMenu.isNotLinked', { bookEntry });
|
: t('isNotLinked', { bookEntry, accountingEntries });
|
||||||
|
|
||||||
quasar.notify({ type, message });
|
quasar.notify({ type, message });
|
||||||
if (!isLinked) arrayData.store.data.isBooked = false;
|
if (!isLinked) arrayData.store.data.isBooked = false;
|
||||||
|
@ -186,10 +186,21 @@ function sendPdfInvoice({ address }) {
|
||||||
@click="triggerMenu('correct')"
|
@click="triggerMenu('correct')"
|
||||||
>
|
>
|
||||||
<QItemSection
|
<QItemSection
|
||||||
>{{ t('InvoiceIn.descriptorMenu.createRectificative') }}...</QItemSection
|
>{{ t('InvoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
|
||||||
>
|
>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
|
<QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
|
||||||
<QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
|
<QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
en:
|
||||||
|
isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
|
||||||
|
isLinked: The entry has been linked to Sage. Please contact administration for further information
|
||||||
|
assertAction: Are you sure you want to {action} this invoice?
|
||||||
|
es:
|
||||||
|
isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
|
||||||
|
isLinked: El asiento fue enlazado a Sage, por favor contacta con administración
|
||||||
|
assertAction: Estas seguro de querer {action} esta factura?
|
||||||
|
</i18n>
|
||||||
|
|
|
@ -27,13 +27,10 @@ InvoiceIn:
|
||||||
sendAgriculturalPdf: Send agricultural receipt as PDF
|
sendAgriculturalPdf: Send agricultural receipt as PDF
|
||||||
checkSendInvoice: Are you sure you want to send it?
|
checkSendInvoice: Are you sure you want to send it?
|
||||||
sendPdfInvoice: Send PDF invoice
|
sendPdfInvoice: Send PDF invoice
|
||||||
createRectificative: Create rectificative invoice
|
createCorrective: Create rectificative invoice
|
||||||
rectificativeInvoice: Rectificative invoice
|
correctiveInvoice: Rectificative invoice
|
||||||
originalInvoice: Original invoice
|
originalInvoice: Original invoice
|
||||||
entry: Entry
|
entry: Entry
|
||||||
isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
|
|
||||||
isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
|
|
||||||
assertAction: Are you sure you want to {action} this invoice?
|
|
||||||
emailEmpty: The email can't be empty
|
emailEmpty: The email can't be empty
|
||||||
card:
|
card:
|
||||||
client: Client
|
client: Client
|
||||||
|
|
|
@ -27,13 +27,10 @@ InvoiceIn:
|
||||||
sendAgriculturalPdf: Enviar recibo agrícola como PDF
|
sendAgriculturalPdf: Enviar recibo agrícola como PDF
|
||||||
checkSendInvoice: ¿Estás seguro que quieres enviarlo?
|
checkSendInvoice: ¿Estás seguro que quieres enviarlo?
|
||||||
sendPdfInvoice: Enviar factura a PDF
|
sendPdfInvoice: Enviar factura a PDF
|
||||||
createRectificative: Crear factura rectificativa
|
createCorrective: Crear factura rectificativa
|
||||||
rectificativeInvoice: Factura rectificativa
|
correctiveInvoice: Factura rectificativa
|
||||||
originalInvoice: Factura origen
|
originalInvoice: Factura origen
|
||||||
entry: Entrada
|
entry: Entrada
|
||||||
isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
|
|
||||||
isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
|
|
||||||
assertAction: Estas seguro de querer {action} esta factura?
|
|
||||||
emailEmpty: El email no puede estar vacío
|
emailEmpty: El email no puede estar vacío
|
||||||
card:
|
card:
|
||||||
client: Cliente
|
client: Cliente
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
|
|
||||||
describe('InvoiceInCorrective', () => {
|
describe('InvoiceInCorrective', () => {
|
||||||
const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
|
const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
|
||||||
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
|
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
|
||||||
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
|
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ describe('InvoiceInCorrective', () => {
|
||||||
|
|
||||||
cy.openActionsDescriptor();
|
cy.openActionsDescriptor();
|
||||||
|
|
||||||
cy.get(createRectificative).click();
|
cy.get(createCorrective).click();
|
||||||
cy.get(saveDialog).click();
|
cy.get(saveDialog).click();
|
||||||
cy.wait('@corrective').then((interception) => {
|
cy.wait('@corrective').then((interception) => {
|
||||||
const correctingId = interception.response.body;
|
const correctingId = interception.response.body;
|
||||||
|
|
Loading…
Reference in New Issue