db/changes/230601/00-acl_receiptEmail.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Receipt', 'receiptEmail', '*', 'ALLOW', 'ROLE', 'salesAssistant');

modules/claim/front/descriptor/index.js

@@ -17,6 +17,10 @@ class Controller extends Descriptor {
     }
 
     sendPickupOrder() {
+        if (!this.claim.client.email) {
+            this.vnApp.showError(this.$t('The client does not have an email'));
+            return;
+        }
         return this.vnEmail.send(`Claims/${this.claim.id}/claim-pickup-email`, {
             recipient: this.claim.client.email,
             recipientId: this.claim.clientFk

modules/claim/front/locale/es.yml

@@ -20,3 +20,4 @@ Photos: Fotos
 Go to the claim: Ir a la reclamación
 Sale tracking: Líneas preparadas
 Ticket tracking: Estados del ticket
+The client does not have an email: El cliente no tiene email

modules/client/back/methods/receipt/receiptEmail.js

@@ -0,0 +1,57 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('receiptEmail', {
+        description: 'Returns the receipt pdf',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The claim id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            }
+        ],
+        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/receipt-email',
+            verb: 'POST'
+        }
+    });
+
+    Self.receiptEmail = async(ctx, id) => {
+        const args = Object.assign({}, ctx.args);
+        const params = {
+            recipient: args.recipient,
+            lang: ctx.req.getLocale()
+        };
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const email = new Email('receipt', params);
+
+        return email.send();
+    };
+};

modules/client/back/methods/receipt/receiptPdf.js

