Merge branch 'dev' into 7206-ModifySelectAddress

src/components/ui/VnConfirm.vue

@@ -35,6 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
 
 const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } =
     useDialogPluginComponent();
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const title = props.title || t('Confirm');
 const message =

src/i18n/locale/en.yml

@@ -705,6 +705,8 @@ order:
         quantity: Quantity
         price: Price
         amount: Amount
+        confirm: Confirm
+        confirmLines: Confirm lines
 department:
     pageTitles:
         basicData: Basic data

src/i18n/locale/es.yml

@@ -681,13 +681,15 @@ order:
         vat: IVA
         state: Estado
         alias: Alias
-        items: Items
+        items: Artículos
         orderTicketList: Tickets del pedido
         details: Detalles
         item: Item
         quantity: Cantidad
         price: Precio
         amount: Monto
+        confirm: Confirmar
+        confirmLines: Confirmar lineas
 shelving:
     list:
         parking: Parking

src/pages/Entry/EntryBuysTableDialog.vue

@@ -121,7 +121,7 @@ const entriesTableColumns = computed(() => [
                                         :loading="isLoading"
                                         @click="
                                             openReport(
-                                                `Entries/${props.row.id}/buy-label`
+                                                `Entries/${props.row.id}/buy-label-supplier`
                                             )
                                         "
                                         unelevated

src/pages/Item/ItemList.vue

@@ -215,7 +215,7 @@ const columns = computed(() => [
         columnFilter: {
             name: 'workerFk',
             attrs: {
-                url: 'VnUsers/preview',
+                url: 'TicketRequests/getItemTypeWorker',
                 optionValue: 'id',
                 optionLabel: 'nickname',
             },

src/pages/Item/ItemRequest.vue

@@ -104,7 +104,7 @@ const columns = computed(() => [
         columnFilter: {
             name: 'attenderFk',
             attrs: {
-                url: 'VnUsers/preview',
+                url: 'TicketRequests/getItemTypeWorker',
                 optionValue: 'id',
                 optionLabel: 'nickname',
             },

src/pages/Order/Card/OrderCatalog.vue

@@ -102,6 +102,7 @@ function extractValueTags(items) {
                             :key="row.id"
                             :item="row"
                             is-catalog
+                            class="fill-icon"
                         />
                     </div>
                 </template>

src/pages/Order/Card/OrderDescriptor.vue

@@ -71,10 +71,6 @@ const getConfirmationValue = (isConfirmed) => {
 };
 
 const total = ref(null);
-
-function ticketFilter(order) {
-    return JSON.stringify({ id: order.id });
-}
 </script>
 
 <template>
@@ -126,7 +122,11 @@ function ticketFilter(order) {
                     color="primary"
                     :to="{
                         name: 'TicketList',
-                        query: { table: ticketFilter(entity) },
+                        query: {
+                            table: JSON.stringify({
+                                orderFk: entity.id,
+                            }),
+                        },
                     }"
                 >
                     <QTooltip>{{ t('order.summary.orderTicketList') }}</QTooltip>

src/pages/Order/Card/OrderDescriptorMenu.vue

@@ -23,8 +23,8 @@ function confirmRemove() {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('globals.confirmDeletion'),
+                title: t('You are going to delete this order'),
-                message: t('confirmDeletionMessage'),
+                message: t('Continue anyway?'),
                 promise: remove,
             },
         })
@@ -57,5 +57,6 @@ en:
 es:
     deleteOrder: Eliminar pedido
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
-
+    You are going to delete this order: El pedido se eliminará
+    Continue anyway?: ¿Continuar de todos modos?
 </i18n>

src/pages/Order/Card/OrderLines.vue

@@ -6,6 +6,7 @@ import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
+import { confirm } from 'src/pages/Order/composables/confirmOrder';
 import { toCurrency, toDate } from 'src/filters';
 
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -31,7 +32,6 @@ const orderSummary = ref({
 });
 const getTotalRef = ref();
 const getVATRef = ref();
-
 const lineFilter = ref({
     include: [
         {
@@ -168,7 +168,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Delete'),
+                title: t('Remove item'),
                 icon: 'delete',
                 show: (row) => !row.order.isConfirmed,
                 action: (row) => confirmRemove(row),
@@ -204,10 +204,11 @@ async function remove(item) {
     getVATRef.value.fetch();
 }
 
-async function confirmOrder() {
+async function handleConfirm() {
-    await axios.post(`Orders/${route.params.id}/confirm`);
+    const result = await confirm(route.params.id);
+    if (result) {
         quasar.notify({
-        message: t('globals.confirm'),
+            message: t('globals.dataSaved'),
             type: 'positive',
         });
         router.push({
@@ -217,7 +218,7 @@ async function confirmOrder() {
             },
         });
     }
-
+}
 watch(
     () => router.currentRoute.value.params.id,
     () => {
@@ -314,7 +315,7 @@ watch(
         </template>
     </VnTable>
     <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
-        <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
+        <QBtn fab icon="check" color="primary" @click="handleConfirm()" />
         <QTooltip>
             {{ t('confirm') }}
         </QTooltip>
@@ -401,4 +402,5 @@ es:
     confirmDeletion: Confirmar eliminación,
     confirmDeletionMessage: Seguro que quieres eliminar este artículo?
     confirm: Confirmar
+    Remove item: Eliminar artículo
 </i18n>

src/pages/Order/Card/OrderSummary.vue

@@ -2,7 +2,10 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
+import { confirm } from 'src/pages/Order/composables/confirmOrder';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -21,6 +24,9 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
+const summary = ref();
+const quasar = useQuasar();
+const descriptorData = useArrayData('orderData');
 const detailsColumns = ref([
     {
         name: 'item',
@@ -49,6 +55,18 @@ const detailsColumns = ref([
         field: (row) => toCurrency(row?.quantity * row?.price),
     },
 ]);
+
+async function handleConfirm() {
+    const result = await confirm(route.params.id);
+    if (result) {
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+        summary.value.fetch({});
+        descriptorData.fetch({});
+    }
+}
 </script>
 
 <template>
@@ -62,6 +80,17 @@ const detailsColumns = ref([
                 {{ t('order.summary.basket') }} #{{ entity?.id }} -
                 {{ entity?.client?.name }} ({{ entity?.clientFk }})
             </template>
+            <template #header-right>
+                <QBtn
+                    flat
+                    text-color="white"
+                    :disabled="isConfirmed"
+                    :label="t('order.summary.confirm')"
+                    @click="handleConfirm()"
+                >
+                    <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
+                </QBtn>
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle

src/pages/Order/composables/confirmOrder.js

@@ -0,0 +1,5 @@
+import axios from 'axios';
+
+export async function confirm(routeId) {
+    return await axios.post(`Orders/${routeId}/confirm`);
+}

src/pages/Ticket/Card/TicketCreateRequest.vue

@@ -56,6 +56,7 @@ const attendersOptions = ref([]);
                     v-model="data.price"
                     :label="t('purchaseRequest.price')"
                     type="number"
+                    step="0.01"
                     min="0"
                 />
             </VnRow>

test/cypress/integration/outLogin/logout.spec.js

@@ -13,7 +13,7 @@ describe('Logout', () => {
     });
     describe('not user', () => {
         beforeEach(() => {
-            cy.intercept('GET', '**DefaultViewConfigs**', {
+            cy.intercept('GET', '**StarredModules**', {
                 statusCode: 401,
                 body: {
                     error: {
@@ -29,10 +29,7 @@ describe('Logout', () => {
 
         it('when token not exists', () => {
             cy.get('.q-list > [href="#/item"]').click();
-            cy.get('.q-notification__message').should(
+            cy.checkNotification('Authorization Required');
-                'have.text',
-                'Authorization Required'
-            );
         });
     });
 });