Merge branch 'dev' into test
gitea/salix/test This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-02-20 10:07:40 +01:00
commit f793ec93df
10 changed files with 15 additions and 17 deletions

View File

@ -19,10 +19,8 @@ class Controller {
{ {
relation: 'user', relation: 'user',
scope: {fields: ['name', 'email']} scope: {fields: ['name', 'email']}
}, { },
relation: 'client', {
scope: {fields: ['fi']}
}, {
relation: 'sip', relation: 'sip',
scope: {fields: ['extension']} scope: {fields: ['extension']}
}, { }, {

View File

@ -23,9 +23,6 @@
<vn-label-value label="Email" <vn-label-value label="Email"
value="{{$ctrl.worker.user.email}}"> value="{{$ctrl.worker.user.email}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Fiscal identifier"
value="{{$ctrl.worker.client.fi}}">
</vn-label-value>
<vn-label-value label="Department" <vn-label-value label="Department"
value="{{$ctrl.worker.department.department.name}}"> value="{{$ctrl.worker.department.department.name}}">
</vn-label-value> </vn-label-value>

View File

@ -17,8 +17,7 @@
"url": "/index?q", "url": "/index?q",
"state": "worker.index", "state": "worker.index",
"component": "vn-worker-index", "component": "vn-worker-index",
"description": "Workers", "description": "Workers"
"acl": ["developer"]
}, { }, {
"url" : "/summary", "url" : "/summary",
"state": "worker.card.summary", "state": "worker.card.summary",
@ -40,7 +39,8 @@
"description": "Basic data", "description": "Basic data",
"params": { "params": {
"worker": "$ctrl.worker" "worker": "$ctrl.worker"
} },
"acl": ["developer"]
} }
] ]
} }

View File

@ -6,9 +6,6 @@
<vn-label-value label="Id" <vn-label-value label="Id"
value="{{worker.id}}"> value="{{worker.id}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Fiscal identifier"
value="{{worker.client.fi}}">
</vn-label-value>
<vn-label-value label="Email" <vn-label-value label="Email"
value="{{worker.user.email}}"> value="{{worker.user.email}}">
</vn-label-value> </vn-label-value>

View File

@ -15,7 +15,7 @@
</div> </div>
<!-- Title block end --> <!-- Title block end -->
<h1>{{ $t('sections.introduction.title') }},</h1> <p>{{ $t('sections.introduction.title') }},</p>
<p>{{ $t('sections.introduction.description') }}</p> <p>{{ $t('sections.introduction.description') }}</p>
<p>{{ $t('sections.introduction.terms') }}</p> <p>{{ $t('sections.introduction.terms') }}</p>

View File

@ -15,7 +15,7 @@
</div> </div>
<!-- Title block end --> <!-- Title block end -->
<h1>{{ $t('sections.introduction.title') }},</h1> <p>{{ $t('sections.introduction.title') }},</p>
<p>{{ $t('sections.introduction.description') }}</p> <p>{{ $t('sections.introduction.description') }}</p>
<p>{{ $t('checkExtract') }}</p> <p>{{ $t('checkExtract') }}</p>

View File

@ -15,7 +15,7 @@
</div> </div>
<!-- Title block end --> <!-- Title block end -->
<h1>{{ $t('sections.introduction.title') }},</h1> <p>{{ $t('sections.introduction.title') }},</p>
<p v-html="`${$t('sections.introduction.description')}:`"></p> <p v-html="`${$t('sections.introduction.description')}:`"></p>
<p> <p>

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -24,7 +24,10 @@ module.exports = {
}, },
data() { data() {
return { return {
files: ['/assets/files/model.ezp'], files: [
'/assets/files/model.ezp',
'/assets/files/port.png'
],
}; };
}, },
methods: { methods: {

View File

@ -30,6 +30,9 @@ module.exports = {
'Elige la primera opcion "Setup printer"', 'Elige la primera opcion "Setup printer"',
'Haz clic en la primera pestalla "Label Setup"', 'Haz clic en la primera pestalla "Label Setup"',
'Modifica la propidad "Paper Height"', 'Modifica la propidad "Paper Height"',
`Comprueba el puerto de la impresora, botón de le la derecha
"SETUP PRINTER" y en la parte derecha, igual como la imagen
que adjuntamos, seleccionar la que ponga "USB00x: GODEX"`,
'Haz clic en el boton "Ok"', 'Haz clic en el boton "Ok"',
'Haz clic sobre el icono de la impresora', 'Haz clic sobre el icono de la impresora',
'Haz clic en "Print"', 'Haz clic en "Print"',