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

2019-11-13 12:31:13 +01:00 · 2019-11-13 12:31:13 +01:00 · d12f815c80
parent d5dd45534a c166067888
commit d12f815c80
18 changed files with 50 additions and 28 deletions
--- a/back/methods/chat/sendMessage.js
+++ b/back/methods/chat/sendMessage.js
@ -70,6 +70,12 @@ module.exports = Self => {
    }

    function send(uri, body) {
+        if (process.env.NODE_ENV !== 'production') {
+            return new Promise(resolve => {
+                return resolve({statusCode: 200, message: 'Fake notification sent'});
+            });
+        }
+
        const options = {
            method: 'POST',
            uri: uri,
--- a/back/methods/chat/spec/send.spec.js
+++ b/back/methods/chat/spec/send.spec.js
@ -0,0 +1,11 @@
+const app = require('vn-loopback/server/server');
+
+describe('chat sendMessage()', () => {
+    it('should return a response', async() => {
+        let ctx = {req: {accessToken: {userId: 1}}};
+        let response = await app.models.Chat.sendMessage(ctx, '@salesPerson', 'I changed something');
+
+        expect(response.statusCode).toEqual(200);
+        expect(response.message).toEqual('Fake notification sent');
+    });
+});
--- a/e2e/paths/05-ticket-module/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js
@ -9,8 +9,7 @@ describe('Ticket descriptor path', () => {
            .loginAndModule('salesperson', 'ticket');
    });

-    // Excluded waiting for #1874
-    xdescribe('Delete ticket', () => {
+    describe('Delete ticket', () => {
        it('should search for an specific ticket', async() => {
            const result = await nightmare
                .write(selectors.ticketsIndex.searchTicketInput, 18)
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@ -1,7 +1,6 @@
 const app = require('vn-loopback/server/server');

-// Excluded waiting for #1874
-xdescribe('ticket deleted()', () => {
+describe('ticket deleted()', () => {
    let ticket;
    let ctx;

--- a/print/common/css/email.css
+++ b/print/common/css/email.css
@ -3,13 +3,17 @@
 *
 */
 body {
-    background-color: #EEE;
+    -webkit-text-size-adjust: none; 
+    -ms-text-size-adjust: none; 
+    background-color: #FFF;
+    font-weight: 400;
    color: #555;
    margin: 0
 }

 .grid {
-    background-color: #EEE
+    background-color: #FFF
+    
 }

 .grid a {
@ -17,10 +21,10 @@ body {
 }

 .grid-block {
-    min-width: 320px; 
+    min-width: 300px; 
    max-width: 600px;
-    margin: 0 auto;
-    width: 600px
+    width: 600px;
+    margin: 0 auto
 }

 h1 {
--- a/print/common/css/layout.css
+++ b/print/common/css/layout.css
@ -4,8 +4,8 @@
 */

 .grid {
-    font-family: "Roboto", "Helvetica", "Arial", sans-serif;
-    font-size: 16px;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 16px !important;
    width: 100%
 }

--- a/print/core/components/email-footer/assets/css/style.css
+++ b/print/core/components/email-footer/assets/css/style.css
@ -1,4 +1,5 @@
 .buttons {
+    font-size: 14px !important;
    width: 100%
 }

--- a/print/core/components/email-footer/attachments.json
+++ b/print/core/components/email-footer/attachments.json
@ -9,16 +9,6 @@
        "path": "/assets/images/twitter.png",
        "cid": "twitter.png"
    },
-    {
-        "filename": "youtube.png",
-        "path": "/assets/images/youtube.png",
-        "cid": "youtube.png"
-    }, 
-    {
-        "filename": "pinterest.png",
-        "path": "/assets/images/pinterest.png",
-        "cid": "pinterest.png"
-    }, 
    {
        "filename": "instagram.png",
        "path": "/assets/images/instagram.png",
--- a/print/core/components/email-footer/email-footer.html
+++ b/print/core/components/email-footer/email-footer.html
@ -29,12 +29,6 @@
        <a href="https://www.twitter.com/Verdnatura" target="_blank">
            <img v-bind:src="getEmailSrc('twitter.png')" alt="Twitter"/>
        </a>
-        <a href="https://www.youtube.com/Verdnatura" target="_blank">
-            <img v-bind:src="getEmailSrc('youtube.png')" alt="Youtube"/>
-        </a>
-        <a href="https://www.pinterest.com/Verdnatura" target="_blank">
-            <img v-bind:src="getEmailSrc('pinterest.png')" alt="Pinterest"/>
-        </a>
        <a href="https://www.instagram.com/Verdnatura" target="_blank">
            <img v-bind:src="getEmailSrc('instagram.png')" alt="Instagram"/>
        </a>
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.html
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/client-welcome/client-welcome.html
+++ b/print/templates/email/client-welcome/client-welcome.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/delivery-note/delivery-note.html
+++ b/print/templates/email/delivery-note/delivery-note.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/driver-route/driver-route.html
+++ b/print/templates/email/driver-route/driver-route.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/letter-debtor-nd/letter-debtor-nd.html
+++ b/print/templates/email/letter-debtor-nd/letter-debtor-nd.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/letter-debtor-st/letter-debtor-st.html
+++ b/print/templates/email/letter-debtor-st/letter-debtor-st.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/payment-update/payment-update.html
+++ b/print/templates/email/payment-update/payment-update.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/printer-setup/printer-setup.html
+++ b/print/templates/email/printer-setup/printer-setup.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>
--- a/print/templates/email/sepa-core/sepa-core.html
+++ b/print/templates/email/sepa-core/sepa-core.html
@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html v-bind:lang="locale">
    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
        <title>{{ $t('subject') }}</title>
    </head>
    <body>