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

Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Javi Gallego 2020-03-30 12:22:09 +02:00
parent 729daf8b34 50c6c2d87b
commit 324261dc74
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/selectors.js
View File

@ -359,7 +359,7 @@ export default {
popoverDiaryButton: '.vn-popover.shown vn-item-descriptor vn-icon[icon="icon-transaction"]',
firstSaleQuantity: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(3)',
firstSaleDiscount: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(6)',
invoiceOutRef: 'vn-ticket-summary > vn-card > vn-horizontal > vn-one:nth-child(1) > vn-label-value:nth-child(6) > section > span',
invoiceOutRef: 'vn-ticket-summary > vn-card > vn-horizontal > vn-one:nth-child(1) > vn-label-value:nth-child(7) > section > span',
setOk: 'vn-ticket-summary vn-button[label="SET OK"] > button'
},
ticketsIndex: {

4
modules/ticket/back/methods/ticket/summary.js
View File

@ -55,7 +55,7 @@ module.exports = Self => {
{
relation: 'client',
scope: {
fields: ['salesPersonFk', 'name'],
fields: ['salesPersonFk', 'name', 'phone', 'mobile'],
include: {
relation: 'salesPerson',
scope: {
@ -73,7 +73,7 @@ module.exports = Self => {
{
relation: 'address',
scope: {
fields: ['street', 'city', 'provinceFk', 'phone'],
fields: ['street', 'city', 'provinceFk', 'phone', 'mobile'],
include: {
relation: 'province',
scope: {

29
modules/ticket/front/summary/index.html
View File

@ -30,6 +30,13 @@
<vn-label-value label="Warehouse"
value="{{$ctrl.summary.warehouse.name}}">
</vn-label-value>
<vn-label-value label="Route">
<span
ng-click="$ctrl.showRouteDescriptor($event)"
class="link">
{{$ctrl.summary.routeFk}}
</span>
</vn-label-value>
<vn-label-value label="Invoice"
value="{{$ctrl.summary.refFk}}">
</vn-label-value>
@ -41,22 +48,28 @@
<vn-label-value label="Landed"
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
</vn-label-value>
<vn-label-value label="Route">
<span
ng-click="$ctrl.showRouteDescriptor($event)"
class="link">
{{$ctrl.summary.routeFk}}
</span>
</vn-label-value>
<vn-label-value label="Package size"
value="{{$ctrl.summary.packages}}">
</vn-label-value>
<vn-label-value label="Address"
value="{{$ctrl.formattedAddress}}">
</vn-label-value>
<vn-label-value label="Phone"
<vn-label-value label="Address phone"
ng-if="$ctrl.summary.address.phone != null"
value="{{$ctrl.summary.address.phone}}">
</vn-label-value>
<vn-label-value label="Address mobile"
ng-if="$ctrl.summary.address.mobile != null"
value="{{$ctrl.summary.address.mobile}}">
</vn-label-value>
<vn-label-value label="Client phone"
ng-if="$ctrl.summary.client.phone != null"
value="{{$ctrl.summary.client.phone}}">
</vn-label-value>
<vn-label-value label="Client mobile"
ng-if="$ctrl.summary.client.mobile != null"
value="{{$ctrl.summary.client.mobile}}">
</vn-label-value>
</vn-one>
<vn-one class="notes">
<vn-label-value

4
modules/ticket/front/summary/locale/es.yml Normal file
View File

@ -0,0 +1,4 @@
Address phone: Tel. consignatario
Address mobile: Móv. consignatario
Client phone: Tel. cliente
Client mobile: Móv. cliente