Merge branch 'dev' into warmFix_order_equalSalix
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Alex Moreno 2024-11-13 06:21:59 +00:00
commit 2ae9d68fec
6 changed files with 7 additions and 4 deletions

View File

@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
@on-fetch="(data) => (warehousesOptions = data)"
auto-load
url="Warehouses"
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
/>
<FetchData
@on-fetch="(data) => (temperaturesOptions = data)"

View File

@ -25,7 +25,7 @@ const showSmsDialog = () => {
quasar.dialog({
component: VnSmsDialog,
componentProps: {
phone: $props.customer.phone || $props.customer.mobile,
phone: $props.customer.mobile || $props.customer.phone,
promise: sendSms,
},
});

View File

@ -191,6 +191,7 @@ const getItemPackagingType = (ticketSales) => {
class="full-width"
:disable-infinite-scroll="true"
:search-url="false"
redirect="ticket"
>
<template #column-nickname="{ row }">
<span class="link">

View File

@ -281,6 +281,7 @@ function round(value) {
display: flex;
flex-direction: column;
align-items: center;
min-width: 35%;
}
.text-negative {
color: $negative !important;
@ -297,5 +298,5 @@ function round(value) {
Date: Fecha
View more details: Ver más detalles
Reserve some space: Reservar espacio
This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
</i18n>

View File

@ -207,6 +207,7 @@ const onThermographCreated = async (data) => {
option-label="thermographFk"
:disable="viewAction === 'edit'"
:tooltip="t('New thermograph')"
:roles-allowed-to-create="['logistic']"
>
<template #form>
<CreateThermographForm

View File

@ -96,7 +96,7 @@ watch(
sort-by="code, townFk"
option-value="geoFk"
option-label="code"
:filter-options="['code', 'geoFk']"
:filter-options="['code']"
hide-selected
dense
outlined