diff --git a/front/salix/styles/variables.scss b/front/salix/styles/variables.scss
index 5fd31a8c6..5eccf0418 100644
--- a/front/salix/styles/variables.scss
+++ b/front/salix/styles/variables.scss
@@ -62,6 +62,7 @@ $color-notice-medium: lighten($color-notice, 20%);
$color-notice-light: lighten($color-notice, 35%);
$color-alert-medium: lighten($color-alert, 20%);
$color-alert-light: lighten($color-alert, 35%);
+/**/
// Dark theme
/*
diff --git a/modules/agency/front/delivery-days/index.html b/modules/agency/front/delivery-days/index.html
index 3d4fbe4fc..bb273afa9 100644
--- a/modules/agency/front/delivery-days/index.html
+++ b/modules/agency/front/delivery-days/index.html
@@ -35,10 +35,10 @@
-
+
-
+
diff --git a/modules/agency/front/delivery-days/style.scss b/modules/agency/front/delivery-days/style.scss
index 543e885f0..1db8edfbf 100644
--- a/modules/agency/front/delivery-days/style.scss
+++ b/modules/agency/front/delivery-days/style.scss
@@ -6,7 +6,7 @@ vn-zone-delivery-days {
flex-wrap: wrap;
& > vn-calendar {
- min-width: 15em;
+ min-width: 16.5em;
}
}
}
\ No newline at end of file
diff --git a/modules/agency/front/events/index.html b/modules/agency/front/events/index.html
index fb63e5180..a09038087 100644
--- a/modules/agency/front/events/index.html
+++ b/modules/agency/front/events/index.html
@@ -20,7 +20,7 @@
{{::row.from | dateTime:'dd/MM/yyyy'}} - {{::row.to | dateTime:'dd/MM/yyyy'}}
- Always
+ Indefinitely
({{::$ctrl.formatWdays(row.weekDays)}})
diff --git a/modules/agency/front/events/index.js b/modules/agency/front/events/index.js
index c89f41e98..614641cbb 100644
--- a/modules/agency/front/events/index.js
+++ b/modules/agency/front/events/index.js
@@ -43,14 +43,14 @@ class Controller {
this.options = [
{
- label: 'Specific day',
+ label: 'One day',
value: 'day'
}, {
label: 'Range of dates',
value: 'range'
}, {
- label: 'Always',
- value: 'always'
+ label: 'Indefinitely',
+ value: 'indefinitely'
}
];
@@ -86,7 +86,7 @@ class Controller {
if (row.from && !row.to)
this.eventType = 'day';
else if (!row.from)
- this.eventType = 'always';
+ this.eventType = 'indefinitely';
else
this.eventType = 'range';
@@ -114,7 +114,7 @@ class Controller {
let selected = this.selected;
- if (this.eventType == 'always') {
+ if (this.eventType == 'indefinitely') {
selected.from = null;
selected.to = null;
}
diff --git a/modules/agency/front/events/style.scss b/modules/agency/front/events/style.scss
index 6af8fdee0..126720876 100644
--- a/modules/agency/front/events/style.scss
+++ b/modules/agency/front/events/style.scss
@@ -17,6 +17,7 @@ vn-zone-events {
justify-content: center;
align-items: center;
outline: none;
+ background-color: rgba(0, 0, 0, .05);
&.marked {
background: $color-main;
diff --git a/modules/agency/front/locale/es.yml b/modules/agency/front/locale/es.yml
index 775e493fd..588b67ec3 100644
--- a/modules/agency/front/locale/es.yml
+++ b/modules/agency/front/locale/es.yml
@@ -17,11 +17,12 @@ Search zone by id or name: Buscar zonas por identificador o nombre
From: Desde
To: Hasta
Closing: Cierre
-Specific day: Día específico
+One day: Un día
Range of dates: Rango de fechas
-Always: Siempre
+Indefinitely: Indefinido
Everyday: Todos los días
Delivery days: Días de entrega
Province: Provincia
Postcode: Código postal
Inflation: Inflación
+Query: Consultar