From 87551058dc94c3a463a71d28ba3b6b08affff9c5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 10:18:43 +0100
Subject: [PATCH 1/4] fix: rollback

---
 src/pages/Worker/Card/WorkerBalance.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 95e0b986e..25ab92c9b 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -15,9 +15,6 @@ const columns = computed(() => [
         name: 'paymentDate',
         label: t('worker.balance.tableVisibleColumns.paymentDate'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'date',
         field: 'paymentDate',
         cardVisible: true,
@@ -27,9 +24,6 @@ const columns = computed(() => [
         name: 'incomeTypeFk',
         label: t('worker.balance.tableVisibleColumns.incomeType'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'select',
         attrs: {
             options: payrollComponents,
@@ -43,9 +37,6 @@ const columns = computed(() => [
         name: 'debit',
         label: t('worker.balance.tableVisibleColumns.debit'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'input',
         field: 'debit',
         cardVisible: true,
@@ -55,9 +46,6 @@ const columns = computed(() => [
         name: 'credit',
         label: t('worker.balance.tableVisibleColumns.credit'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'input',
         field: 'credit',
         cardVisible: true,
-- 
2.40.1


From 542ec13cfedbf583e62968a3b3c23f3a766dfe02 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 11:30:48 +0100
Subject: [PATCH 2/4] feat: add flag attr to prevent submit

---
 src/boot/qformMixin.js                               | 2 +-
 src/components/FormModel.vue                         | 2 ++
 src/pages/Customer/components/CustomerNewPayment.vue | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index fc7852369..8d009dbea 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -8,7 +8,7 @@ export default {
                 // TODO: AUTOFOCUS IS NOT FOCUSING
                 const that = this;
                 this.$el.addEventListener('keyup', function (evt) {
-                    if (evt.key === 'Enter') {
+                    if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
                         const input = evt.target;
                         if (input.type == 'textarea' && evt.shiftKey) {
                             evt.preventDefault();
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 2cb6ad8e6..03709d93b 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -285,6 +285,7 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
+        {{ $attrs }}
         <QForm
             ref="myForm"
             v-if="formData"
@@ -293,6 +294,7 @@ defineExpose({
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
+            :prevent-submit="$attrs['prevent-submit']"
         >
             <QCard>
                 <slot
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 291f28642..7c2cc6dc4 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -189,6 +189,7 @@ async function getAmountPaid() {
             :url-create="urlCreate"
             :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
+            :prevent-submit="true"
         >
             <template #form="{ data, validate }">
                 <span ref="closeButton" class="row justify-end close-icon" v-close-popup>
-- 
2.40.1


From f4d7982228919875165461eefc3fe786bc7edca9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 11:34:08 +0100
Subject: [PATCH 3/4] fix: remove useless code

---
 src/components/FormModel.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 03709d93b..c569f2553 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -285,7 +285,6 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
-        {{ $attrs }}
         <QForm
             ref="myForm"
             v-if="formData"
-- 
2.40.1


From 740cca2b93f87bf43aac7532c45f3c650b52c789 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 13:03:18 +0100
Subject: [PATCH 4/4] fix: not trigger submit on enter

---
 src/pages/Customer/components/CustomerNewPayment.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 7c2cc6dc4..c2c38b55a 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -304,7 +304,7 @@ async function getAmountPaid() {
                         :label="t('globals.save')"
                         :loading="formModelRef.isLoading"
                         color="primary"
-                        type="submit"
+                        @click="formModelRef.save()"
                     />
                 </div>
             </template>
-- 
2.40.1