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

db/changes/10370-pickles/00-ACL.sql

@@ -0,0 +1 @@
+UPDATE salix.ACL t SET t.principalId = 'employee' WHERE t.id = 269;

db/dump/fixtures.sql

@@ -489,11 +489,11 @@ INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaF
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
-        (1, 'T', 1014.24,   CURDATE(),                              1101, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 1),
+        (1, 'T', 1014.24,   CURDATE(),                              1101, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 0),
-        (2, 'T', 121.36,    CURDATE(),                              1102, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 1), 
+        (2, 'T', 121.36,    CURDATE(),                              1102, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 0), 
-        (3, 'T', 8.88,      CURDATE(),                              1103, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 1),
+        (3, 'T', 8.88,      CURDATE(),                              1103, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 0),
-        (4, 'T', 8.88,      CURDATE(),                              1103, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 1),
+        (4, 'T', 8.88,      CURDATE(),                              1103, CURDATE(),                              442, CURDATE(),                              CURDATE(), 1, 0),
-        (5, 'A', 8.88,      DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1);
+        (5, 'A', 8.88,      DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 0);
 
 UPDATE `vn`.`invoiceOut` SET ref = 'T1111111' WHERE id = 1;
 UPDATE `vn`.`invoiceOut` SET ref = 'T2222222' WHERE id = 2;

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -29,7 +29,7 @@ module.exports = Self => {
         const models = Self.app.models;
         const headers = ctx.req.headers;
         const origin = headers.origin;
-        const authorization = ctx.req.accessToken.id;
+        const auth = ctx.req.accessToken;
 
         if (process.env.NODE_ENV == 'test')
             throw new UserError(`Action not allowed on the test environment`);
@@ -48,13 +48,18 @@ module.exports = Self => {
         let fileSrc;
         try {
             const invoiceOut = await Self.findById(id, null, myOptions);
+            const hasInvoicing = await models.Account.hasRole(auth.userId, 'invoicing', myOptions);
+
+            if (invoiceOut.hasPdf && !hasInvoicing)
+                throw new UserError(`You don't have enough privileges`);
+
             await invoiceOut.updateAttributes({
                 hasPdf: true
             }, myOptions);
 
             const response = got.stream(`${origin}/api/report/invoice`, {
                 query: {
-                    authorization: authorization,
+                    authorization: auth.id,
                     invoiceId: id
                 }
             });

modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js

@@ -61,9 +61,12 @@ describe('InvoiceOut filter()', () => {
                 }
             };
 
+            const invoiceOut = await models.InvoiceOut.findById(1, null, options);
+            await invoiceOut.updateAttribute('hasPdf', true, options);
+
             const result = await models.InvoiceOut.filter(ctx, {}, options);
 
-            expect(result.length).toEqual(5);
+            expect(result.length).toEqual(1);
 
             await tx.rollback();
         } catch (e) {

modules/invoiceOut/front/card/index.html

@@ -1,5 +1,8 @@
 <vn-portal slot="menu">
-    <vn-invoice-out-descriptor invoice-out="$ctrl.invoiceOut"></vn-invoice-out-descriptor>
+    <vn-invoice-out-descriptor 
+        invoice-out="$ctrl.invoiceOut" 
+        card-reload="$ctrl.reload()">
+    </vn-invoice-out-descriptor>
     <vn-left-menu source="card"></vn-left-menu>
 </vn-portal>
 <ui-view></ui-view>

modules/invoiceOut/front/card/index.js

@@ -10,7 +10,8 @@ class Controller extends ModuleCard {
                 'issued',
                 'amount',
                 'clientFk',
-                'companyFk'
+                'companyFk',
+                'hasPdf'
             ],
             include: [
                 {

modules/invoiceOut/front/descriptor/index.html

@@ -64,11 +64,10 @@
         </vn-item>
         <vn-item
             ng-click="createInvoicePdfConfirmation.show()"
-            vn-acl="invoicing"
+            ng-show="$ctrl.hasInvoicing || !$ctrl.invoiceOut.hasPdf"
-            vn-acl-action="remove"
             name="regenerateInvoice"
             translate>
-            Regenerate invoice PDF
+            {{!$ctrl.invoiceOut.hasPdf ? 'Generate PDF invoice': 'Regenerate PDF invoice'}}
         </vn-item>
     </slot-menu>
     <slot-body>
@@ -132,8 +131,8 @@
 <vn-confirm
     vn-id="createInvoicePdfConfirmation"
     on-accept="$ctrl.createInvoicePdf()"
-    question="Are you sure you want to regenerate the invoice PDF document?"
+    question="Are you sure you want to generate/regenerate the PDF invoice?"
-    message="You are going to regenerate the invoice PDF document">
+    message="Generate PDF invoice document">
 </vn-confirm>
 
 <!-- Send PDF invoice confirmation popup -->

modules/invoiceOut/front/descriptor/index.js

@@ -10,6 +10,10 @@ class Controller extends Descriptor {
         this.entity = value;
     }
 
+    get hasInvoicing() {
+        return this.aclService.hasAny(['invoicing']);
+    }
+
     deleteInvoiceOut() {
         return this.$http.post(`InvoiceOuts/${this.id}/delete`)
             .then(() => this.$state.go('invoiceOut.index'))
@@ -25,6 +29,7 @@ class Controller extends Descriptor {
     createPdfInvoice() {
         const invoiceId = this.invoiceOut.id;
         return this.$http.post(`InvoiceOuts/${invoiceId}/createPdf`)
+            .then(() => this.reload())
             .then(() => {
                 const snackbarMessage = this.$t(
                     `The invoice PDF document has been regenerated`);
@@ -60,6 +65,17 @@ class Controller extends Descriptor {
             .then(res => this.entity = res.data);
     }
 
+    reload() {
+        return this.loadData().then(() => {
+            if (this.cardReload)
+                this.cardReload();
+        });
+    }
+
+    cardReload() {
+        // Prevents error when not defined
+    }
+
     showCsvInvoice() {
         this.vnReport.showCsv('invoice', {
             recipientId: this.invoiceOut.client.id,
@@ -88,6 +104,7 @@ ngModule.vnComponent('vnInvoiceOutDescriptor', {
     template: require('./index.html'),
     controller: Controller,
     bindings: {
-        invoiceOut: '<'
+        invoiceOut: '<',
+        cardReload: '&'
     }
 });

modules/invoiceOut/front/descriptor/index.spec.js

@@ -18,6 +18,7 @@ describe('vnInvoiceOutDescriptor', () => {
 
             controller.invoiceOut = invoiceOut;
 
+            $httpBackend.whenGET(`InvoiceOuts/${invoiceOut.id}`).respond();
             $httpBackend.expectPOST(`InvoiceOuts/${invoiceOut.id}/createPdf`).respond();
             controller.createInvoicePdf();
             $httpBackend.flush();

modules/invoiceOut/front/descriptor/locale/es.yml

@@ -14,5 +14,6 @@ Are you sure you want to clone this invoice?: Estas seguro de clonar esta factur
 Book invoice: Asentar factura
 InvoiceOut booked: Factura asentada
 Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura? 
-Regenerate invoice PDF: Regenerar PDF factura
+Generate PDF invoice: Generar PDF factura
+Regenerate PDF invoice: Regenerar PDF factura
 The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado

modules/item/front/last-entries/index.js

@@ -11,7 +11,7 @@ class Controller extends Section {
         from.setHours(0, 0, 0, 0);
 
         const to = new Date();
-        to.setDate(to.getDate() + 10);
+        to.setDate(to.getDate() + 60);
         to.setHours(23, 59, 59, 59);
 
         this.filter = {
@@ -34,7 +34,7 @@ class Controller extends Section {
         from.setHours(0, 0, 0, 0);
 
         const to = new Date();
-        to.setDate(to.getDate() + 10);
+        to.setDate(to.getDate() + 60);
         to.setHours(23, 59, 59, 59);
 
         this.filter.where.shipped = {

modules/ticket/front/card/index.html

@@ -1,5 +1,8 @@
 <vn-portal slot="menu">
-    <vn-ticket-descriptor ticket="$ctrl.ticket" card-reload="$ctrl.reload()"></vn-ticket-descriptor>
+    <vn-ticket-descriptor 
+        ticket="$ctrl.ticket" 
+        card-reload="$ctrl.reload()">
+    </vn-ticket-descriptor>
     <vn-left-menu source="card"></vn-left-menu>
 </vn-portal>
 <ui-view></ui-view>

modules/ticket/front/descriptor-menu/index.html

@@ -110,12 +110,10 @@
         </vn-item>
         <vn-item
             ng-click="createPdfConfirmation.show()"
-            ng-show="$ctrl.isInvoiced"
+            ng-show="$ctrl.isInvoiced && ($ctrl.hasInvoicing || !$ctrl.ticket.invoiceOut.hasPdf)"
-            vn-acl="invoicing"
-            vn-acl-action="remove"
             name="regenerateInvoice"
             translate>
-            Regenerate invoice PDF
+            {{!$ctrl.ticket.invoiceOut.hasPdf ? 'Generate PDF invoice': 'Regenerate PDF invoice'}}
         </vn-item>
         <vn-item
             ng-click="recalculateComponentsConfirmation.show()"
@@ -266,8 +264,8 @@
 <vn-confirm
     vn-id="createPdfConfirmation"
     on-accept="$ctrl.createPdfInvoice()"
-    question="Are you sure you want to regenerate the invoice PDF document?"
+    question="Are you sure you want to generate/regenerate the PDF invoice?"
-    message="You are going to regenerate the invoice PDF document">
+    message="Generate PDF invoice document">
 </vn-confirm>
 
 <!-- Recalculate components confirmation dialog -->

modules/ticket/front/descriptor-menu/index.js

@@ -36,6 +36,18 @@ class Controller extends Section {
         });
     }
 
+    get isInvoiced() {
+        return this.ticket.refFk !== null;
+    }
+
+    get isTicketModule() {
+        return this.$state.getCurrentPath()[1].state.name === 'ticket';
+    }
+
+    get hasInvoicing() {
+        return this.aclService.hasAny(['invoicing']);
+    }
+
     loadData() {
         const filter = {
             include: [{
@@ -82,14 +94,6 @@ class Controller extends Section {
         });
     }
 
-    get isInvoiced() {
-        return this.ticket.refFk !== null;
-    }
-
-    get isTicketModule() {
-        return this.$state.getCurrentPath()[1].state.name === 'ticket';
-    }
-
     isTicketEditable() {
         if (!this.ticket) return;
 
@@ -241,6 +245,7 @@ class Controller extends Section {
     createInvoicePdf() {
         const invoiceId = this.ticket.invoiceOut.id;
         return this.$http.post(`InvoiceOuts/${invoiceId}/createPdf`)
+            .then(() => this.reload())
             .then(() => {
                 const snackbarMessage = this.$t(
                     `The invoice PDF document has been regenerated`);

modules/ticket/front/descriptor-menu/index.spec.js

@@ -153,6 +153,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
         it('should make a query and show a success snackbar', () => {
             jest.spyOn(controller.vnApp, 'showSuccess');
 
+            $httpBackend.whenGET(`Tickets/16`).respond();
             $httpBackend.expectPOST(`InvoiceOuts/${ticket.invoiceOut.id}/createPdf`).respond();
             controller.createInvoicePdf();
             $httpBackend.flush();

modules/ticket/front/descriptor/locale/es.yml

@@ -19,8 +19,8 @@ Regenerate invoice PDF: Regenerar PDF factura
 The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
 You are going to invoice this ticket: Vas a facturar este ticket
 Are you sure you want to invoice this ticket?: ¿Seguro que quieres facturar este ticket?
-You are going to regenerate the invoice PDF document: Vas a regenerar el documento PDF de la factura
+Generate PDF invoice document: Generar PDF de la factura
-Are you sure you want to regenerate the invoice PDF document?: ¿Seguro que quieres regenerar el documento PDF de la factura?
+Are you sure you want to generate/regenerate the PDF invoice?: ¿Seguro que quieres generar/regenerar el PDF de la factura?
 Shipped hour updated: Hora de envio modificada
 Deleted ticket: Ticket eliminado
 Recalculate components: Recalcular componentes

modules/worker/front/calendar/style.scss

@@ -42,7 +42,7 @@ vn-worker-calendar {
         border-bottom: 1px solid rgba(0, 0, 0, 0.3);
     }
     
-    vn-avatar.festive,
+    .festive,
     vn-avatar.today {
         background-color: $color-font-dark;
         width: 24px;
@@ -50,7 +50,7 @@ vn-worker-calendar {
         height: 24px
     }
 
-    vn-avatar.festive {
+    .festive {
         border: 2px solid $color-alert
     }
 

modules/zone/back/methods/agency/getShipped.js

@@ -42,7 +42,7 @@ module.exports = Self => {
 
         const stmts = [];
         stmts.push(new ParameterizedSQL(
-            `CALL vn.zone_getShippedWarehouse(?, ?, ?)`, [
+            `CALL vn.zone_getShipped(?, ?, ?, TRUE)`, [
                 landed,
                 addressFk,
                 agencyModeFk

modules/zone/front/calendar/style.scss

@@ -26,7 +26,7 @@ vn-zone-calendar {
             & > .vn-calendar {
                 max-width: 288px;
                 
-                .day {
+                #days-container .day {
                     &.event .day-number {
                         background-color: $color-success;
                     }

print/templates/email/osticket-report/sql/tickets.sql

@@ -19,9 +19,9 @@ SELECT * FROM (
           AND ote.type = 'M'
         LEFT JOIN ost_thread_entry oter ON oth.id = oter.thread_id
           AND oter.type = 'R'
-    WHERE ot.ticket_pid = NULL
+    WHERE ot.ticket_pid IS NULL
       AND ots.state = 'closed'
-      AND otc.closed BETWEEN ? AND ?
+      AND ot.closed BETWEEN ? AND ?
     ORDER BY oter.created DESC
 ) ot GROUP BY ot.ticket_id
 ORDER BY ot.assigned

print/templates/reports/invoice/invoice.js

@@ -19,12 +19,14 @@ module.exports = {
 
         const map = new Map();
 
-        for (let ticket of tickets)
+        for (let ticket of tickets) {
+            ticket.sales = [];
+
             map.set(ticket.id, ticket);
+        }
 
         for (let sale of sales) {
             const ticket = map.get(sale.ticketFk);
-            if (!ticket.sales) ticket.sales = [];
             ticket.sales.push(sale);
         }
 
@@ -93,6 +95,7 @@ module.exports = {
         },
         ticketSubtotal(ticket) {
             let subTotal = 0.00;
+            console.log(ticket.sales);
             for (let sale of ticket.sales)
                 subTotal += this.saleImport(sale);