Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

src/components/VnTable/VnTable.vue

@@ -59,8 +59,8 @@ const $props = defineProps({
         default: true,
     },
     bottom: {
-        type: Object,
+        type: Boolean,
-        default: null,
+        default: false,
     },
     cardClass: {
         type: String,
@@ -477,29 +477,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         />
                     </QTd>
                 </template>
-                <template #bottom v-if="bottom">
-                    <slot name="bottom-table">
-                        <QBtn
-                            @click="
-                                () =>
-                                    createAsDialog
-                                        ? (showForm = !showForm)
-                                        : handleOnDataSaved(create)
-                            "
-                            class="cursor-pointer fill-icon"
-                            color="primary"
-                            icon="add_circle"
-                            size="md"
-                            round
-                            flat
-                            shortcut="+"
-                            :disabled="!disabledAttr"
-                        />
-                        <QTooltip>
-                            {{ createForm.title }}
-                        </QTooltip>
-                    </slot>
-                </template>
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
@@ -630,6 +607,27 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     </QTr>
                 </template>
             </QTable>
+            <div class="full-width bottomButton" v-if="bottom">
+                <QBtn
+                    @click="
+                        () =>
+                            createAsDialog
+                                ? (showForm = !showForm)
+                                : handleOnDataSaved(create)
+                    "
+                    class="cursor-pointer fill-icon"
+                    color="primary"
+                    icon="add_circle"
+                    size="md"
+                    round
+                    flat
+                    shortcut="+"
+                    :disabled="!disabledAttr"
+                />
+                <QTooltip>
+                    {{ createForm.title }}
+                </QTooltip>
+            </div>
         </template>
     </CrudModel>
     <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">

src/components/common/VnSelect.vue

@@ -166,7 +166,11 @@ onMounted(() => {
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
 
 function findKeyInOptions() {
     if (!$props.options) return;

src/components/ui/VnSms.vue

@@ -54,6 +54,7 @@ function formatNumber(number) {
                 :offset="100"
                 :limit="5"
                 auto-load
+                map-key="smsFk"
             >
                 <template #body="{ rows }">
                     <QCard

src/css/app.scss

@@ -149,7 +149,8 @@ select:-webkit-autofill {
 .q-card,
 .q-table,
 .q-table__bottom,
-.q-drawer {
+.q-drawer,
+.bottomButton {
     background-color: var(--vn-section-color);
 }
 

src/pages/Customer/Card/CustomerConsumption.vue

@@ -2,7 +2,7 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters/index';
+import { dateRange, toDate } from 'src/filters/index';
 import { useRoute } from 'vue-router';
 
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -104,18 +104,12 @@ function getParams() {
     };
 }
 const userParams = computed(() => {
-    const minDate = Date.vnNew();
+    const campaign = campaignList.value[0]?.id;
-    minDate.setHours(0, 0, 0, 0);
+    const userParams = {
-    minDate.setMonth(minDate.getMonth() - 2);
+        campaign,
-
+        ...updateDateParams(campaign, { from: Date.vnNew(), to: Date.vnNew() }),
-    const maxDate = Date.vnNew();
-    maxDate.setHours(23, 59, 59, 59);
-
-    return {
-        campaign: campaignList.value[0]?.id,
-        from: minDate,
-        to: maxDate,
     };
+    return userParams;
 });
 const openReportPdf = () => {
     openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
@@ -134,6 +128,23 @@ const sendCampaignMetricsEmail = ({ address }) => {
         ...getParams(),
     });
 };
+
+const updateDateParams = (value, params) => {
+    if (!value) {
+        params.from = null;
+        params.to = null;
+        return;
+    }
+    const campaign = campaignList.value.find((c) => c.id === value);
+    if (!campaign) return;
+
+    const { dated, previousDays, scopeDays } = campaign;
+    const _date = new Date(dated);
+    const [from, to] = dateRange(_date);
+    params.from = new Date(from.setDate(from.getDate() - previousDays)).toISOString();
+    params.to = new Date(to.setDate(to.getDate() + scopeDays)).toISOString();
+    return params;
+};
 </script>
 
 <template>
@@ -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)"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

src/pages/Ticket/Card/TicketSale.vue

@@ -54,6 +54,7 @@ const transfer = ref({
 });
 const tableRef = ref([]);
 const canProceed = ref();
+const isLoading = ref(false);
 
 watch(
     () => route.params.id,
@@ -213,6 +214,9 @@ const updateQuantity = async ({ quantity, id }) => {
 };
 
 const addSale = async (sale) => {
+    if (isLoading.value) return;
+
+    isLoading.value = true;
     const params = {
         barcode: sale.itemFk,
         quantity: sale.quantity,
@@ -233,7 +237,7 @@ const addSale = async (sale) => {
     sale.item = newSale.item;
 
     notify('globals.dataSaved', 'positive');
-    window.location.reload();
+    arrayData.fetch({});
 };
 
 const updateConcept = async (sale) => {
@@ -464,6 +468,7 @@ const addRow = (original = null) => {
 };
 
 const endNewRow = (row) => {
+    if (!row) return;
     if (row.itemFk && row.quantity) {
         row.isNew = false;
     }

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                sort-by="code, townFk"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"
@@ -97,6 +97,7 @@ watch(
                 dense
                 outlined
                 rounded
+                map-key="geoFk"
             >
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">