diff --git a/cypress.config.js b/cypress.config.js
index 1934f833e..e2046d6c4 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -3,6 +3,7 @@ const { defineConfig } = require('cypress');
module.exports = defineConfig({
e2e: {
baseUrl: 'http://localhost:9000/',
+ experimentalStudio: true,
fixturesFolder: 'test/cypress/fixtures',
screenshotsFolder: 'test/cypress/screenshots',
supportFile: 'test/cypress/support/index.js',
diff --git a/src/App.vue b/src/App.vue
index d0d8c9358..27cc34c38 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,7 @@ onMounted(() => {
if (availableLocales.includes(userLang)) {
locale.value = userLang;
} else {
- locale.value = fallbackLocale;
+ locale.value = fallbackLocale.value;
}
});
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 47836c05b..02e84849c 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -28,8 +28,23 @@ const countriesOptions = ref([]);
const provincesOptions = ref([]);
const townsLocationOptions = ref([]);
-const onDataSaved = (dataSaved) => {
- emit('onDataSaved', dataSaved);
+const onDataSaved = (formData) => {
+ const newPostcode = {
+ ...formData
+ };
+ const townObject = townsLocationOptions.value.find(
+ ({id}) => id === formData.townFk
+ );
+ newPostcode.town = townObject?.name;
+ const provinceObject = provincesOptions.value.find(
+ ({id}) => id === formData.provinceFk
+ );
+ newPostcode.province = provinceObject?.name;
+ const countryObject = countriesOptions.value.find(
+ ({id}) => id === formData.countryFk
+ );
+ newPostcode.country = countryObject?.country;
+ emit('onDataSaved', newPostcode);
};
const onCityCreated = async ({ name, provinceFk }, formData) => {
@@ -73,7 +88,7 @@ const onProvinceCreated = async ({ name }, formData) => {
:title="t('New postcode')"
:subtitle="t('Please, ensure you put the correct data!')"
:form-initial-data="postcodeFormData"
- @on-data-saved="onDataSaved($event)"
+ @on-data-saved="onDataSaved"
>
diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 6d4e79f24..1fdd9a5f5 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -1,5 +1,5 @@
@@ -284,6 +285,9 @@ defineExpose({
/>
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index cdf19d492..1e1480293 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -74,7 +74,7 @@ async function fetch() {
-
+
@@ -97,7 +97,6 @@ async function fetch() {
.cardSummary {
width: 100%;
-
.summaryHeader {
text-align: center;
font-size: 20px;
@@ -132,6 +131,7 @@ async function fetch() {
padding: 7px;
font-size: 16px;
min-width: 275px;
+ box-shadow: none;
.vn-label-value {
display: flex;
diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 4445b99c9..b04ab3e5b 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -15,7 +15,6 @@ const { t } = useI18n();
color="primary"
padding="none"
:href="`sip:${props.phoneNumber}`"
- :title="t('globals.microsip')"
@click.stop
/>
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 018447057..22eebdf36 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -14,7 +14,7 @@ onUnmounted(() => {
-
+
@@ -24,6 +24,11 @@ onUnmounted(() => {
+