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

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

This commit is contained in:
Gerard 2019-02-20 18:50:08 +01:00
parent a3dab9013c 4b54b82a9d
commit a651142fff
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,14 +135,15 @@ module.exports = Self => {
relation: 'user'
}
}
},
{
}, {
relation: 'atender',
scope: {
include: {
relation: 'user'
}
}
}, {
relation: 'sale'
}
]
};

2
modules/ticket/front/request/index/index.html
View File

@ -54,7 +54,7 @@
<vn-td number>
<span
ng-show="::request.saleFk"
ng-click="$ctrl.showItemDescriptor($event, request.sale)"
ng-click="$ctrl.showItemDescriptor($event, request.sale.itemFk)"
class="link">
{{request.saleFk | zeroFill:6}}
</span>

6
modules/ticket/front/request/index/index.js
View File

@ -44,18 +44,18 @@ class Controller {
});
}
showItemDescriptor(event, sale) {
showItemDescriptor(event, itemFk) {
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
state: `item.card.diary({
id: ${sale.itemFk},
id: ${itemFk},
ticketFk: ${this.$stateParams.id}
})`,
tooltip: 'Item diary'
}
};
this.$.itemDescriptor.itemFk = sale.itemFk;
this.$.itemDescriptor.itemFk = itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}

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

@ -151,7 +151,7 @@
<vn-th>Atender</vn-th>
<vn-th number>Quantity</vn-th>
<vn-th number>Price</vn-th>
<vn-th number>Sale id</vn-th>
<vn-th number>Item</vn-th>
<vn-th number>Ok</vn-th>
</vn-tr>
</vn-thead>
@ -166,9 +166,9 @@
<vn-td number>
<span
ng-show="::request.saleFk"
ng-click="$ctrl.showDescriptor($event, request.saleFk)"
ng-click="$ctrl.showDescriptor($event, request.sale.itemFk)"
class="link">
{{request.saleFk | zeroFill:6}}
{{request.sale.itemFk | zeroFill:6}}
</span>
</vn-td>
<vn-td number>