From c0be47a2e41fb4e354b6f5fedb1c95bb10660fa7 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 26 Nov 2024 11:29:52 +0000 Subject: [PATCH 01/22] style: limit space QCheckbox when is children's QItemSection --- src/css/app.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/css/app.scss b/src/css/app.scss index d4c76ad6b..5f19731d7 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -292,3 +292,7 @@ input::-webkit-inner-spin-button { .no-visible { visibility: hidden; } + +.q-item > .q-item__section > .q-checkbox { + max-width: fit-content; +} From e3fa756b1483c665d2f78fa7f59d615e3678d99a Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 26 Nov 2024 11:36:05 +0000 Subject: [PATCH 02/22] style: remove space from checkbox --- src/css/app.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index 5f19731d7..86eeb6116 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -293,6 +293,10 @@ input::-webkit-inner-spin-button { visibility: hidden; } -.q-item > .q-item__section > .q-checkbox { - max-width: fit-content; +.q-item > .q-item__section:has(.q-checkbox) { + max-width: min-content; +} + +.row > .column:has(.q-checkbox) { + max-width: min-content; } From 803b8d508d7d1170059c639ae52b3a354498b15e Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 13 Jan 2025 11:27:00 +0100 Subject: [PATCH 03/22] feat: refs #8381 add initial and final temperature fields to entry forms and summaries --- src/components/common/VnInput.vue | 1 - src/i18n/locale/en.yml | 2 ++ src/i18n/locale/es.yml | 2 ++ src/pages/Entry/Card/EntryBasicData.vue | 16 ++++++++++++++++ src/pages/Entry/Card/EntrySummary.vue | 15 ++++++++++++++- src/pages/Entry/EntryList.vue | 14 ++++++++++++++ src/pages/Travel/Card/TravelSummary.vue | 14 ++++++++++++++ 7 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index 4c7445aab..99613ed92 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -45,7 +45,6 @@ const $props = defineProps({ }); const vnInputRef = ref(null); -const showPassword = ref(false); const value = computed({ get() { return $props.modelValue; diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index bf001c9ba..4a4041049 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -429,6 +429,8 @@ entry: observation: Observation booked: Booked excludedFromAvailable: Inventory + initialTemperature: Initial Temp. + finalTemperature: Final Temp. buys: observations: Observations packagingFk: Box diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 2c95f936c..b7a6c3086 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -430,6 +430,8 @@ entry: commission: Comisión booked: Asentado excludedFromAvailable: Inventario + initialTemperature: Ini °C + finalTemperature: Fin °C buys: observations: Observaciónes packagingFk: Embalaje diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue index 147287837..46c831349 100644 --- a/src/pages/Entry/Card/EntryBasicData.vue +++ b/src/pages/Entry/Card/EntryBasicData.vue @@ -141,6 +141,22 @@ const onFilterTravelSelected = (formData, id) => { min="0" /> + + + + { :label="t('entry.summary.invoiceNumber')" :value="entry.invoiceNumber" /> + + { :label="t('entry.summary.travelAgency')" :value="entry.travel.agency?.name" /> - + [ name: 'invoiceAmount', cardVisible: true, }, + { + align: 'left', + name: 'initialTemperature', + label: t('entry.basicData.initialTemperature'), + field: 'initialTemperature', + format: (row) => (row.initialTemperature ? `${row.initialTemperature}°` : ''), + }, + { + align: 'left', + name: 'finalTemperature', + label: t('entry.basicData.finalTemperature'), + field: 'finalTemperature', + format: (row) => (row.finalTemperature ? `${row.finalTemperature}°` : ''), + }, { label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'), name: 'isExcludedFromAvailable', diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 59c3a8a91..62aabd761 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -96,6 +96,20 @@ const entriesTableColumns = computed(() => { showValue: true, }, { label: 'm³', field: 'm3', name: 'm3', align: 'left', showValue: true }, + { + label: t('entry.basicData.initialTemperature'), + field: 'initialTemperature', + name: 'initialTemperature', + align: 'left', + format: (val) => (val ? `${val}°` : ''), + }, + { + label: t('entry.basicData.finalTemperature'), + field: 'finalTemperature', + name: 'finalTemperature', + align: 'left', + format: (val) => (val ? `${val}°` : ''), + }, { label: '', field: 'observation', From 64fcf3c824cbde78d67895d343892fb031cf0ef2 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 14 Jan 2025 11:36:46 +0100 Subject: [PATCH 04/22] fix: hotfix 7366 6943 --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Customer/Card/CustomerBillingData.vue | 2 +- src/pages/Customer/Card/CustomerCredits.vue | 1 + src/pages/Travel/TravelList.vue | 7 +++++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 33829d98d..4b9accb91 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -773,6 +773,7 @@ travel: totalEntries: Total entries totalEntriesTooltip: Total entries daysOnward: Landed days onwards + awb: AWB summary: entryId: Entry Id freight: Freight diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f0cbe3543..f91a02e6a 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -774,6 +774,7 @@ travel: totalEntries: ∑ totalEntriesTooltip: Entradas totales daysOnward: Días de llegada en adelante + awb: AWB summary: entryId: Id entrada freight: Porte diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue index 48f729e29..29394ceec 100644 --- a/src/pages/Customer/Card/CustomerBillingData.vue +++ b/src/pages/Customer/Card/CustomerBillingData.vue @@ -38,7 +38,7 @@ const getBankEntities = (data, formData) => { hide-selected option-label="name" option-value="id" - v-model="data.payMethod" + v-model="data.payMethodFk" /> diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue index 1fa7047e5..d6e4be89e 100644 --- a/src/pages/Customer/Card/CustomerCredits.vue +++ b/src/pages/Customer/Card/CustomerCredits.vue @@ -59,6 +59,7 @@ const columns = computed(() => [ -