Merge branch 'dev' into 7006-itemTypeLog

src/boot/mainShortcutMixin.js

@@ -1,38 +0,0 @@
-import routes from 'src/router/modules';
-import { useRouter } from 'vue-router';
-
-let isNotified = false;
-
-export default {
-    created: function () {
-        const router = useRouter();
-        const keyBindingMap = routes
-            .filter((route) => route.meta.keyBinding)
-            .reduce((map, route) => {
-                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
-                return map;
-            }, {});
-
-        const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, code } = event;
-
-            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
-                event.preventDefault();
-                router.push(keyBindingMap[code]);
-                isNotified = true;
-            }
-        };
-
-        const handleKeyUp = (event) => {
-            const { ctrlKey, altKey } = event;
-
-            // Resetea la bandera cuando se sueltan las teclas ctrl o alt
-            if (!ctrlKey || !altKey) {
-                isNotified = false;
-            }
-        };
-
-        window.addEventListener('keydown', handleKeyDown);
-        window.addEventListener('keyup', handleKeyUp);
-    },
-};

src/boot/quasar.js

@@ -1,6 +1,5 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
-import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
 import useNotify from 'src/composables/useNotify.js';
 import { CanceledError } from 'axios';
@@ -9,7 +8,6 @@ const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
-    app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
     app.config.errorHandler = (error) => {
         let message;

src/components/VnTable/VnColumn.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QIcon, QCheckbox } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 

src/components/VnTable/VnFilter.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QCheckbox } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 

src/layouts/MainLayout.vue

@@ -1,7 +1,44 @@
 <script setup>
 import { useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
+import { useRouter } from 'vue-router';
+import routes from 'src/router/modules';
+import { onMounted } from 'vue';
+
 const quasar = useQuasar();
+
+onMounted(() => {
+    let isNotified = false;
+
+    const router = useRouter();
+    const keyBindingMap = routes
+        .filter((route) => route.meta.keyBinding)
+        .reduce((map, route) => {
+            map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+            return map;
+        }, {});
+
+    const handleKeyDown = (event) => {
+        const { ctrlKey, altKey, code } = event;
+
+        if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
+            event.preventDefault();
+            router.push(keyBindingMap[code]);
+            isNotified = true;
+        }
+    };
+
+    const handleKeyUp = (event) => {
+        const { ctrlKey, altKey } = event;
+
+        if (!ctrlKey || !altKey) {
+            isNotified = false;
+        }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keyup', handleKeyUp);
+});
 </script>
 
 <template>

src/pages/Ticket/Card/TicketSale.vue

@@ -539,6 +539,7 @@ watch(
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
                     @update-discounts="updateDiscount"
+                    @refresh-table="resetChanges"
                 />
                 <QBtn
                     color="primary"

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
 import { useRole } from 'src/composables/useRole';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const emit = defineEmits(['updateDiscounts', 'getMana']);
+const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
 
 const props = defineProps({
     disable: {
@@ -107,6 +107,7 @@ const calculateSalePrice = async () => {
 
     await axios.post(`Sales/recalculatePrice`, props.sales);
     notify(t('globals.dataSaved'), 'positive');
+    emit('refreshTable', props.sales);
 };
 
 const changeMultipleDiscount = () => {