diff --git a/src/css/app.scss b/src/css/app.scss
index 0c5dc97fa..994ae7ff1 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -335,3 +335,7 @@ input::-webkit-inner-spin-button {
border: 1px solid;
box-shadow: 0 4px 6px #00000000;
}
+
+.containerShrinked {
+ width: 80%;
+}
diff --git a/src/pages/Zone/Card/ZoneCalendar.vue b/src/pages/Zone/Card/ZoneCalendar.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 3a35527ab..bbe12189a 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -38,7 +38,12 @@ const agencies = ref([]);
-
+
@@ -53,6 +58,7 @@ const agencies = ref([]);
dense
outlined
rounded
+ data-cy="zoneFilterPanelAgencySelect"
>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 1fa539c91..d6297e973 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -65,7 +65,6 @@ const tableFilter = {
const columns = computed(() => [
{
- align: 'left',
name: 'id',
label: t('list.id'),
chip: {
@@ -75,6 +74,8 @@ const columns = computed(() => [
columnFilter: {
inWhere: true,
},
+ columnClass: 'shrink-column',
+ component: 'number',
},
{
align: 'left',
@@ -106,7 +107,6 @@ const columns = computed(() => [
format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
},
{
- align: 'left',
name: 'price',
label: t('list.price'),
cardVisible: true,
@@ -114,9 +114,11 @@ const columns = computed(() => [
columnFilter: {
inWhere: true,
},
+ columnClass: 'shrink-column',
+ component: 'number',
},
{
- align: 'left',
+ align: 'center',
name: 'hour',
label: t('list.close'),
cardVisible: true,
@@ -177,67 +179,73 @@ function formatRow(row) {
-
-
- {{ dashIfEmpty(formatRow(row)) }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ dashIfEmpty(formatRow(row)) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -245,3 +253,20 @@ es:
Search zone: Buscar zona
You can search zones by id or name: Puedes buscar zonas por id o nombre
+
+
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index c74ae6078..adcdfbc04 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -56,7 +56,7 @@ onMounted(() => weekdayStore.initStore());
-
+
{
+ const agency = 'inhouse pickup';
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('developer');
@@ -6,11 +7,15 @@ describe('ZoneList', () => {
});
it('should filter by agency', () => {
- cy.get('input[aria-label="Agency"]').type('{downArrow}{enter}');
+ cy.dataCy('zoneFilterPanelNameInput').type('{downArrow}{enter}');
});
it('should open the zone summary', () => {
- cy.get('input[aria-label="Name"]').type('zone refund');
- cy.get('.q-scrollarea__content > .q-btn--standard > .q-btn__content').click();
+ cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
+ cy.get('.q-menu .q-item').contains(agency).click();
+ cy.get(':nth-child(1) > [data-col-field="agencyModeFk"]').should(
+ 'include.text',
+ agency,
+ );
});
});