Merge branch 'master' into hotfix_8217_updateCustomerCredit

fix(TicketSummary): observationTypes use .description
fix(TicketNotes): observationTypes use .description
2024-11-22 08:24:44 +00:00 · 2024-11-22 07:45:49 +01:00 · 2024-11-22 07:43:59 +01:00
4 changed files with 3 additions and 36 deletions
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@ -49,13 +49,7 @@ async function handleSave() {

 <template>
    <FetchData
-        @on-fetch="
-            (data) =>
-                (observationTypes = data.map((type) => {
-                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
-                    return type;
-                }))
-        "
+        @on-fetch="(data) => (observationTypes = data)"
        auto-load
        url="ObservationTypes"
    />
@ -82,7 +76,7 @@ async function handleSave() {
                            :label="t('ticketNotes.observationType')"
                            :options="observationTypes"
                            hide-selected
-                            option-label="label"
+                            option-label="description"
                            option-value="id"
                            v-model="row.observationTypeFk"
                            :disable="!!row.id"
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@ -291,13 +291,8 @@ function toTicketUrl(section) {
                        "
                    >
                        <span class="label" style="margin-right: 4px">
-                            ({{
-                                t(
-                                    `ticketNotes.observationTypes.${item.observationType.description}`
-                                )
-                            }}):
+                            ({{ item.observationType.description }}):
                        </span>
-
                        <span>{{ item.description }}</span>
                    </QItem>
                </QVirtualScroll>
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@ -14,16 +14,6 @@ ticketNotes:
    description: Description
    removeNote: Remove note
    addNote: Add note
-    observationTypes:
-        ItemPicker: Item picker
-        Packager: Packager
-        Delivery: Delivery
-        SalesPerson: Sales person
-        Administrative: Administrative
-        Weight: Weight
-        InvoiceOut: Invoice Out
-        DropOff: Drop Off
-        Sustitución: Sustitution
 ticketSale:
    id: Id
    visible: Visible
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@ -29,18 +29,6 @@ ticketNotes:
    description: Descripción
    removeNote: Quitar nota
    addNote: Añadir nota
-    observationTypes:
-        ItemPicker: Sacador
-        Packager: Encajador
-        Delivery: Envío
-        SalesPerson: Comercial
-        Administrative: Administrativa
-        Weight: Peso
-        InvoiceOut: Facturas
-        DropOff: Despacho
-        Sustitución: Sustitución
-        Accepted: Aceptado
-        Denied: Denegado
 purchaseRequest:
    Id: Id
    description: Descripción
Author	SHA1	Message	Date
Javier Segarra	e2f092948e	Merge branch 'master' into hotfix_8217_updateCustomerCredit gitea/salix-front/pipeline/pr-master This commit looks good Details gitea/salix-front/pipeline/pr-test There was a failure building this commit Details	2024-11-22 08:24:44 +00:00
Alex Moreno	8cbf40f465	fix(TicketSummary): observationTypes use .description gitea/salix-front/pipeline/head This commit looks good Details	2024-11-22 07:45:49 +01:00
Alex Moreno	3b03f0dfee	fix(TicketNotes): observationTypes use .description gitea/salix-front/pipeline/head There was a failure building this commit Details	2024-11-22 07:43:59 +01:00