merge descriptor

Jenkinsfile

@@ -43,11 +43,13 @@ node
         
         stage ("Stopping/Removing Docker")
         {
+            env.TAG = "${env.BUILD_NUMBER}" - 1;
             sh "docker-compose down --rmi 'all'" 
         }
 
         stage ("Generar dockers")
         {
+            env.TAG = "${env.BUILD_NUMBER}" + 1;
             sh "docker-compose up -d --build"
         }  
     }

client/client/src/descriptor/descriptor.html

@@ -4,16 +4,28 @@
             <a vn-one ui-sref="clients">
                 <i class="material-icons descriptor-icon" >person</i>
             </a>
+
+            <vn-vertical vn-two>
+                <div class="margin-none">{{::$ctrl.client.id}}</div>
+                <div class="margin-none">{{$ctrl.client.name}}</div>
+                <div class="margin-none">{{$ctrl.client.phone}}</div>
+            </vn-vertical>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+                <span translate>Credit</span>:
+            </vn-one>
+            <vn-auto>
+                {{$ctrl.client.credit || 0}} €
+            </vn-auto>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+                <span translate>Secured credit</span>:
+            </vn-one>
+            <vn-auto>
+                {{$ctrl.client.creditInsurance || 0}} €
+            </vn-auto>
         </vn-horizontal>
-        <!-- style="align:center;" -->
-        <vn-one class="vn-item-client-name" >{{$ctrl.client.name}}</vn-one>
-        <vn-one><span >Client id</span>: <b>{{$ctrl.client.id}}</b></vn-one>
-        <vn-one><span>Mobile</span>: <b>{{$ctrl.client.mobile | phone}}</b></vn-one>
-        <vn-one title="{{$ctrl.client.salesPerson.name}}" style="width: 200px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      "><span >Salesperson</span>: <b>cesteban</b></vn-one>
-        <vn-one><span >Credit</span>: <b>{{($ctrl.client.credit | number:0) + " €"}}</b></vn-one>    
     </vn-vertical>
 </vn-card>

client/client/src/locale/es.json

@@ -0,0 +1,22 @@
+{
+    "Active": "Activo",
+    "Client": "Cliente",
+    "Clients": "Clientes",
+    "Basic data": "Datos básicos",
+    "Fiscal data": "Datos Fiscales",
+    "Addresses": "Consignatarios",
+    "Web access": "Acceso web",
+    "Notes": "Notas",
+    "Has to invoice": "Factura",
+    "Invoice by mail": "Factura impresa",
+    "Country": "País",
+    "Street": "Domicilio fiscal",
+    "City": "Municipio",
+    "Postcode": "Código postal",
+    "Province": "Provincia",
+    "Save": "Guardar",
+    "Pay method" : "Forma de pago",
+    "Address": "Consignatario",
+    "Credit" : "Crédito",
+    "Secured credit": "Crédito asegurado"
+}

docker-compose.yml

@@ -76,7 +76,18 @@ services:
             - "3005"
         ports:
             - "3005:3005"    
-
+    print:
+        environment:
+            - NODE_ENV=${NODE_ENV}
+        container_name: "${BRANCH_NAME}-print"
+        image: "print:${TAG}"
+        build:
+            context: ./services
+            dockerfile: /print/Dockerfile
+        expose:
+            - "3006"
+        ports:
+            - "3006:3006" 
     nginx:
         container_name: "${BRANCH_NAME}-nginx"
         image: "nginx:${TAG}"
@@ -95,3 +106,4 @@ services:
             - "mailer:${BRANCH_NAME}-mailer"
             - "production:${BRANCH_NAME}-production"
             - "route:${BRANCH_NAME}-route"
+            - "print:${BRANCH_NAME}-print"