diff --git a/Jenkinsfile b/Jenkinsfile index 62248b0fe..4cc6d74f4 100644 --- a/Jenkinsfile +++ b/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" } } diff --git a/client/client/src/descriptor/descriptor.html b/client/client/src/descriptor/descriptor.html index 1139ffa8f..87a7a5492 100644 --- a/client/client/src/descriptor/descriptor.html +++ b/client/client/src/descriptor/descriptor.html @@ -4,16 +4,28 @@ person + + +
{{::$ctrl.client.id}}
+
{{$ctrl.client.name}}
+
{{$ctrl.client.phone}}
+
- - {{$ctrl.client.name}} - Client id: {{$ctrl.client.id}} - Mobile: {{$ctrl.client.mobile | phone}} - Salesperson: cesteban - Credit: {{($ctrl.client.credit | number:0) + " €"}} - + + + Credit: + + + {{$ctrl.client.credit || 0}} € + + + + + Secured credit: + + + {{$ctrl.client.creditInsurance || 0}} € + + + diff --git a/client/client/src/locale/es.json b/client/client/src/locale/es.json new file mode 100644 index 000000000..0c4cd2362 --- /dev/null +++ b/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" +} diff --git a/docker-compose.yml b/docker-compose.yml index 949d393ae..b8d64389b 100644 --- a/docker-compose.yml +++ b/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"