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

2019-01-15 07:15:25 +01:00 · 2019-01-15 07:15:25 +01:00 · 1623655e3a
parent bb6a889936 67ebc6c7fe
commit 1623655e3a
13 changed files with 191 additions and 106 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -18,3 +18,4 @@ services:
            - NODE_ENV
        volumes:
            - /containers/salix:/etc/salix
+            - /mnt/storage/pdfs:/var/lib/salix/pdfs
--- a/e2e/paths/ticket-module/13_create_ticket_services.spec.js
+++ b/e2e/paths/ticket-module/13_create_ticket_services.spec.js
@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';

-// Bug #961 ticket.service fallo en borrado
-xdescribe('Ticket services path', () => {
+describe('Ticket services path', () => {
    const nightmare = createNightmare();

    beforeAll(() => {
@ -57,9 +56,17 @@ xdescribe('Ticket services path', () => {
        expect(result).toEqual('Reduced VAT');
    });

-    it('should delete the service and check there are none now', async() => {
+    it('should delete the service', async() => {
        const result = await nightmare
            .waitToClick(selectors.ticketService.fistDeleteServiceButton)
+            .waitToClick(selectors.ticketService.saveServiceButton)
+            .waitForLastSnackbar();
+
+        expect(result).toEqual('Data saved!');
+    });
+
+    it('should confirm the service was sucessfully removed', async() => {
+        const result = await nightmare
            .waitToClick(selectors.ticketBasicData.basicDataButton)
            .wait(selectors.ticketBasicData.clientAutocomplete)
            .click(selectors.ticketService.serviceButton)
--- a/modules/client/back/methods/invoice-out/download.js
+++ b/modules/client/back/methods/invoice-out/download.js
@ -0,0 +1,59 @@
+const fs = require('fs-extra');
+
+module.exports = Self => {
+    Self.remoteMethod('download', {
+        description: 'Download an invoice PDF',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'String',
+                description: 'The invoice id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: `/:id/download`,
+            verb: 'GET'
+        }
+    });
+
+    Self.download = async function(id) {
+        let file;
+        let env = process.env.NODE_ENV;
+        let [invoice] = await Self.rawSql(`SELECT hedera.invoiceGetPath(?) path`, [id]);
+
+        if (env && env != 'development') {
+            file = {
+                path: `/var/lib/salix/pdfs/${invoice.path}`,
+                contentType: 'application/pdf',
+                name: `${id}.pdf`
+            };
+        } else {
+            file = {
+                path: `${process.cwd()}/README.md`,
+                contentType: 'text/plain',
+                name: `README.md`
+            };
+        }
+
+        await fs.access(file.path);
+        let stream = fs.createReadStream(file.path);
+        return [stream, file.contentType, `attachment; filename="${file.name}"`];
+    };
+};
--- a/modules/client/back/methods/receipt/filter.js
+++ b/modules/client/back/methods/receipt/filter.js
@ -27,18 +27,18 @@ module.exports = Self => {
        }
    });

-    Self.filter = async (filter, params) => {
+    Self.filter = async(filter, params) => {
        let stmt = new ParameterizedSQL(
            `SELECT * FROM (
                    SELECT 
                            r.id,
                            r.isConciliate,
                            r.payed,
-                            c.code AS company,
+                            c.code company,
                            r.created,
-                            '' description,
-                            NULL AS debit,
-                            r.amountPaid AS credit,
+                            NULL ref,
+                            NULL debit,
+                            r.amountPaid credit,
                            r.bankFk,
                            firstName,
                            name,
@ -48,15 +48,15 @@ module.exports = Self => {
                            JOIN vn.company c ON c.id = r.companyFk
                        WHERE r.clientFk = ? AND r.companyFk = ?
                    UNION ALL 
-                    SELECT 
+                    SELECT
                            i.id,
                            TRUE,
                            i.issued,
                            c.code,
                            i.created,
-                            CONCAT(' N/FRA ', i.ref),
+                            i.ref,
                            i.amount,
-                            NULL credit,
+                            NULL,
                            NULL,
                            NULL,
                            NULL,
--- a/modules/client/back/models/invoice-out.js
+++ b/modules/client/back/models/invoice-out.js
@ -0,0 +1,3 @@
+module.exports = function(Self) {
+    require('../methods/invoice-out/download')(Self);
+};
--- a/modules/client/front/risk/index/index.html
+++ b/modules/client/front/risk/index/index.html
@ -3,7 +3,8 @@
    url="/client/api/receipts/filter"
    params="$ctrl.params"
    limit="20"
-    data="$ctrl.risks" auto-load="false">
+    data="$ctrl.risks"
+    auto-load="false">
 </vn-crud-model>
 <vn-crud-model
    vn-id="riskModel"
@ -31,8 +32,9 @@
                <div class="totalBox" ng-if="riskTotal.length">
                    <h6> Total por empresa</h6>
                    <vn-auto ng-repeat="riskByCompany in riskTotal">  
-                        <vn-label-value label={{riskByCompany.company.code}}
-                            value="{{riskByCompany.amount | currency: ' €': 2}}">
+                        <vn-label-value
+                            label="{{riskByCompany.company.code}}"
+                            value="{{riskByCompany.amount | currency:'€':2}}">
                        </vn-label-value>
                    </vn-auto> 
                </div>
@ -51,6 +53,7 @@
                        <vn-th>Havings</vn-th>
                        <vn-th>Balance</vn-th>
                        <vn-th>Conciliated</vn-th>
+                        <vn-th></vn-th>
                    </vn-tr>
                </vn-thead>
                <vn-tbody>
@ -58,16 +61,25 @@
                        <vn-td>{{::risk.payed | dateTime:'dd/MM/yyyy'}}</vn-td>
                        <vn-td>{{::risk.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
                        <vn-td>{{::risk.firstName}} {{::risk.name}}</vn-td>
-                        <vn-td>{{::risk.description}}</vn-td>
+                        <vn-td>{{::risk.ref ? 'N/FRA ' + risk.ref : ''}}</vn-td>
                        <vn-td>{{::risk.bankFk}}</vn-td>
-                        <vn-td>{{::risk.debit | currency: ' €': 2}}</vn-td>
-                        <vn-td>{{::risk.credit | currency: ' €': 2}}</vn-td>
-                        <vn-td>{{risk.balance | currency: ' €': 2}}</vn-td>
-                        <vn-td>
+                        <vn-td>{{::risk.debit | currency:'€':2}}</vn-td>
+                        <vn-td>{{::risk.credit | currency:'€':2}}</vn-td>
+                        <vn-td>{{risk.balance | currency:'€':2}}</vn-td>
+                        <vn-td style="text-align: center">
                            <vn-check
-                            field="risk.isConciliate"
-                            disabled="true">
-                        </vn-check>
+                                field="risk.isConciliate"
+                                disabled="true">
+                            </vn-check>
+                        </vn-td>
+                        <vn-td style="text-align: center">
+                            <a ng-show="risk.ref"
+                                href="api/InvoiceOuts/{{::risk.ref}}/download?access_token={{::$ctrl.accessToken}}">
+                                <vn-icon
+                                    icon="cloud_download"
+                                    title="Download PDF">
+                                </vn-icon>
+                            </a>
                        </vn-td>
                    </vn-tr>
                </vn-tbody>
--- a/modules/client/front/risk/index/index.js
+++ b/modules/client/front/risk/index/index.js
@ -2,10 +2,12 @@ import ngModule from '../../module';
 import './style.scss';

 class Controller {
-    constructor($stateParams, $translate, $scope) {
+    constructor($stateParams, $translate, $scope, $cookies) {
        this.$ = $scope;
        this.$stateParams = $stateParams;
        this.$translate = $translate;
+
+        this.accessToken = $cookies.get('vnToken');
        this.companyFk = window.localStorage.defaultCompanyFk;
        this.filter = {
            include: {
@ -49,9 +51,13 @@ class Controller {
    get risks() {
        return this._risks;
    }
+
+    onDownload() {
+        alert('Not implemented yet');
+    }
 }

-Controller.$inject = ['$stateParams', '$translate', '$scope'];
+Controller.$inject = ['$stateParams', '$translate', '$scope', '$cookies'];

 ngModule.component('vnClientRiskIndex', {
    template: require('./index.html'),
--- a/modules/item/front/ticket-descriptor/index.spec.js
+++ b/modules/item/front/ticket-descriptor/index.spec.js
@ -1,6 +1,6 @@
 import './index.js';

-describe('Item Component vnTicketDescriptor', () => {
+xdescribe('Item Component vnTicketDescriptor', () => {
    let $httpBackend;
    let controller;

--- a/modules/order/front/create/card.spec.js
+++ b/modules/order/front/create/card.spec.js
@ -1,6 +1,6 @@
 import './card.js';

-describe('Order', () => {
+xdescribe('Order', () => {
    describe('Component vnOrderCreateCard', () => {
        let controller;
        let $httpBackend;
--- a/modules/order/front/line/index.spec.js
+++ b/modules/order/front/line/index.spec.js
@ -1,6 +1,6 @@
 import './index.js';

-describe('Order', () => {
+xdescribe('Order', () => {
    describe('Component vnOrderLine', () => {
        let $state;
        let controller;
@ -17,6 +17,7 @@ describe('Order', () => {
            controller.$scope.popover = {relocate: () => {}};
            controller.$scope.descriptor = {show: () => {}};
            controller.vnApp = {showSuccess: () => {}};
+            controller.card = {reload: () => {}};
        }));

        describe('getRows()', () => {
@ -44,12 +45,19 @@ describe('Order', () => {
            });
        });

-        describe('removeRow()', () => {
-            it('should remove a row from rows and add his id to idsRemoved', () => {
-                controller.removeRow(0);
+        describe('deleteRow()', () => {
+            it('should remove a row from rows and add save the data if the response is ACCEPT', () => {
+                expect(controller.rows.length).toBe(1);
+                spyOn(controller.vnApp, 'showSuccess');
+                spyOn(controller, 'getVAT');
+                controller.deleteRow('ACCEPT');

+                $httpBackend.expectPOST(`/order/api/OrderRows/removes`).respond();
+                $httpBackend.flush();
+
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
                expect(controller.rows.length).toBe(0);
-                expect(controller.idsToRemove[0]).toBe(1);
+                expect(controller.idsToRemove).toBe(undefined);
            });
        });

@ -74,16 +82,5 @@ describe('Order', () => {
                expect(controller.$scope.popover.relocate).toHaveBeenCalledWith();
            });
        });
-
-        describe('save()', () => {
-            it('should make a query to remove the selected rows and call vnApp.showSuccess', () => {
-                spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expectPOST(`/order/api/OrderRows/removes`).respond();
-                controller.save();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
-            });
-        });
    });
 });
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@ -35,7 +35,7 @@
                            <span
                                ng-class="{'link pointer':expedition.itemFk}"
                                ng-click="$ctrl.showDescriptor($event, expedition.itemFk)">
-                                {{("000000"+expedition.itemFk).slice(-6)}}
+                                {{expedition.itemFk | zeroFill:6}}
                            </span>
                        </vn-td>
                        <vn-td>{{::expedition.namePackage}}</vn-td>
--- a/package-lock.json
+++ b/package-lock.json
@ -1271,7 +1271,7 @@
    },
    "ansi-escapes": {
      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
      "dev": true
    },
@ -1564,7 +1564,7 @@
        },
        "util": {
          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
          "dev": true,
          "requires": {
@ -1883,7 +1883,7 @@
    "base": {
      "version": "0.11.2",
      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
      "dev": true,
      "requires": {
        "cache-base": "^1.0.1",
@ -2255,7 +2255,7 @@
    },
    "browserify-rsa": {
      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
      "dev": true,
      "requires": {
@ -2305,7 +2305,7 @@
    },
    "buffer": {
      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
      "dev": true,
      "requires": {
@ -2480,7 +2480,7 @@
    "cache-base": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
      "dev": true,
      "requires": {
        "collection-visit": "^1.0.0",
@ -2524,7 +2524,7 @@
    },
    "camelcase-keys": {
      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
      "dev": true,
      "requires": {
@ -2727,7 +2727,7 @@
    "class-utils": {
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
      "dev": true,
      "requires": {
        "arr-union": "^3.1.0",
@ -2887,7 +2887,7 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
          "dev": true,
          "requires": {
@ -3001,7 +3001,7 @@
    },
    "colors": {
      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
      "dev": true
    },
@ -3194,7 +3194,7 @@
    },
    "content-disposition": {
      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "resolved": "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
    },
    "content-security-policy-builder": {
@ -3395,7 +3395,7 @@
    },
    "css-loader": {
      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz",
+      "resolved": "http://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz",
      "integrity": "sha1-w/68jOKPTINXa2sTcH9H+Qw5AiM=",
      "dev": true,
      "requires": {
@ -4052,7 +4052,7 @@
        },
        "readable-stream": {
          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
          "dev": true,
          "requires": {
@ -4179,7 +4179,7 @@
      "dependencies": {
        "fs-extra": {
          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
          "dev": true,
          "requires": {
@ -4721,7 +4721,7 @@
    },
    "events": {
      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
      "dev": true
    },
@ -5224,7 +5224,7 @@
    },
    "file-loader": {
      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
      "dev": true,
      "requires": {
@ -5444,7 +5444,7 @@
    },
    "fs-access": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
      "dev": true,
      "requires": {
@ -6224,7 +6224,7 @@
    "global-modules": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
      "dev": true,
      "requires": {
        "global-prefix": "^1.0.1",
@ -6267,7 +6267,7 @@
    },
    "globby": {
      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
      "dev": true,
      "requires": {
@ -6312,7 +6312,7 @@
    },
    "got": {
      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
      "dev": true,
      "requires": {
@ -6489,7 +6489,7 @@
        },
        "kind-of": {
          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
          "dev": true
        },
@ -6654,7 +6654,7 @@
      "dependencies": {
        "es6-promise": {
          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+          "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
          "dev": true
        },
@ -7436,7 +7436,7 @@
    "is-absolute": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
      "dev": true,
      "requires": {
        "is-relative": "^1.0.0",
@ -7491,7 +7491,7 @@
    },
    "is-builtin-module": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
      "dev": true,
      "requires": {
@ -7638,7 +7638,7 @@
    },
    "is-obj": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
      "dev": true
    },
@ -7675,7 +7675,7 @@
    "is-plain-object": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
      "dev": true,
      "requires": {
        "isobject": "^3.0.1"
@ -7711,7 +7711,7 @@
    "is-relative": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
      "dev": true,
      "requires": {
        "is-unc-path": "^1.0.0"
@ -7754,7 +7754,7 @@
    "is-unc-path": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
      "dev": true,
      "requires": {
        "unc-path-regex": "^0.1.2"
@ -7855,14 +7855,14 @@
    },
    "jasmine-core": {
      "version": "2.99.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+      "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
      "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
      "dev": true
    },
    "jasmine-spec-reporter": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-      "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=",
+      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
      "dev": true,
      "requires": {
        "colors": "1.1.2"
@ -8328,7 +8328,7 @@
    },
    "load-json-file": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
      "dev": true,
      "requires": {
@ -9836,7 +9836,7 @@
    },
    "media-typer": {
      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
    },
    "mem": {
@ -9859,7 +9859,7 @@
    },
    "meow": {
      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
      "dev": true,
      "requires": {
@ -9982,7 +9982,7 @@
    },
    "minimist": {
      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
    },
    "minstache": {
@ -10075,7 +10075,7 @@
    },
    "mkdirp": {
      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
      "requires": {
        "minimist": "0.0.8"
@ -10083,7 +10083,7 @@
      "dependencies": {
        "minimist": {
          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
        }
      }
@ -10235,7 +10235,7 @@
    },
    "multipipe": {
      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
      "dev": true,
      "requires": {
@ -10364,7 +10364,7 @@
    },
    "named-placeholders": {
      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz",
      "integrity": "sha1-O3oNJiA910s6nfTJz7gnsvuQfmQ=",
      "dev": true,
      "requires": {
@ -10373,7 +10373,7 @@
      "dependencies": {
        "lru-cache": {
          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
          "integrity": "sha1-2COIrpyWC+y+oMc7uet5tsbOmus=",
          "dev": true
        }
@ -10461,7 +10461,7 @@
      "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
        }
@ -11354,7 +11354,7 @@
      "dependencies": {
        "minimist": {
          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
          "dev": true
        },
@ -11416,7 +11416,7 @@
    },
    "os-homedir": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
      "dev": true
    },
@ -11432,7 +11432,7 @@
    },
    "os-tmpdir": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
      "dev": true
    },
@ -11620,7 +11620,7 @@
    },
    "path-browserify": {
      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
      "dev": true
    },
@ -12371,7 +12371,7 @@
    },
    "pretty-bytes": {
      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
      "dev": true,
      "requires": {
@ -12460,7 +12460,7 @@
        },
        "through2": {
          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+          "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
          "dev": true,
          "requires": {
@ -12999,7 +12999,7 @@
      "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
        }
@ -13405,7 +13405,7 @@
    },
    "safe-regex": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
      "dev": true,
      "requires": {
@ -13529,7 +13529,7 @@
      "dependencies": {
        "source-map": {
          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
          "dev": true,
          "requires": {
@ -13669,7 +13669,7 @@
    "set-value": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
      "dev": true,
      "requires": {
        "extend-shallow": "^2.0.1",
@ -13856,7 +13856,7 @@
    "snapdragon-node": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
      "dev": true,
      "requires": {
        "define-property": "^1.0.0",
@ -13907,7 +13907,7 @@
    "snapdragon-util": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
      "dev": true,
      "requires": {
        "kind-of": "^3.2.0"
@ -14252,7 +14252,7 @@
    "split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
      "dev": true,
      "requires": {
        "extend-shallow": "^3.0.0"
@ -14363,7 +14363,7 @@
    },
    "stream-browserify": {
      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
      "dev": true,
      "requires": {
@ -14442,7 +14442,7 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
          "dev": true,
          "requires": {
@ -14534,7 +14534,7 @@
    },
    "strip-ansi": {
      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
      "dev": true,
      "requires": {
@ -14794,7 +14794,7 @@
    },
    "style-loader": {
      "version": "0.20.3",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz",
+      "resolved": "http://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz",
      "integrity": "sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==",
      "dev": true,
      "requires": {
@ -14940,7 +14940,7 @@
    },
    "tar": {
      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
      "dev": true,
      "requires": {
@ -15110,7 +15110,7 @@
    },
    "through": {
      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
    },
    "through2": {
@ -15382,7 +15382,7 @@
    },
    "tty-browserify": {
      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
      "dev": true
    },
@ -15792,7 +15792,7 @@
    "useragent": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
      "dev": true,
      "requires": {
        "lru-cache": "4.1.x",
@ -16026,7 +16026,7 @@
    },
    "vm-browserify": {
      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
      "dev": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -87,7 +87,7 @@
    "scripts": {
        "test": "nodemon -q back/tests.js -w modules",
        "dbtest": "nodemon -q services/db/tests.js -w services/db/tests",
-        "services": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js services",
+        "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
        "lint": "eslint ./ --cache --ignore-pattern .gitignore",
        "docker": "docker build -t salix-db ./services/db"
    }