0
0
Fork 0

Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev

Reviewed-on: verdnatura/salix-front#748
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-10-10 07:20:25 +00:00
commit 480f243205
9 changed files with 11 additions and 13 deletions

View File

@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
:label="t('invoiceIn.summary.company')" :label="t('invoiceIn.summary.company')"
:value="entity.company?.code" :value="entity.company?.code"
/> />
<VnLv <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
:label="t('invoiceIn.summary.booked')"
:value="invoiceIn?.isBooked"
/>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">

View File

@ -116,7 +116,7 @@ const activities = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('params.isBooked')" :label="t('invoiceIn.isBooked')"
v-model="params.isBooked" v-model="params.isBooked"
@update:model-value="searchFn()" @update:model-value="searchFn()"
toggle-indeterminate toggle-indeterminate
@ -170,7 +170,7 @@ es:
awb: AWB awb: AWB
amount: Importe amount: Importe
issued: Emitida issued: Emitida
isBooked: Conciliada isBooked: Contabilizada
account: Cuenta contable account: Cuenta contable
created: Creada created: Creada
dued: Vencida dued: Vencida

View File

@ -65,7 +65,7 @@ const cols = computed(() => [
{ {
align: 'left', align: 'left',
name: 'isBooked', name: 'isBooked',
label: t('invoiceIn.list.isBooked'), label: t('invoiceIn.isBooked'),
columnFilter: false, columnFilter: false,
}, },
{ {

View File

@ -1,5 +1,6 @@
invoiceIn: invoiceIn:
serial: Serial serial: Serial
isBooked: Is booked
list: list:
ref: Reference ref: Reference
supplier: Supplier supplier: Supplier
@ -7,7 +8,6 @@ invoiceIn:
serial: Serial serial: Serial
file: File file: File
issued: Issued issued: Issued
isBooked: Is booked
awb: AWB awb: AWB
amount: Amount amount: Amount
card: card:
@ -31,7 +31,6 @@ invoiceIn:
sage: Sage withholding sage: Sage withholding
vat: Undeductible VAT vat: Undeductible VAT
company: Company company: Company
booked: Booked
expense: Expense expense: Expense
taxableBase: Taxable base taxableBase: Taxable base
rate: Rate rate: Rate

View File

@ -1,5 +1,6 @@
invoiceIn: invoiceIn:
serial: Serie serial: Serie
isBooked: Contabilizada
list: list:
ref: Referencia ref: Referencia
supplier: Proveedor supplier: Proveedor
@ -7,7 +8,6 @@ invoiceIn:
shortIssued: F. emisión shortIssued: F. emisión
file: Fichero file: Fichero
issued: Fecha emisión issued: Fecha emisión
isBooked: Conciliada
awb: AWB awb: AWB
amount: Importe amount: Importe
card: card:
@ -31,7 +31,6 @@ invoiceIn:
sage: Retención sage sage: Retención sage
vat: Iva no deducible vat: Iva no deducible
company: Empresa company: Empresa
booked: Contabilizada
expense: Gasto expense: Gasto
taxableBase: Base imp. taxableBase: Base imp.
rate: Tasa rate: Tasa

View File

@ -139,6 +139,7 @@ onBeforeMount(async () => {
<VnLinkPhone :phone-number="worker?.sip?.extension" /> <VnLinkPhone :phone-number="worker?.sip?.extension" />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
</QCard> </QCard>
</template> </template>
</CardSummary> </CardSummary>

View File

@ -9,3 +9,4 @@ tableColumns:
fi: FI fi: FI
SSN: SSN SSN: SSN
extension: Extension extension: Extension
queue: Queue

View File

@ -14,3 +14,4 @@ tableColumns:
fi: NIF fi: NIF
SSN: NSS SSN: NSS
extension: Extensión extension: Extensión
queue: Cola

View File

@ -1,7 +1,7 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
describe('Ticket descriptor', () => { describe('Ticket descriptor', () => {
const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)'; const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)';
const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)'; const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)';
const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span'; const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
const summaryHeader = '.summaryHeader > div'; const summaryHeader = '.summaryHeader > div';
const weight = 25; const weight = 25;