Merge branch 'master' into hotfix_negative_available

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue

@@ -101,7 +101,7 @@ const onNextStep = async () => {
                 t('basicData.negativesConfirmMessage'),
                 submitWithNegatives,
             );
-        else submit();
+        else await submit();
     }
 };
 </script>

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -130,8 +130,21 @@ const onSubmit = async () => {
 
 const deleteEvent = async () => {
     if (!props.event) return;
-    const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
+    if (!props.event.created) {
-    await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+        const filter = {
+            where: {
+                dated: dated.value,
+            },
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data: res } = await axios.get(`Zones/${route.params.id}/exclusions`, {
+            params,
+        });
+        if (res) await axios.delete(`Zones/${route.params.id}/exclusions/${res[0].id}`);
+    } else {
+        const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
+        await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+    }
     await refetchEvents();
 };
 
@@ -143,7 +156,7 @@ const refetchEvents = async () => {
 };
 
 onMounted(() => {
-    if (props.event) {
+    if (props.event && props.event.dated) {
         dated.value = props.event?.dated;
         excludeType.value =
             props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';