+
+
+
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index f70146c58b..e3cb2874ae 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -187,7 +187,7 @@ const columns = computed(() => [
downloadFile(
prop.row.id,
$props.downloadModel,
- null,
+ undefined,
prop.row.download
),
},
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index e858ba8a6c..4306beb4c0 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -200,8 +200,8 @@ es:
pendingPayment: 'Su pedido está pendiente de pago.
Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
- { orderId } del día { shipped } para recibirlo sin portes adicionales.'
- orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
+ { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+ orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
en: Inglés
es: Español
fr: Francés
@@ -215,11 +215,12 @@ fr:
Message: Message
messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
templates:
- pendingPayment: 'Votre commande est en attente de paiement.
- Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
- minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
- { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
- orderChanges: 'Commande { orderId } du { shipped }: { changes }'
+ pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+ Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+ minAmount: 'Verdnatura vous rappelle :
+ Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+ Merci.'
+ orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
en: Anglais
es: Espagnol
fr: Français
@@ -236,8 +237,8 @@ pt:
pendingPayment: 'Seu pedido está pendente de pagamento.
Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
- { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
- orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
+ { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+ orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
en: Inglês
es: Espanhol
fr: Francês
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f30ea89379..d2ba218884 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,5 +1,5 @@
diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index e87d9c4c96..24255ea1a2 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -12,12 +12,23 @@ const $props = defineProps({
type: Boolean,
default: false,
},
+ viewCustomization: {
+ type: String,
+ default: '',
+ },
});
const $q = useQuasar();
+// El objetivo de asignar las clases de personalización desde el wrapper es no tener conflictos entre vistas que usen el mismo componente
+const viewCustomizationClasses = {
+ workerCalendar: 'worker-calendar-customizations',
+};
+
const containerClasses = computed(() => {
const classes = ['main-container-background'];
+ if (viewCustomizationClasses[$props.viewCustomization])
+ classes.push(viewCustomizationClasses[$props.viewCustomization]);
if ($props.bordered) classes.push('--bordered');
if ($props.transparentBackground) classes.push('transparent-background');
else classes.push($q.dark.isActive ? '--dark' : '--light');
@@ -33,6 +44,47 @@ const containerClasses = computed(() => {
-
-
-en:
- params:
- supplier: Supplier
- from: From
- to: To
- active: Is active
- visible: Is visible
- floramondo: Is floramondo
- salesPersonFk: Buyer
- categoryFk: Category
- typeFk: Type
- tag: Tag
- value: Value
-es:
- params:
- supplier: Proveedor
- from: Desde
- to: Hasta
- active: Activo
- visible: Visible
- floramondo: Floramondo
- salesPersonFk: Comprador
- categoryFk: Categoría
- typeFk: Tipo
- tag: Etiqueta
- value: Valor
- Plant: Planta
- Flower: Flor
- Handmade: Confección
- Green: Verde
- Accessories: Complemento
- Fruit: Fruta
-
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 192d03542d..5d317a24a1 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,3 +1,5 @@
+Search entries: Buscar entradas
+You can search by entry reference: Puedes buscar por referencia de la entrada
entryList:
list:
inventoryEntry: Es inventario
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 0de31c1834..ceec5042de 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,18 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- es:
- Search invoice: Buscar factura recibida
- You can search by invoice reference: Puedes buscar por referencia de la factura
-
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 0e53fbed77..9b7c77f9dc 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -7,7 +7,6 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import FetchData from 'components/FetchData.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
@@ -70,19 +69,15 @@ const suppliersRef = ref();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
+import VnCard from 'components/common/VnCard.vue';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-es:
- Search ticket: Buscar ticket
- You can search by ticket id or alias: Puedes buscar por id o alias del ticket
-
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d648433b0e..364ae04a64 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -91,8 +91,8 @@ async function changeState(value) {
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Hours: Horas
+ Total semana: Total semana
+ Termina a las: Termina a las
+ Add time: Añadir hora
+ Reason: Motivo
+ Not satisfied: No conforme
+ Satisfied: Conforme
+ Resend: Reenviar
+ email of this week to the user: email de esta semana al usuario
+ Email sended: Email enviado
+ Send time control email: Enviar email control horario
+ Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
+ You must indicate a reason: Debes indicar un motivo
+
diff --git a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
new file mode 100644
index 0000000000..20d02ca783
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+