From 565f343e19313939eb7576ff83c3a40f612e9426 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 22 Jun 2021 09:39:33 +0200
Subject: [PATCH] added isDelivered, isReceived and removed travel descriptor

---
 modules/entry/back/methods/entry/getEntry.js |  2 +-
 modules/entry/front/summary/index.html       | 21 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/entry/back/methods/entry/getEntry.js b/modules/entry/back/methods/entry/getEntry.js
index c14ca800a..30078c5f9 100644
--- a/modules/entry/back/methods/entry/getEntry.js
+++ b/modules/entry/back/methods/entry/getEntry.js
@@ -38,7 +38,7 @@ module.exports = Self => {
                 {
                     relation: 'travel',
                     scope: {
-                        fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk'],
+                        fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk', 'isReceived', 'isDelivered'],
                         include: [
                             {
                                 relation: 'agency',
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 3f91ddc26..60467ae88 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -34,12 +34,8 @@
             </vn-label-value>
         </vn-one>
         <vn-one>
-            <vn-label-value label="Agency">
-                <span
-                    ng-click="travelDescriptor.show($event, $ctrl.entry.travel.agencyFk)"
-                    class="link">
-                    {{$ctrl.entryData.travel.agency.name}}
-                </span>
+            <vn-label-value label="Agency"
+                value="{{$ctrl.entryData.travel.agency.name}}">
             </vn-label-value>
             <vn-label-value label="Shipped"
                 value="{{$ctrl.entryData.travel.shipped | date: 'dd/MM/yyyy'}}">
@@ -47,12 +43,22 @@
             <vn-label-value label="Warehouse Out"
                 value="{{$ctrl.entryData.travel.warehouseOut.name}}">
             </vn-label-value>
+            <vn-check
+                label="Delivered"
+                ng-model="$ctrl.entryData.travel.isDelivered"
+                disabled="true">
+            </vn-check>
             <vn-label-value label="Landed"
                 value="{{$ctrl.entryData.travel.landed | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Warehouse In"
                 value="{{$ctrl.entryData.travel.warehouseIn.name}}">
             </vn-label-value>
+            <vn-check
+                label="Received"
+                ng-model="$ctrl.entryData.travel.isReceived"
+                disabled="true">
+            </vn-check>
         </vn-one>
         <vn-one>
             <vn-vertical>
@@ -174,7 +180,4 @@
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
-<vn-travel-descriptor-popover
-    vn-id="travel-descriptor">
-</vn-travel-descriptor-popover>