From 1166a7966985973a52e204eb842d95ee5b465fc1 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 26 Dec 2023 15:59:52 -0400
Subject: [PATCH 1/4] Fix order descriptor total

---
 src/pages/Order/Card/OrderDescriptor.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 09c87f1384..d9fa464717 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -10,6 +10,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue";
+import FetchData from "components/FetchData.vue";
 
 const $props = defineProps({
     id: {
@@ -60,9 +61,15 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.client.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
+const total = ref(null);
 </script>
 
 <template>
+    <FetchData
+        :url="`Orders/${entityId}/getTotal`"
+        @on-fetch="(response) => (total = response)"
+        auto-load
+    />
     <CardDescriptor
         ref="descriptor"
         :url="`Orders/${entityId}`"
@@ -99,7 +106,7 @@ const setData = (entity) => {
             <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
             <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
             <VnLv :label="t('order.summary.items')" :value="(entity?.rows?.length || 0).toString()" />
-            <VnLv :label="t('order.summary.total')" :value="toCurrency(entity?.total)" />
+            <VnLv :label="t('order.summary.total')" :value="toCurrency(total)" />
         </template>
         <template #actions="{ entity }">
             <QCardActions>

From b22fcddcd363a57e9b06b92b55e83cb9e49ecdf5 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 26 Dec 2023 17:45:54 -0400
Subject: [PATCH 2/4] Create order lines

---
 src/i18n/en/index.js           |   3 +-
 src/i18n/es/index.js           |   1 +
 src/pages/Order/OrderLines.vue | 253 +++++++++++++++++++++++++++++++++
 src/router/modules/order.js    |  11 +-
 4 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Order/OrderLines.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 45df3f1ff9..2293cd76ff 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -557,7 +557,8 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             catalog: 'Catalog',
-            volume: 'Volume'
+            volume: 'Volume',
+            lines: 'Lines',
         },
         field: {
             salesPersonFk: 'Sales Person',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 90fdb18b6c..5744dc6828 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -467,6 +467,7 @@ export default {
             basicData: 'Datos básicos',
             catalog: 'Catálogo',
             volume: 'Volumen',
+            lines: 'Líneas',
         },
         field: {
             salesPersonFk: 'Comercial',
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
new file mode 100644
index 0000000000..e014ed44a5
--- /dev/null
+++ b/src/pages/Order/OrderLines.vue
@@ -0,0 +1,253 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import FetchData from 'components/FetchData.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import { ref } from 'vue';
+import { toCurrency, toDate } from 'src/filters';
+import CardList from 'components/ui/CardList.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useSession } from 'composables/useSession';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+
+const route = useRoute();
+const { t } = useI18n();
+const session = useSession();
+const quasar = useQuasar();
+const token = session.getToken();
+const orderSummary = ref({
+    total: null,
+    vat: null,
+});
+const componentKey = ref(0);
+
+const refresh = () => {
+    componentKey.value += 1;
+};
+
+function confirmRemove(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('confirmDeletion'),
+            message: t('confirmDeletionMessage'),
+            promise: async () => remove(item),
+        },
+    });
+}
+
+async function remove(item) {
+    await axios.post('OrderRows/removes', {
+        actualOrderId: route.params.id,
+        rows: [item.id],
+    });
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+    refresh();
+}
+</script>
+
+<template>
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getTotal`"
+        @on-fetch="(data) => (orderSummary.total = data)"
+        auto-load
+    />
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getVAT`"
+        @on-fetch="(data) => (orderSummary.vat = data)"
+        auto-load
+    />
+    <QPage :key="componentKey" class="column items-center q-pa-md">
+        <div class="card-list">
+            <QCard class="order-lines-summary q-pa-lg">
+                <p class="header text-right block">
+                    {{ t('summary') }}
+                </p>
+                <VnLv
+                    v-if="orderSummary.vat && orderSummary.total"
+                    :label="t('subtotal')"
+                    :value="toCurrency(orderSummary.total - orderSummary.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.vat"
+                    :label="t('VAT')"
+                    :value="toCurrency(orderSummary?.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.total"
+                    :label="t('total')"
+                    :value="toCurrency(orderSummary?.total)"
+                />
+            </QCard>
+            <VnPaginate
+                data-key="OrderLines"
+                url="OrderRows"
+                :limit="20"
+                auto-load
+                :filter="{
+                    include: [
+                        {
+                            relation: 'item',
+                        },
+                        {
+                            relation: 'warehouse',
+                        },
+                    ],
+                    where: { orderFk: route.params.id },
+                }"
+            >
+                <template #body="{ rows }">
+                    <div class="catalog-list q-mt-xl">
+                        <CardList
+                            v-for="row in rows"
+                            :key="row.id"
+                            :id="row.id"
+                            :title="row?.item?.name"
+                            class="cursor-inherit"
+                        >
+                            <template #title>
+                                <div class="flex items-center">
+                                    <div class="image-wrapper q-mr-md">
+                                        <QImg
+                                            :src="`/api/Images/catalog/50x50/${row?.item?.id}/download?access_token=${token}`"
+                                            spinner-color="primary"
+                                            :ratio="1"
+                                            height="50"
+                                            width="50"
+                                            class="image"
+                                        />
+                                    </div>
+                                    <div
+                                        class="title text-primary text-weight-bold text-h5"
+                                    >
+                                        {{ row?.item?.name }}
+                                    </div>
+                                    <QChip class="q-chip-color" outline size="sm">
+                                        {{ t('ID') }}: {{ row.id }}
+                                    </QChip>
+                                </div>
+                            </template>
+                            <template #list-items>
+                                <div class="q-mb-sm">
+                                    <span class="text-uppercase">
+                                        {{ row.item.subName }}
+                                    </span>
+                                    <fetched-tags :item="row.item" :max-length="5" />
+                                </div>
+                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv
+                                    :label="t('warehouse')"
+                                    :value="row.warehouse.name"
+                                />
+                                <VnLv
+                                    :label="t('shipped')"
+                                    :value="toDate(row.shipped)"
+                                />
+                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv
+                                    :label="t('price')"
+                                    :value="toCurrency(row.price)"
+                                />
+                                <VnLv
+                                    :label="t('amount')"
+                                    :value="toCurrency(row.price * row.quantity)"
+                                />
+                            </template>
+                            <template #actions>
+                                <QBtn
+                                    :label="t('remove')"
+                                    @click.stop="confirmRemove(row)"
+                                    color="primary"
+                                    style="margin-top: 15px"
+                                />
+                            </template>
+                        </CardList>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<style lang="scss">
+.order-lines-summary {
+    .vn-label-value {
+        display: flex;
+        justify-content: flex-end;
+        gap: 2%;
+
+        .label {
+            color: var(--vn-label);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .value {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
+.header {
+    color: $primary;
+    font-weight: bold;
+    margin-bottom: 25px;
+    font-size: 20px;
+    display: inline-block;
+}
+
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+
+    .image {
+        border-radius: 50%;
+    }
+}
+</style>
+<i18n>
+en:
+    summary: Summary
+    subtotal: Subtotal
+    VAT: VAT
+    total: Total
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    remove: Remove
+    confirmDeletion: Confirm deletion,
+    confirmDeletionMessage: Are you sure you want to delete this item?
+es:
+    summary: Resumen
+    subtotal: Subtotal
+    VAT: IVA
+    total: Total
+    item: Artículo
+    warehouse: Almacén
+    shipped: F. envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    remove: Eliminar
+    confirmDeletion: Confirmar eliminación,
+    confirmDeletionMessage: Seguro que quieres eliminar este artículo?
+</i18n>
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 8a55a39d28..4599394cd5 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'OrderMain' },
     menus: {
         main: ['OrderList'],
-        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume'],
+        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'],
     },
     children: [
         {
@@ -81,6 +81,15 @@ export default {
                     },
                     component: () => import('src/pages/Order/OrderVolume.vue'),
                 },
+                {
+                    name: 'OrderLines',
+                    path: 'line',
+                    meta: {
+                        title: 'lines',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('src/pages/Order/OrderLines.vue'),
+                },
             ],
         },
     ],

From e3fd9bf54b720e2967266a60649d959fcbf2a84c Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 27 Dec 2023 07:52:47 -0400
Subject: [PATCH 3/4] Add order confirmation

---
 src/pages/Order/OrderLines.vue | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index e014ed44a5..38ed8f9b05 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -50,6 +50,14 @@ async function remove(item) {
     });
     refresh();
 }
