[
columnFilter: false,
cardVisible: true,
},
+ {
+ align: 'left',
+ name: 'buyerId',
+ label: t('customer.params.buyerId'),
+ component: 'select',
+ attrs: {
+ url: 'TicketRequests/getItemTypeWorker',
+ optionLabel: 'nickname',
+ optionValue: 'id',
+
+ fields: ['id', 'nickname'],
+ sortBy: ['nickname ASC'],
+ optionFilter: 'firstName',
+ },
+ cardVisible: false,
+ visible: false,
+ },
{
name: 'description',
align: 'left',
@@ -74,6 +91,7 @@ const columns = computed(() => [
name: 'quantity',
label: t('globals.quantity'),
cardVisible: true,
+ visible: true,
columnFilter: {
inWhere: true,
},
@@ -138,11 +156,11 @@ const updateDateParams = (value, params) => {
const campaign = campaignList.value.find((c) => c.id === value);
if (!campaign) return;
- const { dated, previousDays, scopeDays } = campaign;
- const _date = new Date(dated);
- const [from, to] = dateRange(_date);
- params.from = new Date(from.setDate(from.getDate() - previousDays)).toISOString();
- params.to = new Date(to.setDate(to.getDate() + scopeDays)).toISOString();
+ const { dated, scopeDays } = campaign;
+ const from = new Date(dated);
+ from.setDate(from.getDate() - scopeDays);
+ params.from = from;
+ params.to = dated;
return params;
};
@@ -205,24 +223,57 @@ const updateDateParams = (value, params) => {
updateDateParams(data, params)"
>
-
- {{ scope.opt?.code }}
- {{
- new Date(scope.opt?.dated).getFullYear()
- }}
+ {{ scope.opt?.name }}
+ {{
+ scope.opt?.category?.name
+ }}
+
+
+
+
+ updateDateParams(data, params)"
+ />
+ updateDateParams(data, params)"
+ dense
+ >
+
+
+
+ {{ t(scope.opt?.code) }}
+
+ {{ new Date(scope.opt?.dated).getFullYear() }}
+
@@ -247,7 +298,19 @@ const updateDateParams = (value, params) => {
+en:
+
+ valentinesDay: Valentine's Day
+ mothersDay: Mother's Day
+ allSaints: All Saints' Day
es:
Enter a new search: Introduce una nueva búsqueda
Group by items: Agrupar por artículos
+ valentinesDay: Día de San Valentín
+ mothersDay: Día de la Madre
+ allSaints: Día de Todos los Santos
+ Campaign consumption: Consumo campaña
+ Campaign: Campaña
+ From: Desde
+ To: Hasta
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 118f04a31..b6d495335 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -107,6 +107,9 @@ customer:
defaulterSinced: Defaulted Since
hasRecovery: Has Recovery
socialName: Social name
+ typeId: Type
+ buyerId: Buyer
+ categoryId: Category
city: City
phone: Phone
postcode: Postcode
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 7c33ffee8..f50d049da 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -108,6 +108,9 @@ customer:
hasRecovery: Tiene recobro
socialName: Razón social
campaign: Campaña
+ typeId: Familia
+ buyerId: Comprador
+ categoryId: Reino
city: Ciudad
phone: Teléfono
postcode: Código postal
diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue
index 03cd53358..dc759c7a8 100644
--- a/src/pages/Entry/Card/EntryDescriptorMenu.vue
+++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue
@@ -54,8 +54,8 @@ const transferEntry = async () => {
en:
transferEntryDialog: The entries will be transferred to the next day
- transferEntry: Transfer Entry
+ transferEntry: Partial delay
es:
transferEntryDialog: Se van a transferir las compras al dia siguiente
- transferEntry: Transferir Entrada
+ transferEntry: Retraso parcial
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 9398ded64..c7d7ba9f4 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -97,12 +97,19 @@ const columns = computed(() => [
},
{
align: 'left',
- name: 'companyCode',
+ name: 'companyFk',
label: t('globals.company'),
cardVisible: true,
component: 'select',
- attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
- columnField: { component: null },
+ attrs: {
+ url: 'Companies',
+ optionLabel: 'code',
+ optionValue: 'id',
+ },
+ columnField: {
+ component: null,
+ },
+ format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
},
{
align: 'left',