Merge branch 'dev' of https://git.verdnatura.es/salix into dev

client/client/src/basic-data/basic-data.html

@@ -30,6 +30,7 @@
                 value-field="id"
                 select-fields="name"
                 label="Salesperson"
+                vn-acl="salesAssistant"
                 where="{or: [{firstName: {regexp: 'search'}}, {name: {regexp: 'search'}}]}">
             </vn-autocomplete>
             <vn-autocomplete vn-one

client/core/src/components/popover/popover.js

@@ -32,14 +32,21 @@ export default class Popover extends Component {
         this.content = this.element.querySelector('.content');
     }
 
-    set child(value) {
-        this.content.appendChild(value);
-    }
-
+    /**
+     * @type {HTMLElement} The popover child.
+     */
     get child() {
         return this.content.firstChild;
     }
 
+    set child(value) {
+        this.content.innerHTML = '';
+        this.content.appendChild(value);
+    }
+
+    /**
+     * @type {Boolean} Wether to show or hide the popover.
+     */
     get shown() {
         return this._shown;
     }

client/ticket/routes.json

@@ -87,6 +87,18 @@
                 "description": "Review",
                 "icon": "remove_red_eye"
             }
+        },
+        {
+            "url" : "/sale",
+            "state": "ticket.card.sale",
+            "component": "vn-ticket-sale",
+            "params": {
+                "ticket": "$ctrl.ticket"
+            },
+            "menu": {
+                "description": "Sale",
+                "icon": "icon-lines"
+            }
         }
     ]
 }

client/ticket/src/locale/es.yml

@@ -1,6 +1,13 @@
-Tickets: Tickets
+Amount: Importe
+Basic data: Datos básicos
+Description: Descripción
+Discount: Descuento
+Item: Articulo
 Notes: Notas
 Observation type: Tipo de observación
-Description: Descripción
+Price: Precio
+Quantity: Cantidad
+Sale: Lineas del pedido
+Some fields are invalid: Algunos campos no son válidos
 The observation type must be unique: El tipo de observación debe ser único
-Some fields are invalid: Algunos campos no son válidos
+Tickets: Tickets

client/ticket/src/ticket.js

@@ -7,4 +7,5 @@ import './summary/ticket-summary';
 import './data/ticket-data';
 import './notes/ticket-observations';
 import './package/list/package-list';
+import './sale/sale';
 import './review/review';

package.json

@@ -19,6 +19,7 @@
     "fs-extra": "^5.0.0",
     "material-design-lite": "^1.3.0",
     "mg-crud": "^1.1.2",
+    "npm": "^5.7.1",
     "oclazyload": "^0.6.3",
     "require-yaml": "0.0.1",
     "validator": "^6.2.1"

services/db/04-fixtures.sql

@@ -509,4 +509,11 @@ INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `
         ( 1, 101, CURDATE(), date_add(CURDATE(),INTERVAL 1 MONTH), 50, 7),
         ( 2, 102, CURDATE(), date_add(CURDATE(),INTERVAL 3 MONTH), 100, 1),
         ( 3, 102, CURDATE(), date_add(CURDATE(),INTERVAL 1 MONTH), 50, 7),
-        ( 4, 103, CURDATE(), NULL, 50, 7);
+        ( 4, 103, CURDATE(), NULL, 50, 7);
+
+INSERT INTO `bi`.`rotacion`(`Id_Article`, `warehouse_id`, `total`, `rotacion`, `cm3`, `almacenaje`, `manipulacion`, `auxiliar`, `mermas`)
+    VALUES
+        ( 1, 1, 0, 0.0000, 1500, 0.0015, 0.0250, 0.0085, 0.0000),
+        ( 1, 2, 0, 0.0000, 100, 0.0060, 0.0200, 0.0080, 0.0000),
+        ( 2, 1, 10, 3.5000, 0, 0.0000, 0.0000, 0.0080, 0.0000),
+        ( 3, 1, 50, 5.5000, 100, 0.0000, 0.0000, 0.0080, 0.0000);

services/db/changes/1.0.2/06-annualAverageInvoiced.sql

@@ -0,0 +1,10 @@
+USE `vn`;
+CREATE 
+     OR REPLACE ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`%` 
+    SQL SECURITY DEFINER
+VIEW `vn`.`annualAverageInvoiced` AS
+    SELECT 
+        `e`.`Id_Cliente` AS `clientFk`, `e`.`Consumo` AS `invoiced`
+    FROM
+        `bi`.`facturacion_media_anual` `e`;

services/ticket/common/models/annualAverageInvoiced.json

@@ -0,0 +1,24 @@
+{
+    "name": "AnnualAverageInvoiced",
+    "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "annualAverageInvoiced"
+      }
+    },
+    "properties": {
+      "invoiced": {
+        "type": "Number"
+      },
+      "clientFk": {
+        "id": true
+      }
+  },
+  "relations": {
+    "client": {
+      "type": "belongsTo",
+      "model": "client",
+      "foreignKey": "clientFk"
+    }
+  }
+}

services/ticket/common/models/sale.js

@@ -0,0 +1,3 @@
+module.exports = function(Self) {
+    require('../methods/sale/filter.js')(Self);
+};

services/ticket/common/models/sale.json

@@ -41,6 +41,11 @@
       "foreignKey": "itemFk",
       "required": true
     },
+    "itemTag": {
+      "type": "hasMany",
+      "model": "ItemTag",
+      "foreignKey": "itemFk"
+    },
     "ticket": {
       "type": "belongsTo",
       "model": "Ticket",

services/ticket/server/model-config.json

@@ -28,6 +28,9 @@
   },
   "Expedition": {
     "dataSource": "vn"
+  },
+  "AnnualAverageInvoiced": {
+    "dataSource": "vn"
   }
 }