#8745 - fixCustomer #1588

Open
carlossa wants to merge 9 commits from 8745-fixCustomer into master
7 changed files with 24 additions and 9 deletions
Showing only changes of commit 6c1218a49c - Show all commits

View File

@ -46,6 +46,11 @@ function ticketFilter(invoice) {
<InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
</template>
<template #body="{ entity }">
<VnLv
v-if="entity.externalRef"
:label="t('invoiceOut.externalRef')"
:value="entity.externalRef"
/>
<VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
<VnLv :label="t('globals.amount')" :value="toCurrency(entity.amount)" />
<VnLv v-if="entity.client" :label="t('globals.client')">

View File

@ -54,6 +54,14 @@ const columns = computed(() => [
name: 'id',
},
},
{
align: 'left',
name: 'issued',
label: t('invoiceOut.summary.issued'),
component: 'date',
format: (row) => toDate(row.issued),
columnField: { component: null },
},
{
align: 'left',
name: 'ref',

View File

@ -1,6 +1,7 @@
invoiceOut:
search: Search invoice
searchInfo: You can search by invoice reference
externalRef: External Ref.
params:
id: ID
company: Company

View File

@ -1,6 +1,7 @@
invoiceOut:
search: Buscar factura emitida
searchInfo: Puedes buscar por referencia de la factura
externalRef: Ref. externa
params:
id: ID
company: Empresa

View File

@ -1,5 +1,6 @@
<script setup>
import { ref, nextTick } from 'vue';
import { ref, nextTick, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import FetchData from 'components/FetchData.vue';
@ -17,12 +18,12 @@ const maritalStatus = [
{ code: 'M', name: t('Married') },
{ code: 'S', name: t('Single') },
];
async function setAdvancedSummary(data) {
const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
onMounted(async () => {
const advanced = await useAdvancedSummary('Workers', useRoute().params.id);
Object.assign(form.value.formData, advanced);
await nextTick();
if (form.value) form.value.hasChanges = false;
}
nextTick(() => (form.value.hasChanges = false));
});
</script>
<template>
<FetchData
@ -42,7 +43,6 @@ async function setAdvancedSummary(data) {
:url-update="`Workers/${$route.params.id}`"
auto-load
model="Worker"
@on-fetch="setAdvancedSummary"
>
<template #form="{ data }">
<VnRow>

View File

@ -19,7 +19,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
<template>
<VnCard
data-key="Zone"
:url="notIsLocations('Zones', undefined)"
:url="notIsLocations(`Zones/${route.params.id}`, undefined)"
:descriptor="ZoneDescriptor"
:filter="filter"
:filter-panel="notIsLocations(ZoneFilterPanel, undefined)"

View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe('ClaimAction', () => {
describe.skip('ClaimAction', () => {
const claimId = 1;
const firstRow = 'tbody > :nth-child(1)';