diff --git a/src/components/common/__tests__/VnDmsList.spec.js b/src/components/common/__tests__/VnDmsList.spec.js
index ee62f6971..7c469b7db 100644
--- a/src/components/common/__tests__/VnDmsList.spec.js
+++ b/src/components/common/__tests__/VnDmsList.spec.js
@@ -25,6 +25,9 @@ describe('VnDmsList', () => {
deleteModel: 'WorkerDms',
downloadModel: 'WorkerDms',
},
+ global: {
+ stubs: ['VnUserLink'],
+ },
}).vm;
});
diff --git a/src/components/common/__tests__/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
index 399b78a1d..53836cbcd 100644
--- a/src/components/common/__tests__/VnLog.spec.js
+++ b/src/components/common/__tests__/VnLog.spec.js
@@ -90,7 +90,7 @@ describe('VnLog', () => {
vm = createWrapper(VnLog, {
global: {
- stubs: ['FetchData', 'vue-i18n'],
+ stubs: ['FetchData', 'vue-i18n', 'VnUserLink'],
mocks: {
fetch: vi.fn(),
},
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index ac3e22385..9a25852b3 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,12 +1,27 @@
@@ -14,5 +29,10 @@ defineProps({
{{ defaultName ? (name ?? $t('globals.system')) : name }}
-
+ (isWorker = data?.workerId !== undefined)"
+ />
+
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index db7236a3d..8ae76acec 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -17,6 +17,7 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import VnSelect from 'components/common/VnSelect.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
const arrayData = useArrayData('Customer');
const { t } = useI18n();
@@ -50,7 +51,7 @@ const columns = computed(() => [
label: t('globals.ticket'),
cardVisible: true,
columnFilter: {
- inWhere: true,
+ name: 'ticketId',
},
},
{
@@ -84,25 +85,19 @@ const columns = computed(() => [
label: t('globals.description'),
columnClass: 'expand',
columnFilter: {
- inWhere: true,
+ name: 'description',
+
},
},
{
- name: 'quantity',
+ name: 'quantity',
label: t('globals.quantity'),
cardVisible: true,
visible: true,
- columnFilter: {
- inWhere: true,
- },
- },
- {
- name: 'grouped',
- label: t('Group by items'),
- component: 'checkbox',
- visible: false,
- orderBy: false,
+ columnFilter: false
+
},
+
]);
onBeforeMount(async () => {
@@ -218,9 +213,9 @@ const updateDateParams = (value, params) => {
{{ row.subName }}
-
+
-
+
{
class="q-px-xs q-pt-none fit"
dense
/>
+ searchFn()"
+ />
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ac1fcf8c2..aa5841ce2 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -117,8 +117,6 @@ async function acceptPropagate({ isEqualizated }) {
option-value="id"
v-model="data.sageTaxTypeFk"
data-cy="sageTaxTypeFk"
- :required="data.isTaxDataChecked"
- :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
/>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index fb3804d55..b41b1ce8c 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -222,6 +222,7 @@ async function getAmountPaid() {
clearable
v-model.number="data.amountPaid"
data-cy="paymentAmount"
+ :positive="false"
/>
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index fca3354e6..3c651e7f3 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -123,3 +123,4 @@ customer:
ticketFk: Ticket Id
description: Description
quantity: Quantity
+ ticketId: Ticket
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 9b0009b36..ba80bd555 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -123,3 +123,4 @@ customer:
ticketFk: Id Ticket
description: Descripción
quantity: Cantidad
+ ticketId: Ticket
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index f8a72caf3..d463b1735 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -89,7 +89,7 @@ defineExpose({ save });
- {{ t('New price') }}
+ {{ t('basicData.newPrice') }}
{{ toCurrency(newPrice) }}
@@ -135,3 +135,4 @@ defineExpose({ save });
min-width: 230px;
}
+<
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 4975afffb..90ea4c11f 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -314,7 +314,7 @@ const changePrice = async (sale) => {
const updatePrice = async (sale, newPrice) => {
try {
await axios.post(`Sales/${sale.id}/updatePrice`, {
- newPrice: newPrice,
+ newPrice,
componentId: componentId.value,
});
notify('globals.dataSaved', 'positive');
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 3906d6c44..6886078bb 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -13,12 +13,14 @@ import { useArrayData } from 'composables/useArrayData';
import useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
const stateStore = useStateStore();
const { t } = useI18n();
const { notify } = useNotify();
const { openConfirmationModal } = useVnConfirm();
const allColumnNames = ref([]);
+const agencies = ref([]);
const arrayData = useArrayData('WeeklyTickets');
const { store } = arrayData;
@@ -51,11 +53,16 @@ const columns = computed(() => [
isTitle: true,
cardVisible: true,
component: 'select',
- attrs: {
- url: 'Clients',
- optionLabel: 'name',
- optionValue: 'id',
- isWhere: true,
+ columnFilter: {
+ name: 'id',
+ component: 'select',
+ alias: 'c',
+ attrs: {
+ url: 'Clients',
+ optionLabel: 'name',
+ optionValue: 'id',
+ inWhere: true,
+ },
},
columnField: {
component: null,
@@ -170,6 +177,11 @@ onMounted(async () => {
+ (agencies = data)"
+ auto-load
+ />
{
{
cy.login('developer');
cy.visit('#/customer/1107/fiscal-data');
});
- it('Should change required value when change customer', () => {
+ it.skip('Should change required value when change customer', () => {
cy.get('.q-card').should('be.visible');
cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
cy.get('#searchbar input').clear();
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index e24624052..5b533e420 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -116,10 +116,11 @@ Cypress.Commands.add('waitSpinner', (_spinner = 'navBar') => {
// Fill Inputs
Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
+ cy.get(selector).should('exist').scrollIntoView();
cy.waitForElement(selector, timeout);
cy.get(selector, { timeout })
- .should('exist')
+
.should('be.visible')
.click()
.then(($el) => {