stowaway fixes

modules/item/front/ticket-descriptor/addStowaway.js

@@ -18,8 +18,9 @@ class Controller {
     addStowaway(index) {
         let params = {id: this.possibleStowaways[index].id, shipFk: this.ticket.id};
         this.$http.post(`/api/Stowaways/`, params)
-            .then(() => {
-                this.card.reload();
+            .then(res => {
+                this.ticket.ship.push = res.data[0];
+                this.hide;
             });
     }
 
@@ -39,8 +40,5 @@ ngModule.component('vnAddStowaway', {
     controller: Controller,
     bindings: {
         ticket: '<'
-    },
-    require: {
-        card: '^vnTicketCard'
     }
 });

modules/item/front/ticket-descriptor/removeStowaway.js

@@ -45,7 +45,15 @@ class Controller {
     deleteStowaway(response) {
         if (response === 'ACCEPT') {
             this.$http.delete(`/api/Stowaways/${this.stowawayToDelete.id}`).then(res => {
-                this.card.reload();
+                if (this.ticket.stowaway)
+                    delete this.ticket.stowaway;
+                else {
+                    for (let i = 0; i < this.ticket.ship.length; i++) {
+                        if (this.ticket.ship[i].id === this.stowawayToDelete.id)
+                            delete this.ticket.ship[i];
+                    }
+                }
+                this.hide();
             });
         }
     }
@@ -71,8 +79,5 @@ ngModule.component('vnRemoveStowaway', {
     controller: Controller,
     bindings: {
         ticket: '<'
-    },
-    require: {
-        card: '^vnTicketCard'
     }
 });

modules/ticket/back/methods/ticket/getPossibleStowaways.js

@@ -29,6 +29,7 @@ module.exports = Self => {
 
         let possibleStowaways = await Self.app.models.Ticket.find({
             where: {
+                id: {neq: ticketFk},
                 clientFk: ship.clientFk,
                 addressFk: ship.addressFk,
                 agencyModeFk: ship.agencyModeFk,

modules/ticket/front/card/index.js

@@ -7,9 +7,9 @@ class Controller {
         this.filter = {
             include: [
                 {relation: 'warehouse', scope: {fields: ['name']}},
-                // {relation: 'ship'},
+                {relation: 'ship'},
                 {relation: 'agencyMode', scope: {fields: ['name']}},
-                // {relation: 'stowaway'},
+                {relation: 'stowaway'},
                 {
                     relation: 'client',
                     scope: {