From e01b7420d964c521595f39463e9693f3dc6e24ff Mon Sep 17 00:00:00 2001
From: jorgebl <jorgebl.verdnatura@gmail.com>
Date: Wed, 24 Mar 2021 13:54:29 +0100
Subject: [PATCH 1/4] Added total cost  of item

---
 .../item/back/methods/item/lastEntriesFilter.js  |  3 +++
 modules/item/front/last-entries/index.html       | 16 +++++++++++++++-
 modules/item/front/last-entries/locale/es.yml    |  5 ++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
index 63e154b9e..a3e520e77 100644
--- a/modules/item/back/methods/item/lastEntriesFilter.js
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -41,6 +41,9 @@ module.exports = Self => {
                 i.stems,
                 b.quantity,
                 b.buyingValue,
+                b.freightValue,
+                b.comissionValue,
+                b.packageValue,
                 b.packageFk ,
                 s.id AS supplierFk,
                 s.name AS supplier
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index dd63bec27..65ba04e2d 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -72,7 +72,21 @@
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.quantity}}</vn-td>
-                        <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
+                        <vn-td translate number 
+                            class="expendable"
+                            ng-init="
+                                itemCostTotal = 
+                                entry.buyingValue + 
+                                entry.packageValue + 
+                                entry.freightValue + 
+                                entry.comissionValue" 
+                            vn-tooltip="
+                                {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}} + 
+                                {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}} + 
+                                {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}} + 
+                                {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
+                            {{itemCostTotal | dashIfEmpty}}
+                        </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
                         <vn-td class="expendable" title="{{::entry.supplier | dashIfEmpty}}">{{::entry.supplier | dashIfEmpty}}</vn-td>
diff --git a/modules/item/front/last-entries/locale/es.yml b/modules/item/front/last-entries/locale/es.yml
index 0eac6eaa6..f2917bb63 100644
--- a/modules/item/front/last-entries/locale/es.yml
+++ b/modules/item/front/last-entries/locale/es.yml
@@ -9,4 +9,7 @@ Ignored: Ignorado
 Provider: Proveedor
 Cube: Cubo
 Price Per Unit: Precio Por Unidad
-Price Per Package: Precio Por Paquete
\ No newline at end of file
+Price Per Package: Precio Por Paquete
+Freight: Porte
+Package: Embalaje
+Comission: Comision
\ No newline at end of file
-- 
2.40.1


From 393b9ba38cb3726ec2daad55d0cd3395de3d2acf Mon Sep 17 00:00:00 2001
From: jorgebl <jorgebl.verdnatura@gmail.com>
Date: Wed, 24 Mar 2021 14:17:27 +0100
Subject: [PATCH 2/4] Correct name

---
 modules/item/front/last-entries/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 65ba04e2d..2a8f421db 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -75,7 +75,7 @@
                         <vn-td translate number 
                             class="expendable"
                             ng-init="
-                                itemCostTotal = 
+                                itemTotalCost = 
                                 entry.buyingValue + 
                                 entry.packageValue + 
                                 entry.freightValue + 
@@ -85,7 +85,7 @@
                                 {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}} + 
                                 {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}} + 
                                 {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
-                            {{itemCostTotal | dashIfEmpty}}
+                            {{itemTotalCost | dashIfEmpty}}
                         </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
-- 
2.40.1


From 3c8ed85e696929b9e3cfcc7252352958c4d51023 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Fri, 26 Mar 2021 10:33:53 +0100
Subject: [PATCH 3/4] sum is now made on backend and html amends

---
 .../back/methods/item/lastEntriesFilter.js    |  4 ++++
 modules/item/front/last-entries/index.html    | 24 ++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
index a3e520e77..25665cad0 100644
--- a/modules/item/back/methods/item/lastEntriesFilter.js
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -40,6 +40,10 @@ module.exports = Self => {
                 b.weight,
                 i.stems,
                 b.quantity,
+                b.buyingValue + 
+                    b.freightValue + 
+                    b.comissionValue + 
+                    b.packageValue AS cost,
                 b.buyingValue,
                 b.freightValue,
                 b.comissionValue,
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 2a8f421db..f0cb06521 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -72,20 +72,16 @@
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.quantity}}</vn-td>
-                        <vn-td translate number 
-                            class="expendable"
-                            ng-init="
-                                itemTotalCost = 
-                                entry.buyingValue + 
-                                entry.packageValue + 
-                                entry.freightValue + 
-                                entry.comissionValue" 
-                            vn-tooltip="
-                                {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}} + 
-                                {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}} + 
-                                {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}} + 
-                                {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
-                            {{itemTotalCost | dashIfEmpty}}
+                        <vn-td number 
+                            class="expendable">
+                                <span
+                                    vn-tooltip="
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br> 
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
+                                    {{::entry.cost | dashIfEmpty}}
+                                </span>
                         </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
-- 
2.40.1


From 767665e3c9ae48e36e14c2c5afb09f0ecf8481d6 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Fri, 26 Mar 2021 10:39:19 +0100
Subject: [PATCH 4/4] endpoint indentation + type updated yo array of objects

---
 modules/item/back/methods/item/lastEntriesFilter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
index 25665cad0..6f22f637f 100644
--- a/modules/item/back/methods/item/lastEntriesFilter.js
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -12,7 +12,7 @@ module.exports = Self => {
             description: 'itemFk, id'
         }],
         returns: {
-            type: 'Array',
+            type: ['Object'],
             root: true
         },
         http: {
@@ -52,7 +52,7 @@ module.exports = Self => {
                 s.id AS supplierFk,
                 s.name AS supplier
             FROM itemType it
-            RIGHT JOIN (entry e 
+                RIGHT JOIN (entry e 
                     LEFT JOIN supplier s ON s.id = e.supplierFk
                     RIGHT JOIN buy b ON b.entryFk = e.id
                     LEFT JOIN item i ON i.id = b.itemFk
-- 
2.40.1