diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index f92ee1e4e8..59049a5b30 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -2,9 +2,9 @@
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { computed } from 'vue';
-
import VnCard from 'components/common/VnCard.vue';
import ZoneDescriptor from './ZoneDescriptor.vue';
+import ZoneSearchbar from './ZoneSearchbar.vue';
const { t } = useI18n();
const route = useRoute();
@@ -33,5 +33,9 @@ const searchBarDataKeys = {
:search-make-fetch="searchbarMakeFetch"
:searchbar-label="t('list.searchZone')"
:searchbar-info="t('list.searchInfo')"
- />
+ >
+
+
+
+
diff --git a/src/pages/Zone/ZoneMain.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
similarity index 88%
rename from src/pages/Zone/ZoneMain.vue
rename to src/pages/Zone/Card/ZoneSearchbar.vue
index b6f3fb74ed..607057d0bf 100644
--- a/src/pages/Zone/ZoneMain.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -1,7 +1,6 @@
+
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 0932a0b57c..0272292f64 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -15,6 +15,7 @@ import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
import RightMenu from 'src/components/common/RightMenu.vue';
import ZoneFilterPanel from './ZoneFilterPanel.vue';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
const stateStore = useStateStore();
const { t } = useI18n();
@@ -87,6 +88,7 @@ onMounted(() => (stateStore.rightDrawer = true));
+
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index be7b12534d..ecf82bf4ff 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -7,6 +7,7 @@ import FetchData from 'components/FetchData.vue';
import { toDateFormat } from 'src/filters/date.js';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
const { t } = useI18n();
const weekdayStore = useWeekdayStore();
@@ -52,6 +53,7 @@ onMounted(() => weekdayStore.initStore());
@on-fetch="(data) => (details = data)"
auto-load
/>
+
diff --git a/test/cypress/integration/zone/zoneDeliveryDays.spec.js b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
new file mode 100644
index 0000000000..a3624d23d8
--- /dev/null
+++ b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
@@ -0,0 +1,17 @@
+describe('ZoneDeliveryDays', () => {
+ beforeEach(() => {
+ cy.login('developer');
+ cy.viewport(1920, 1080);
+ cy.visit(`/#/zone/delivery-days`);
+ cy.waitForElement('.q-page', 6000);
+ });
+
+ it('should query for the day', () => {
+ cy.get('.q-form > .q-btn > .q-btn__content').click();
+ cy.waitForElement('.q-notification__message', 6000);
+ cy.get('.q-notification__message').should(
+ 'have.text',
+ 'No service for the specified zone'
+ );
+ });
+});
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
new file mode 100644
index 0000000000..7fc12711a2
--- /dev/null
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -0,0 +1,16 @@
+describe('ZoneList', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('developer');
+ cy.visit(`/#/zone/list`);
+ cy.waitForElement('.q-page', 6000);
+ });
+
+ it('should open the details', () => {
+ cy.get(':nth-child(1) > .text-right > .material-symbols-outlined').click();
+ });
+ it('should redirect to summary', () => {
+ cy.waitForElement('.q-page');
+ cy.get('tbody > :nth-child(1)').click();
+ });
+});
diff --git a/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
new file mode 100644
index 0000000000..e597e2ae43
--- /dev/null
+++ b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
@@ -0,0 +1,10 @@
+describe('ZoneUpcomingDeliveries', () => {
+ beforeEach(() => {
+ cy.login('developer');
+ cy.viewport(1920, 1080);
+ cy.visit(`/#/zone/upcoming-deliveries`);
+ cy.waitForElement('.q-page', 6000);
+ });
+
+ it('should show the page', () => {});
+});