+
+async function confirmOrder() {
+    await axios.post(`Orders/${route.params.id}/confirm`);
+    quasar.notify({
+        message: t('globals.confirm'),
+        type: 'positive',
+    });
+}
 </script>
 
 <template>
@@ -137,12 +145,12 @@ async function remove(item) {
                             </template>
                             <template #list-items>
                                 <div class="q-mb-sm">
-                                    <span class="text-uppercase">
+                                    <span class="text-uppercase subname">
                                         {{ row.item.subName }}
                                     </span>
                                     <fetched-tags :item="row.item" :max-length="5" />
                                 </div>
-                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv :label="t('item')" :value="String(row.item.id)" />
                                 <VnLv
                                     :label="t('warehouse')"
                                     :value="row.warehouse.name"
@@ -151,7 +159,7 @@ async function remove(item) {
                                     :label="t('shipped')"
                                     :value="toDate(row.shipped)"
                                 />
-                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv :label="t('quantity')" :value="String(row.quantity)" />
                                 <VnLv
                                     :label="t('price')"
                                     :value="toCurrency(row.price)"
@@ -174,6 +182,12 @@ async function remove(item) {
                 </template>
             </VnPaginate>
         </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
+            <QTooltip>
+                {{ t('confirm') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
 <style lang="scss">
@@ -220,6 +234,10 @@ async function remove(item) {
         border-radius: 50%;
     }
 }
+
+.subname {
+    color: var(--vn-label);
+}
 </style>
 <i18n>
 en:
@@ -236,6 +254,7 @@ en:
     remove: Remove
     confirmDeletion: Confirm deletion,
     confirmDeletionMessage: Are you sure you want to delete this item?
+    confirm: Confirm
 es:
     summary: Resumen
     subtotal: Subtotal
@@ -250,4 +269,5 @@ es:
     remove: Eliminar
     confirmDeletion: Confirmar eliminación,
     confirmDeletionMessage: Seguro que quieres eliminar este artículo?
+    confirm: Confirmar
 </i18n>

From 4de1b52c30c51b6ed79e56d5c849b747ad042fef Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 27 Dec 2023 08:08:19 -0400
Subject: [PATCH 4/4] Implement orders no results

---
 src/i18n/en/index.js             |  1 +
 src/i18n/es/index.js             |  1 +
 src/pages/Order/OrderCatalog.vue | 12 +++++++++++-
 src/pages/Order/OrderLines.vue   | 17 +++++++++++++++--
 src/pages/Order/OrderVolume.vue  | 20 +++++++++++++++-----
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2293cd76ff..b18c00325a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -63,6 +63,7 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
+        noResults: 'No results'
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 5744dc6828..0c3a747c6d 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,6 +63,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
+        noResults: 'Sin resultados'
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index ec81c50f14..08075260c8 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -70,6 +70,9 @@ function exprBuilder(param, value) {
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
+                        <div v-if="rows && !rows?.length" class="no-result">
+                            {{ t('globals.noResults') }}
+                        </div>
                         <OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
                     </div>
                 </template>
@@ -78,7 +81,7 @@ function exprBuilder(param, value) {
     </QPage>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .card-list {
     width: 100%;
 }
@@ -90,4 +93,11 @@ function exprBuilder(param, value) {
     justify-content: center;
     gap: 16px;
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 38ed8f9b05..316c9ae3f2 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -75,7 +75,10 @@ async function confirmOrder() {
     />
     <QPage :key="componentKey" class="column items-center q-pa-md">
         <div class="card-list">
-            <QCard class="order-lines-summary q-pa-lg">
+            <div v-if="!orderSummary.total" class="no-result">
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-lines-summary q-pa-lg">
                 <p class="header text-right block">
                     {{ t('summary') }}
                 </p>
@@ -159,7 +162,10 @@ async function confirmOrder() {
                                     :label="t('shipped')"
                                     :value="toDate(row.shipped)"
                                 />
-                                <VnLv :label="t('quantity')" :value="String(row.quantity)" />
+                                <VnLv
+                                    :label="t('quantity')"
+                                    :value="String(row.quantity)"
+                                />
                                 <VnLv
                                     :label="t('price')"
                                     :value="toCurrency(row.price)"
@@ -238,6 +244,13 @@ async function confirmOrder() {
 .subname {
     color: var(--vn-label);
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
 <i18n>
 en:
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 2c962600ed..48d91574b9 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -34,14 +34,17 @@ const loadVolumes = async (rows) => {
     />
     <QPage class="column items-center q-pa-md">
         <div class="card-list">
-            <QCard class="order-volume-summary q-pa-lg">
+            <div
+                v-if="!volumeSummary?.totalVolume && !volumeSummary?.totalBoxes"
+                class="no-result"
+            >
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-volume-summary q-pa-lg">
                 <p class="header text-right block">
                     {{ t('summary') }}
                 </p>
-                <VnLv
-                    :label="t('total')"
-                    :value="`${volumeSummary?.totalVolume} m³`"
-                />
+                <VnLv :label="t('total')" :value="`${volumeSummary?.totalVolume} m³`" />
                 <VnLv
                     :label="t('boxes')"
                     :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
@@ -128,6 +131,13 @@ const loadVolumes = async (rows) => {
     font-size: 20px;
     display: inline-block;
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
 <i18n>
 en: