#1293 ticket.components solo muestra base

2019-04-02 08:00:16 +02:00 · 2019-04-02 08:00:16 +02:00 · 0b977d3b0b
parent 056c07b17c
commit 0b977d3b0b
6 changed files with 124 additions and 192 deletions
--- a/modules/ticket/back/models/component-type-rate.json
+++ b/modules/ticket/back/models/component-type-rate.json
@ -8,12 +8,18 @@
    },
    "properties": {
        "id": {
-        "id": true,
-        "type": "Number",
-        "description": "Identifier"
+            "id": true,
+            "type": "Number",
+            "description": "Identifier"
        },
        "type": {
-        "type": "String"
+            "type": "String"
+        },
+        "isBase":{
+            "type":"String",
+            "mysql": {
+				"columnName": "base"
+			}
        }
    }
 }
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@ -24,17 +24,7 @@
        <tfoot>
            <tr>
                <td number colspan="7">
-                    <span translate>Base</span> {{$ctrl.base() | currency: 'EUR':3}}
-                </td>
-            </tr>
-            <tr>
-                <td number colspan="7">
-                    <span translate>Margin</span> {{$ctrl.profitMargin() | currency: 'EUR':3}}
-                </td>
-            </tr>
-            <tr>
-                <td number colspan="7">
-                    <span translate>Total</span> {{$ctrl.total() | currency: 'EUR':3}}
+                    <span translate>Base to commission</span> {{$ctrl.base() | currency: 'EUR':3}}
                </td>
            </tr>
        </tfoot>
--- a/modules/ticket/front/component/index.js
+++ b/modules/ticket/front/component/index.js
@ -21,7 +21,7 @@ class Controller {
                            include: {
                                relation: 'componentType',
                                scope: {
-                                    fields: ['type']
+                                    fields: ['type', 'isBase']
                                }
                            }
                        }
@ -31,19 +31,6 @@ class Controller {
        };
    }

-    total() {
-        let sales = this.$scope.model.data;
-        let sum = 0;
-        if (!sales) return;
-
-        for (let sale of sales) {
-            for (let component of sale.components)
-                sum += sale.quantity * component.value;
-        }
-
-        return sum;
-    }
-
    base() {
        let sales = this.$scope.model.data;
        let sum = 0;
@ -52,23 +39,7 @@ class Controller {

        for (let sale of sales) {
            for (let component of sale.components) {
-                if (component.componentRate.name == 'valor de compra')
-                    sum += sale.quantity * component.value;
-            }
-        }
-
-        return sum;
-    }
-
-    profitMargin() {
-        let sales = this.$scope.model.data;
-        let sum = 0;
-
-        if (!sales) return;
-
-        for (let sale of sales) {
-            for (let component of sale.components) {
-                if (component.componentRate.name != 'valor de compra')
+                if (component.componentRate.componentType.isBase)
                    sum += sale.quantity * component.value;
            }
        }
--- a/modules/ticket/front/component/index.spec.js
+++ b/modules/ticket/front/component/index.spec.js
@ -13,79 +13,77 @@ describe('ticket', () => {
            $scope.model = crudModel;
            $scope.model.data = [{
                components: [
-                    {componentRate: {name: 'valor de compra'}, value: 5},
-                    {componentRate: {name: 'reparto'}, value: 5},
-                    {componentRate: {name: 'recobro'}, value: 5}
+                    {
+                        componentRate: {
+                            name: 'valor de compra',
+                            componentType: {
+                                isBase: 1
+                            }
+                        },
+                        value: 5
+                    },
+                    {
+                        componentRate: {
+                            name: 'reparto',
+                            componentType: {
+                                isBase: 0
+                            }
+                        },
+                        value: 5
+                    },
+                    {
+                        componentRate: {
+                            name: 'recobro',
+                            componentType: {
+                                isBase: 0
+                            }
+                        },
+                        value: 5
+                    }
                ],
                quantity: 1
            },
            {
                components: [
-                    {componentRate: {name: 'valor de compra'}, value: 1},
-                    {componentRate: {name: 'reparto'}, value: 1},
-                    {componentRate: {name: 'recobro'}, value: 1}
+                    {
+                        componentRate: {
+                            name: 'valor de compra',
+                            componentType: {
+                                isBase: 1
+                            }
+                        },
+                        value: 1
+                    },
+                    {
+                        componentRate: {
+                            name: 'reparto',
+                            componentType: {
+                                isBase: 0
+                            }
+                        },
+                        value: 1
+                    },
+                    {
+                        componentRate: {
+                            name: 'recobro',
+                            componentType: {
+                                isBase: 0
+                            }
+                        },
+                        value: 1
+                    },
                ],
                quantity: 5
            }];
            controller = $componentController('vnTicketComponents', {$scope});
        }));

-        describe('total()', () => {
-            it('should return the sum from all componenets in each sale', () => {
-                let result = controller.total();
-
-                expect(result).toEqual(30);
-            });
-        });
-
        describe('base()', () => {
-            it(`should return the sum from all 'valor de compra' componenets in each sale`, () => {
-                controller.sales = [{
-                    components: [
-                        {componentRate: {name: 'valor de compra'}, value: 5},
-                        {componentRate: {name: 'reparto'}, value: 5},
-                        {componentRate: {name: 'recobro'}, value: 5}
-                    ],
-                    quantity: 1
-                },
-                {
-                    components: [
-                        {componentRate: {name: 'valor de compra'}, value: 1},
-                        {componentRate: {name: 'reparto'}, value: 1},
-                        {componentRate: {name: 'recobro'}, value: 1}
-                    ],
-                    quantity: 5
-                }
-                ];
+            it(`should return the sum from all componenets base in each sale`, () => {
                let result = controller.base();

                expect(result).toEqual(10);
            });
        });
-
-        describe('profitMargin()', () => {
-            it(`should return the sum from all componenets but 'valor de compra'  in each sale`, () => {
-                controller.sales = [{
-                    components: [
-                        {componentRate: {name: 'valor de compra'}, value: 5},
-                        {componentRate: {name: 'reparto'}, value: 5},
-                        {componentRate: {name: 'recobro'}, value: 5}
-                    ],
-                    quantity: 1
-                },
-                {
-                    components: [
-                        {componentRate: {name: 'valor de compra'}, value: 1},
-                        {componentRate: {name: 'reparto'}, value: 1},
-                        {componentRate: {name: 'recobro'}, value: 1}
-                    ],
-                    quantity: 5
-                }
-                ];
-                let result = controller.profitMargin();
-
-                expect(result).toEqual(20);
-            });
-        });
    });
 });
--- a/modules/ticket/front/locale/es.yml
+++ b/modules/ticket/front/locale/es.yml
@ -2,13 +2,18 @@
 Address: Consignatario
 Agency: Agencia
 Amount: Importe
+Base to commission: Base comisionable
 Boxes: Cajas
+by: por
 Checked: Comprobado
 Client: Cliente
+Client card: Ficha del cliente
+Code 100: Código 100
 Company: Empresa
 Counter: Contador
 Created : Añadido
 Date : Fecha
+Delay: Retraso
 Delete: Borrar
 Delete expedition: Borrar expedición
 Description: Descripción
@ -19,7 +24,6 @@ Is checked: Comprobado
 Item: Articulo
 Landing: Llegada
 Landed: F. entrega
-Margin: Margen
 More: Más
 Mark as reserved: Marcar como reservado
 Unmark as reserved: Desmarcar como reservado
@ -51,13 +55,9 @@ Worker: Trabajador
 VAT: IVA
 Hour: Hora
 The quantity do not match: Las cantidades no coinciden
-by: por
 Freezed: Congelado
 Risk: Riesgo
-Delay: Retraso
-Code 100: Código 100
 Invoice: Factura
-Client card: Ficha del cliente
 You are going to delete this ticket: Vas a borrar este ticket
 Ticket deleted: Ticket borrado

--- a/package-lock.json
+++ b/package-lock.json
@ -1505,7 +1505,7 @@
        },
        "util": {
          "version": "0.10.3",
-          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
          "dev": true,
          "requires": {
@ -1733,7 +1733,7 @@
    "base": {
      "version": "0.11.2",
      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
      "dev": true,
      "requires": {
        "cache-base": "^1.0.1",
@ -2321,7 +2321,7 @@
    "cache-base": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
      "dev": true,
      "requires": {
        "collection-visit": "^1.0.0",
@ -2496,7 +2496,7 @@
    "class-utils": {
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
      "dev": true,
      "requires": {
        "arr-union": "^3.1.0",
@ -2656,7 +2656,7 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
          "dev": true,
          "requires": {
@ -3194,13 +3194,13 @@
      "dependencies": {
        "jsesc": {
          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
          "dev": true
        },
        "regexpu-core": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
          "dev": true,
          "requires": {
@ -3211,13 +3211,13 @@
        },
        "regjsgen": {
          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
          "dev": true
        },
        "regjsparser": {
          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+          "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
          "dev": true,
          "requires": {
@ -3847,7 +3847,7 @@
      "dependencies": {
        "fs-extra": {
          "version": "0.30.0",
-          "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
          "dev": true,
          "requires": {
@ -4844,7 +4844,7 @@
    },
    "file-loader": {
      "version": "1.1.11",
-      "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
      "dev": true,
      "requires": {
@ -5181,8 +5181,7 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "aproba": {
          "version": "1.2.0",
@ -5203,14 +5202,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -5225,20 +5222,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -5355,8 +5349,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@ -5368,7 +5361,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -5383,7 +5375,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -5391,14 +5382,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@ -5417,7 +5406,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -5498,8 +5486,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -5511,7 +5498,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -5597,8 +5583,7 @@
        "safe-buffer": {
          "version": "5.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@ -5634,7 +5619,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -5654,7 +5638,6 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -5698,14 +5681,12 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "yallist": {
          "version": "3.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        }
      }
    },
@ -5907,7 +5888,7 @@
    "global-modules": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
      "dev": true,
      "requires": {
        "global-prefix": "^1.0.1",
@ -6259,7 +6240,7 @@
        },
        "kind-of": {
          "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
          "dev": true
        },
@ -6443,7 +6424,7 @@
      "dependencies": {
        "es6-promise": {
          "version": "3.3.1",
-          "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
          "dev": true
        },
@ -7458,7 +7439,7 @@
    "is-plain-object": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
      "dev": true,
      "requires": {
        "isobject": "^3.0.1"
@ -7628,7 +7609,7 @@
    },
    "jasmine-core": {
      "version": "2.99.1",
-      "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
      "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
      "dev": true
    },
@ -7645,7 +7626,7 @@
    "jasmine-spec-reporter": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+      "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=",
      "dev": true,
      "requires": {
        "colors": "1.1.2"
@ -9690,7 +9671,7 @@
    },
    "minimist": {
      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
    },
    "minstache": {
@ -10162,7 +10143,7 @@
      "dependencies": {
        "jsesc": {
          "version": "0.5.0",
-          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
          "dev": true
        }
@ -10792,8 +10773,7 @@
            "ansi-regex": {
              "version": "2.1.1",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "aproba": {
              "version": "1.2.0",
@ -10836,8 +10816,7 @@
            "code-point-at": {
              "version": "1.1.0",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "concat-map": {
              "version": "0.0.1",
@ -10848,8 +10827,7 @@
            "console-control-strings": {
              "version": "1.1.0",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "core-util-is": {
              "version": "1.0.2",
@ -10966,8 +10944,7 @@
            "inherits": {
              "version": "2.0.3",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "ini": {
              "version": "1.3.5",
@ -10979,7 +10956,6 @@
              "version": "1.0.0",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "number-is-nan": "^1.0.0"
              }
@ -11009,7 +10985,6 @@
              "version": "2.3.5",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "safe-buffer": "^5.1.2",
                "yallist": "^3.0.0"
@ -11028,7 +11003,6 @@
              "version": "0.5.1",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "minimist": "0.0.8"
              }
@ -11109,8 +11083,7 @@
            "number-is-nan": {
              "version": "1.0.1",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "object-assign": {
              "version": "4.1.1",
@ -11122,7 +11095,6 @@
              "version": "1.4.0",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "wrappy": "1"
              }
@ -11208,8 +11180,7 @@
            "safe-buffer": {
              "version": "5.1.2",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "safer-buffer": {
              "version": "2.1.2",
@ -11245,7 +11216,6 @@
              "version": "1.0.2",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "code-point-at": "^1.0.0",
                "is-fullwidth-code-point": "^1.0.0",
@ -11265,7 +11235,6 @@
              "version": "3.0.1",
              "bundled": true,
              "dev": true,
-              "optional": true,
              "requires": {
                "ansi-regex": "^2.0.0"
              }
@ -11309,14 +11278,12 @@
            "wrappy": {
              "version": "1.0.2",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            },
            "yallist": {
              "version": "3.0.3",
              "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
            }
          }
        },
@ -11615,7 +11582,7 @@
      "dependencies": {
        "minimist": {
          "version": "0.0.10",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
          "dev": true
        },
@ -12171,7 +12138,7 @@
    },
    "pretty-bytes": {
      "version": "1.0.4",
-      "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
      "dev": true,
      "requires": {
@ -12260,7 +12227,7 @@
        },
        "through2": {
          "version": "0.2.3",
-          "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
          "dev": true,
          "requires": {
@ -13151,7 +13118,7 @@
    },
    "safe-regex": {
      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
      "dev": true,
      "requires": {
@ -13276,7 +13243,7 @@
      "dependencies": {
        "source-map": {
          "version": "0.4.4",
-          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
          "dev": true,
          "requires": {
@ -13416,7 +13383,7 @@
    "set-value": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
      "dev": true,
      "requires": {
        "extend-shallow": "^2.0.1",
@ -13603,7 +13570,7 @@
    "snapdragon-node": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
      "dev": true,
      "requires": {
        "define-property": "^1.0.0",
@ -13654,7 +13621,7 @@
    "snapdragon-util": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
      "dev": true,
      "requires": {
        "kind-of": "^3.2.0"
@ -14010,7 +13977,7 @@
    "split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
      "dev": true,
      "requires": {
        "extend-shallow": "^3.0.0"
@ -14194,7 +14161,7 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
          "dev": true,
          "requires": {
@ -15565,7 +15532,7 @@
    "useragent": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
      "dev": true,
      "requires": {
        "lru-cache": "4.1.x",
@ -16302,7 +16269,7 @@
        },
        "globby": {
          "version": "6.1.0",
-          "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
          "dev": true,
          "requires": {
@ -16315,7 +16282,7 @@
          "dependencies": {
            "pify": {
              "version": "2.3.0",
-              "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
              "dev": true
            }