merge conflict

client/ticket/routes.json

@@ -84,14 +84,8 @@
         },
         {
             "url" : "/package",
-            "abstract": true,
             "state": "ticket.card.package",
-            "component": "ui-view"
+            "component": "vn-ticket-package",
-        },
-        {
-            "url": "/list",
-            "state": "ticket.card.package.list",
-            "component": "vn-ticket-package-list",
             "params": {
                 "ticket": "$ctrl.ticket"
             },

client/ticket/src/package/package.js

@@ -1,4 +1,4 @@
-import ngModule from '../../module';
+import ngModule from '../module';
 
 class Controller {
 
@@ -64,8 +64,8 @@ class Controller {
 
 Controller.$inject = ['$http', '$scope'];
 
-ngModule.component('vnTicketPackageList', {
+ngModule.component('vnTicketPackage', {
-    template: require('./package-list.html'),
+    template: require('./package.html'),
     controller: Controller,
     bindings: {
         ticket: '<'

client/ticket/src/package/package.spec.js

@@ -1,7 +1,7 @@
-import './package-list.js';
+import './package.js';
 
 describe('Ticket', () => {
-    describe('Component vnTicketPackageList', () => {
+    describe('Component vnTicketPackage', () => {
         let $componentController;
         let controller;
         let $httpBackend;
@@ -19,7 +19,7 @@ describe('Ticket', () => {
                     accept: function() {}
                 }
             };
-            controller = $componentController('vnTicketPackageList', {$scope: $scope});
+            controller = $componentController('vnTicketPackage', {$scope: $scope});
         }));
 
         describe('removePackage()', () => {

client/ticket/src/ticket.js

@@ -8,6 +8,6 @@ import './data/ticket-data';
 import './note/ticket-observation';
 import './expedition/ticket-expedition';
 import './volume/ticket-volume';
-import './package/list/package-list';
+import './package/package';
 import './sale/sale';
 import './tracking/tracking';

e2e/helpers/selectors.js

@@ -289,7 +289,7 @@ export default {
         submitNotesButton: `${components.vnSubmit}`
     },
     ticketPackages: {
-        packagesButton: `${components.vnMenuItem}[ui-sref="ticket.card.package.list"]`,
+        packagesButton: `${components.vnMenuItem}[ui-sref="ticket.card.package"]`,
         firstPackageSelect: `${components.vnAutocomplete}[label="Package"] input`
     }
 };

services/ticket/common/models/ticketPackaging.js

@@ -8,7 +8,7 @@ module.exports = function(Self) {
     });
 
     function validateQuantity(quantity) {
-        return quantity != 0;
+        return !isNaN(quantity) && quantity != 0;
     }
 
     Self.validatesPresenceOf('packagingFk', {message: 'Package cannot be blank'});