@@ -1,12 +1,12 @@
 module.exports = Self => {
     Self.remoteMethodCtx('receiptPdf', {
-        description: 'Returns the receipt pdf',
+        description: 'Send the receipt pdf to client',
         accepts: [
             {
                 arg: 'id',
                 type: 'number',
                 required: true,
-                description: 'The claim id',
+                description: 'The receipt id',
                 http: {source: 'path'}
             },
             {

modules/client/back/models/receipt.js

@@ -5,6 +5,7 @@ module.exports = function(Self) {
     require('../methods/receipt/balanceCompensationEmail')(Self);
     require('../methods/receipt/balanceCompensationPdf')(Self);
     require('../methods/receipt/receiptPdf')(Self);
+    require('../methods/receipt/receiptEmail')(Self);
 
     Self.validateBinded('amountPaid', isNotZero, {
         message: 'Amount cannot be zero',

modules/client/front/balance/create/index.html

@@ -84,6 +84,10 @@
             label="View receipt"
             ng-model="$ctrl.viewReceipt">
         </vn-check>
+        <vn-check
+            label="Send email"
+            ng-model="$ctrl.sendEmail">
+        </vn-check>
     </vn-horizontal>
 </tpl-body>
 <tpl-buttons>

modules/client/front/balance/create/index.js

@@ -2,9 +2,10 @@ import ngModule from '../../module';
 import Dialog from 'core/components/dialog';
 
 class Controller extends Dialog {
-    constructor($element, $, $transclude, vnReport) {
+    constructor($element, $, $transclude, vnReport, vnEmail) {
         super($element, $, $transclude);
         this.vnReport = vnReport;
+        this.vnEmail = vnEmail;
         this.receipt = {};
     }
 
@@ -23,6 +24,18 @@ class Controller extends Dialog {
 
     set clientFk(value) {
         this.receipt.clientFk = value;
+
+        const filter = {
+            fields: ['email'],
+            where: {
+                id: value
+            }
+        };
+
+        this.$http.get(`Clients/findOne`, {filter})
+            .then(res => {
+                this.receipt.email = res.data.email;
+            });
     }
 
     get clientFk() {
@@ -154,10 +167,13 @@ class Controller extends Dialog {
             return super.responseHandler(response);
 
         const exceededAmount = this.receipt.amountPaid > this.maxAmount;
-
+        const isCash = this.bankSelection.accountingType.code == 'cash';
-        if (this.bankSelection.accountingType.code == 'cash' && exceededAmount)
+        if (isCash && exceededAmount)
             return this.vnApp.showError(this.$t('Amount exceeded', {maxAmount: this.maxAmount}));
 
+        if (isCash && this.sendEmail && !this.receipt.email)
+            return this.vnApp.showError(this.$t('There is no assigned email for this client'));
+
         let receiptId;
         return this.$http.post(`Clients/${this.clientFk}/createReceipt`, this.receipt)
             .then(res => {
@@ -165,6 +181,13 @@ class Controller extends Dialog {
                 super.responseHandler(response);
             })
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+            .then(() => {
+                if (!this.sendEmail || !isCash) return;
+                const params = {
+                    recipient: this.receipt.email
+                };
+                this.vnEmail.send(`Receipts/${receiptId}/receipt-email`, params);
+            })
             .then(() => {
                 if (this.viewReceipt)
                     this.vnReport.show(`Receipts/${receiptId}/receipt-pdf`);
@@ -178,7 +201,7 @@ class Controller extends Dialog {
     }
 }
 
-Controller.$inject = ['$element', '$scope', '$transclude', 'vnReport'];
+Controller.$inject = ['$element', '$scope', '$transclude', 'vnReport', 'vnEmail'];
 
 ngModule.vnComponent('vnClientBalanceCreate', {
     slotTemplate: require('./index.html'),

modules/entry/front/latest-buys/index.html

@@ -192,19 +192,19 @@
                                 {{::buy.entryFk}}
                             </span>
                         </td>
-                        <td number>{{::buy.buyingValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.buyingValue | currency: 'EUR':3}}</td>
-                        <td number>{{::buy.freightValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.freightValue | currency: 'EUR':3}}</td>
-                        <td number>{{::buy.comissionValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.comissionValue | currency: 'EUR':3}}</td>
-                        <td number>{{::buy.packageValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.packageValue | currency: 'EUR':3}}</td>
                         <td>
                             <vn-check
                                 disabled="true"
                                 ng-model="::buy.isIgnored">
                             </vn-check>
                         </td>
-                        <td number>{{::buy.price2 | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.price2 | currency: 'EUR':3}}</td>
-                        <td number>{{::buy.price3 | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.price3 | currency: 'EUR':3}}</td>
-                        <td number>{{::buy.minPrice | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.minPrice | currency: 'EUR':3}}</td>
                         <td>{{::buy.ektFk | dashIfEmpty}}</td>
                         <td>{{::buy.weight}}</td>
                         <td>{{::buy.packageFk}}</td>

modules/item/front/request-search-panel/index.html

@@ -42,7 +42,7 @@
             <vn-autocomplete
                 vn-one
                 ng-model="filter.requesterFk"
-                url="Workers/activeWithRole"
+                url="Workers/activeWithInheritedRole"
                 search-function="{firstName: $search}"
                 value-field="id"
                 where="{role: 'salesPerson'}"

modules/ticket/back/methods/ticket/saveSign.js

@@ -100,7 +100,7 @@ module.exports = Self => {
                 dmsTypeId: dmsType.id,
                 reference: '',
                 description: `Firma del cliente - Ruta ${ticket.route().id}`,
-                hasFile: true
+                hasFile: false
             };
             dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
             gestDocCreated = true;

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

@@ -326,8 +326,13 @@ class Controller extends Section {
 
         return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'})
             .then(() => {
-                this.vnApp.showSuccess(this.$t('PDF sent!'));
+                this.$.balanceCreate.amountPaid = this.ticket.totalWithVat;
+                this.$.balanceCreate.clientFk = this.ticket.clientFk;
+                this.$.balanceCreate.description = 'Albaran: ';
+                this.$.balanceCreate.description += this.ticket.id;
+
                 this.$.balanceCreate.show();
+                this.vnApp.showSuccess(this.$t('PDF sent!'));
             });
     }
 }

print/templates/email/receipt/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/receipt/attachments.json

@@ -0,0 +1,6 @@
+[
+    {
+        "filename": "receipt.pdf",
+        "component": "receipt"
+    }
+]

print/templates/email/receipt/locale/es.yml

@@ -0,0 +1,5 @@
+subject: Recibo
+title: Recibo
+dear: Estimado cliente
+description: Ya está disponible el recibo <strong>{0}</strong>. <br/>
+  Puedes descargarlo haciendo clic en el adjunto de este correo.

print/templates/email/receipt/receipt.html

@@ -0,0 +1,9 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p>{{$t('dear')}},</p>
+            <p v-html="$t('description', [id])"></p>
+        </div>
+    </div>
+</email-body>

print/templates/email/receipt/receipt.js

@@ -0,0 +1,15 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'receipt',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true
+        }
+    }
+};