verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

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

This commit is contained in:
Carlos Jimenez Ruiz 2019-01-30 14:25:13 +01:00
parent be5d48cb8a 259079b051
commit b64609f3a5
18 changed files with 136 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
front/core/components/watcher/watcher.js
View File

@ -13,15 +13,18 @@ import UserError from '../../lib/user-error';
* properties are provided.
*/
export default class Watcher extends Component {
constructor($element, $scope, $state, $transitions, $http, vnApp, $translate, $attrs, $q) {
constructor($element, $, $state, $stateParams, $transitions, $http, vnApp, $translate, $attrs, $q) {
super($element);
this.$ = $scope;
this.$state = $state;
this.$http = $http;
this._ = $translate;
this.$attrs = $attrs;
this.vnApp = vnApp;
this.$q = $q;
Object.assign(this, {
$,
$state,
$stateParams,
$http,
_: $translate,
$attrs,
vnApp,
$q
});
this.state = null;
this.deregisterCallback = $transitions.onStart({},
@ -240,7 +243,7 @@ export default class Watcher extends Component {
return newCopy;
}
}
Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs', '$q'];
Watcher.$inject = ['$element', '$scope', '$state', '$stateParams', '$transitions', '$http', 'vnApp', '$translate', '$attrs', '$q'];
ngModule.component('vnWatcher', {
template: require('./watcher.html'),

53
front/salix/locale/es.yml
View File

@ -1,32 +1,53 @@
Applications: Aplicaciones
Language: Idioma
Change language: Cambiar idioma
Client Frozen: Cliente congelado
Client has debt: Cliente con riesgo
Client inactive: Cliente inactivo
Client not checked: Cliente no comprobado
credit: Crédito
creditInsurance: Crédito Asegurado
Clients: Clientes
Claims: Reclamaciones
Data saved!: ¡Datos guardados!
Home: Inicio
Items: Artículos
Workers: Trabajadores
Locator: Localizador
Logout: Cerrar sesión
Modules access : Acceso a módulos
Return to home: Volver a inicio
Notifications: Notificaciones
name: Nombre
phone: Teléfono
Name: Nombre
Preview: Vista previa
Profile: Perfil
Push on applications menu: Para abrir un módulo pulsa en el menú de aplicaciones
Return to module index: Volver a la página principal del módulo
Routes: Rutas
What is new: Novedades de la versión
Web Account inactive: Sin acceso Web
Orders: Cesta
Settings: Ajustes
Enter a new search: Introduce una nueva búsqueda
No results: Sin resultados
# Actions
Back: Volver
Save: Guardar
Create: Crear
Send: Enviar
Delete: Eliminar
Order by: Ordenar por
Order: Orden
Ascendant: Ascendente
Descendant: Descendente
# Modules
Agencies: Agencias
Claims: Reclamaciones
Clients: Clientes
Items: Artículos
Orders: Cesta
Tickets: Tickets
Travels: Envíos
Workers: Trabajadores
Routes: Rutas
Locator: Localizador
# Common
Summary: Vista previa
Basic data: Datos básicos
List: Listado
# Misc
Phone: Teléfono

11
modules/agency/front/locale/es.yml
View File

@ -1,18 +1,9 @@
Name: Nombre
Agency: Agencia
Warehouse: Almacén
Hour: Hora (ETD)
Price: Precio
Create: Crear
Delete: Eliminar
Settings: Ajustes
Locations: Localizaciones
Enter a new search: Introduce una nueva búsqueda
Delete zone: Eliminar zona
Are you sure you want to delete this zone?: ¿Estás seguro de querer eliminar esta zona?
Zones: Zonas
List: Listado
Summary: Vista previa
New zone: Nueva zona
Basic data: Datos básicos
New zone: Nueva zona

6
modules/claim/front/locale/es.yml
View File

@ -7,11 +7,5 @@ Responsible: Responsable
Remove sale: Borrar linea
Claim Id: Id reclamación
Created: Creado
Enter a new search: Introduce una nueva búsqueda
Pickup order: Orden de recogida
Do you want to send it directly?: ¿Quieres enviarlo directamente?
#sections
Claims: Reclamaciones
List: Listado
Summary: Vista previa

30
modules/client/front/basic-data/index.html
View File

@ -8,25 +8,40 @@
<form name="form" ng-submit="watcher.submit()" compact>
<vn-card pad-large>
<vn-horizontal>
<vn-textfield vn-one
<vn-textfield
vn-one
label="Comercial Name"
field="$ctrl.client.name" vn-focus>
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Contact" field="$ctrl.client.contact"></vn-textfield>
<vn-textfield vn-one
<vn-textfield
vn-one
label="Contact"
field="$ctrl.client.contact">
</vn-textfield>
<vn-textfield
vn-one
label="Email"
field="$ctrl.client.email"
info="You can save multiple emails">
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Phone" field="$ctrl.client.phone"></vn-textfield>
<vn-textfield vn-one label="Mobile" field="$ctrl.client.mobile"></vn-textfield>
<vn-textfield
vn-one
label="Phone"
field="$ctrl.client.phone">
</vn-textfield>
<vn-textfield
vn-one
label="Mobile"
field="$ctrl.client.mobile">
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete vn-one
<vn-autocomplete
vn-one
initial-data="$ctrl.client.salesPerson"
field="$ctrl.client.salesPersonFk"
url="/client/api/Clients/activeWorkersWithRole"
@ -38,7 +53,8 @@
vn-acl="salesAssistant">
<tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete>
<vn-autocomplete vn-one
<vn-autocomplete
vn-one
initial-data="$ctrl.client.contactChannel"
field="$ctrl.client.contactChannelFk"
url="/client/api/ContactChannels"

2
modules/client/front/descriptor/index.html
View File

@ -43,7 +43,7 @@
ng-class="{bright: $ctrl.client.isActive == false}">
</vn-icon>
<vn-icon
vn-tooltip="Client Frozen"
vn-tooltip="Client frozen"
icon="icon-frozen"
ng-class="{bright: $ctrl.client.isFreezed == true}">
</vn-icon>

15
modules/client/front/locale/es.yml
View File

@ -2,7 +2,6 @@ Active: Activo
Amount: Importe
Client: Cliente
Comercial Name: Comercial
Back: Volver
Has to invoice: Factura
Invoice by mail: Factura via e-mail
Country: País
@ -10,29 +9,29 @@ Street: Domicilio fiscal
City: Municipio
Postcode: Código postal
Province: Provincia
Save: Guardar
Address: Consignatario
Verified data: Datos comprobados
Remove contact: Quitar contacto
Client ticket list: Listado de tickets del cliente
Add contact: Añadir contacto
Create: Crear
Sent: Enviado
Worker: Trabajador
Send: Enviar
Sample: Plantilla
Credit: Crédito
Are you sure you want to delete this expedition?: ¿Está seguro de borrar esta expedición?
Others: Otros
Enter a new search: Introduce una nueva búsqueda
New order: Nuevo pedido
Client frozen: Cliente congelado
Client has debt: Cliente con riesgo
Client inactive: Cliente inactivo
Client not checked: Cliente no comprobado
Credit insurance: Crédito asegurado
Web Account inactive: Sin acceso Web
# Sections
Clients: Clientes
List: Listado
New client: Nuevo cliente
Summary: Vista previa
Basic data: Datos básicos
Fiscal data: Datos fiscales
Pay method: Forma de pago
Addresses: Consignatarios

1
modules/client/front/routes.json
View File

@ -236,6 +236,7 @@
"state": "client.card.creditInsurance.index",
"component": "vn-client-credit-insurance-index",
"description": "Credit contracts",
"acl": ["creditInsurance"],
"params": {
"client": "$ctrl.client"
}

5
modules/item/front/locale/es.yml
View File

@ -34,7 +34,6 @@ Add barcode: Añadir código de barras
Remove barcode: Quitar código de barras
Buyer: Comprador
No results: Sin resultados
Enter a new search: Introduce una nueva búsqueda
Tag: Etiqueta
Worker: Trabajador
Available: Disponible
@ -45,11 +44,9 @@ stems: Tallos
Compression: Compresión
Density: Densidad
#Sections
# Sections
Items: Artículos
List: Listado
New item: Nuevo artículo
Summary: Vista previa
Basic data: Datos básicos
Tax: IVA
History: Historial

2
modules/item/front/ticket-descriptor/index.html
View File

@ -52,7 +52,7 @@
ng-class="{bright: $ctrl.ticket.client.isActive == false}">
</vn-icon>
<vn-icon vn-one
vn-tooltip="Client Frozen"
vn-tooltip="Client frozen"
icon="icon-frozen"
ng-class="{bright: $ctrl.ticket.client.isFreezed == true}">
</vn-icon>

6
modules/order/front/locale/es.yml
View File

@ -3,8 +3,6 @@ Catalog: Catálogo
from: desde
results: resultados
More than: Más de
No results: Sin resultados
Enter a new search: Introduce una nueva búsqueda
Plant: Planta
Flower: Flor
Handmade: Confección
@ -12,9 +10,5 @@ Green: Verde
Accessories: Complemento
Category: Reino
Search tag: Buscar etiqueta
Order by: Ordenar por
Order: Orden
Price: Precio
Ascendant: Ascendente
Descendant: Descendente
Created from: Creado desde

7
modules/travel/front/locale/es.yml
View File

@ -7,9 +7,6 @@ Landed: F. llegada
Delivered: Enviado
Received: Recibido
Travel id: Id envío
Enter a new search: Introduce una nueva búsqueda
#sections
Travels: Envíos
List: Listado
Summary: Vista previa
# Sections
Travels: Envíos

44
modules/worker/front/basic-data/index.html
View File

@ -1,30 +1,34 @@
<mg-ajax path="api/Workers/{{patch.params.id}}" options="vnPatch"></mg-ajax>
<vn-watcher
vn-id="watcher"
data="$ctrl.worker"
form="form"
save="patch">
id-field="id"
url="api/Workers"
save="post">
</vn-watcher>
<form name="form" ng-submit="$ctrl.onSubmit()">
<vn-card pad-large>
<vn-horizontal>
<vn-autocomplete
vn-one
field="$ctrl.zone.warehouseFk"
url="api/Warehouses"
show-field="name"
value-field="id"
label="Id">
</vn-autocomplete>
<vn-autocomplete
vn-one
field="$ctrl.zone.agencyModeFk"
url="api/AgencyModes"
show-field="name"
value-field="id"
label="Name">
</vn-autocomplete>
</vn-horizontal>
<vn-vertical>
<vn-horizontal>
<vn-textfield
vn-one
label="Name"
field="$ctrl.worker.firstName">
</vn-textfield>
<vn-textfield
vn-one
label="Last name"
field="$ctrl.worker.name">
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Phone"
field="$ctrl.worker.phone">
</vn-textfield>
</vn-horizontal>
</vn-vertical>
</vn-card>
<vn-button-bar>
<vn-submit label="Save"></vn-submit>

15
modules/worker/front/basic-data/index.js
View File

@ -1,21 +1,16 @@
import ngModule from '../module';
class Controller {
constructor($, $state) {
Object.assign(this, {
$,
$state
});
constructor($) {
Object.assign(this, {$});
}
onSubmit() {
this.$.watcher.submit().then(() => {
this.card.reload();
});
this.$.watcher.submit()
.then(() => this.card.reload());
}
}
Controller.$inject = ['$scope', '$state'];
Controller.$inject = ['$scope'];
ngModule.component('vnWorkerBasicData', {
template: require('./index.html'),

16
modules/worker/front/descriptor/index.html
View File

@ -10,27 +10,27 @@
</vn-horizontal>
<div class="body">
<div class="attributes">
<h5>{{::$ctrl.worker.firstName}} {{::$ctrl.worker.name}}</h5>
<h5>{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}</h5>
<vn-label-value label="Id"
value="{{::$ctrl.worker.id}}">
value="{{$ctrl.worker.id}}">
</vn-label-value>
<vn-label-value label="User"
value="{{::$ctrl.worker.user.name}}">
value="{{$ctrl.worker.user.name}}">
</vn-label-value>
<vn-label-value label="Email"
value="{{::$ctrl.worker.user.email}}">
value="{{$ctrl.worker.user.email}}">
</vn-label-value>
<vn-label-value label="Fiscal identifier"
value="{{::$ctrl.worker.client.fi}}">
value="{{$ctrl.worker.client.fi}}">
</vn-label-value>
<vn-label-value label="Department"
value="{{::$ctrl.worker.department.department}}">
value="{{$ctrl.worker.department.department}}">
</vn-label-value>
<vn-label-value label="Phone"
value="{{::$ctrl.worker.phone}}">
value="{{$ctrl.worker.phone}}">
</vn-label-value>
<vn-label-value label="Extension"
value="{{::$ctrl.worker.sip.phone}}">
value="{{$ctrl.worker.sip.phone}}">
</vn-label-value>
</div>
<div class="quicklinks">

5
modules/worker/front/index/index.html
View File

@ -3,8 +3,7 @@
url="/agency/api/Workers"
include="::$ctrl.include"
limit="20"
data="workers"
auto-load="false">
data="workers">
</vn-crud-model>
<div class="index-block">
<div class="vn-list">
@ -21,7 +20,7 @@
ui-sref="worker.card.summary({id: worker.id})"
translate-attr="{title: 'View worker'}"
class="vn-list-item">
<vn-horizontal ng-click="$ctrl.onClick($event)">
<vn-horizontal>
<vn-one>
<h6>{{::worker.firstName}} {{::worker.name}}</h6>
<vn-label-value label="Id"

11
modules/worker/front/locale/es.yml
View File

@ -1 +1,10 @@
Workers: Trabajadores
Workers: Trabajadores
Last name: Apellidos
User data: Datos de usuario
Fiscal identifier: Identificador fiscal
Email: Correo electrónico
Department: Departamento
User id: Id de usuario
Role: Rol
Extension: Extensión
Go to client: Ir al cliente

2
modules/worker/front/summary/index.html
View File

@ -20,7 +20,7 @@
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>User info</h4>
<h4 translate>User data</h4>
<vn-label-value label="User id"
value="{{worker.userFk}}">
</vn-label-value>