diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index c656fcb2f..26b79b1bc 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -55,13 +55,6 @@ async function setCountry(countryFk, data) {
}
// Province
-
-async function handleProvinces(data) {
- provincesOptions.value = data;
- if (postcodeFormData.countryFk) {
- await fetchTowns();
- }
-}
async function setProvince(id, data) {
if (data.provinceFk === id) return;
const newProvince = provincesOptions.value.find((province) => province.id == id);
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 7fdb54bc4..940b72ff0 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -127,7 +127,7 @@ function resetData(data) {
originalData.value = JSON.parse(JSON.stringify(data));
formData.value = JSON.parse(JSON.stringify(data));
- if (watchChanges.value) watchChanges.value(); //destoy watcher
+ if (watchChanges.value) watchChanges.value(); //destroy watcher
watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
}
@@ -270,10 +270,8 @@ function getChanges() {
function isEmpty(obj) {
if (obj == null) return true;
- if (obj === undefined) return true;
- if (Object.keys(obj).length === 0) return true;
-
- if (obj.length > 0) return false;
+ if (Array.isArray(obj)) return !obj.length;
+ return !Object.keys(obj).length;
}
async function reload(params) {
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c569f2553..ea1ea53f2 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -1,7 +1,7 @@
@@ -144,7 +155,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
:order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
:columns="columns"
search-url="consumption"
- :filter="filter"
:user-params="userParams"
:default-remove="false"
:default-reset="false"
@@ -201,6 +211,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
class="q-px-sm q-pt-none fit"
dense
option-label="code"
+ @update:model-value="(data) => updateDateParams(data, params)"
>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 98e53d568..dc5f08d37 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@