Merge branch 'dev' into 2770-supplier_address

Jenkinsfile

@@ -13,15 +13,6 @@ pipeline {
         stage('Checkout') {
             steps {
                 script {
-                    if (!env.GIT_COMMITTER_EMAIL) {
-                        env.COMMITTER_EMAIL = sh(
-                            script: 'git --no-pager show -s --format="%ae"',
-                            returnStdout: true
-                        ).trim()
-                    } else {
-                        env.COMMITTER_EMAIL = env.GIT_COMMITTER_EMAIL;
-                    }
-
                     switch (env.BRANCH_NAME) {
                         case 'master':
                             env.NODE_ENV = 'production'
@@ -41,7 +32,7 @@ pipeline {
                     load env.GROOVY_FILE
                 }
 
-                sh 'printenv'
+                setEnv()
             }
         }
         stage('Install') {
@@ -86,16 +77,14 @@ pipeline {
                 branch 'master'
             }}
             environment {
-                CREDS = credentials('docker-registry')
+                CREDENTIALS = credentials('docker-registry')
             }
             steps {
                 nodejs('node-v12') {
                     sh 'gulp build'
                 }
 
-                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
-                sh 'docker-compose build --parallel'
-                sh 'docker-compose push'
+                dockerBuild()
             }
         }
         stage('Deploy') {
@@ -103,6 +92,9 @@ pipeline {
                 branch 'test'
                 branch 'master'
             }}
+            environment {
+                DOCKER_HOST = "${env.SWARM_HOST}"
+            }
             steps {
                 sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }

docker-compose.yml

@@ -9,6 +9,9 @@ services:
       - 80
     deploy:
       replicas: 2
+      placement:
+        constraints:
+          - node.role == worker
   back:
     image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
     build: .
@@ -31,6 +34,9 @@ services:
       - /mnt/storage/image:/var/lib/salix/image
     deploy:
       replicas: ${BACK_REPLICAS:?}
+      placement:
+        constraints:
+          - node.role == worker
 configs:
   datasources:
     external: true

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

@@ -28,8 +28,11 @@ class Controller extends Section {
         if (!value) return;
 
         this.loadData().then(() => {
-            if (this.$params.sendSMS)
-                this.showSMSDialog();
+            if (this.$params.sendSMS) {
+                this.showSMSDialog({
+                    message: this.$params.message
+                });
+            }
         });
     }
 

modules/ticket/front/descriptor/index.html

@@ -2,7 +2,11 @@
     module="ticket"
     description="$ctrl.ticket.client.name">
     <slot-dot-menu>
-        <vn-ticket-descriptor-menu ticket-id="$ctrl.ticket.id" parent-reload="$ctrl.cardReload()"/>
+        <vn-ticket-descriptor-menu 
+            vn-id="descriptorMenu" 
+            ticket-id="$ctrl.ticket.id" 
+            parent-reload="$ctrl.cardReload()"
+        />
     </slot-dot-menu>
     <slot-body>
         <div class="attributes">

modules/ticket/front/summary/index.html

@@ -19,7 +19,11 @@
             ng-click="$ctrl.setOkState()"
             vn-tooltip="Change ticket state to 'Ok'">
         </vn-button>
-        <vn-ticket-descriptor-menu ticket-id="$ctrl.summary.id" parent-reload="$ctrl.reload()"/>
+        <vn-ticket-descriptor-menu 
+            ng-if="!$ctrl.isTicketModule"
+            ticket-id="$ctrl.summary.id" 
+            parent-reload="$ctrl.reload()"
+        />
     </h5>
     <vn-horizontal>
         <vn-one>

modules/ticket/front/summary/index.js

@@ -40,6 +40,11 @@ class Controller extends Summary {
             });
     }
 
+    get isTicketModule() {
+        const path = this.$state.getCurrentPath()[1];
+        return path.state.name === 'ticket';
+    }
+
     get isEditable() {
         try {
             return !this.ticket.ticketState.state.alertLevel;

print/templates/email/osticket-report/osticket-report.html

@@ -45,10 +45,10 @@
                                     <thead>
                                         <tr>
                                             <th width="5%">{{$t('author')}}</th>
-                                            <th width="5%">{{$t('dated')}}</th>
-                                            <th width="30%">{{$t('ticketSubject')}}</th>
+                                            <th width="15%">{{$t('dated')}}</th>
+                                            <th width="25%">{{$t('ticketSubject')}}</th>
                                             <th width="30%">{{$t('ticketDescription')}}</th>
-                                            <th width="30%">{{$t('resolution')}}</th>
+                                            <th width="20%">{{$t('resolution')}}</th>
                                         </tr>
                                     </thead>
                                     <tbody v-for="ticket in technician.tickets">