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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1945-item_type_category
gitea/salix/1945-item_type_category This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-12-26 13:30:57 +01:00
parent f2e9dbd597 b74de37c82
commit 195163c4f1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/helpers/selectors.js
View File

@ -345,11 +345,11 @@ export default {
acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]' acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]'
}, },
createTicketView: { createTicketView: {
clientAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.clientFk"]', clientAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.clientId"]',
addressAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.addressFk"]', addressAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.addressId"]',
deliveryDateInput: 'vn-ticket-create vn-date-picker[ng-model="$ctrl.landed"]', deliveryDateInput: 'vn-ticket-create vn-date-picker[ng-model="$ctrl.landed"]',
warehouseAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.warehouseFk"]', warehouseAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.warehouseId"]',
agencyAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.ticket.agencyModeFk"]', agencyAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.agencyModeId"]',
createButton: `button[type=submit]` createButton: `button[type=submit]`
}, },
ticketDescriptor: { ticketDescriptor: {

4
modules/ticket/front/create/card.js
View File

@ -14,9 +14,9 @@ class Controller {
$onInit() { $onInit() {
if (this.$stateParams && this.$stateParams.clientFk) if (this.$stateParams && this.$stateParams.clientFk)
this.clientFk = this.$stateParams.clientFk; this.clientId = this.$stateParams.clientFk;
this.warehouseFk = this.vnConfig.warehouseFk; this.warehouseId = this.vnConfig.warehouseFk;
} }
get ticket() { get ticket() {