diff --git a/back/models/sip.json b/back/models/sip.json
index 98bcfee966..0864408e3f 100644
--- a/back/models/sip.json
+++ b/back/models/sip.json
@@ -16,7 +16,7 @@
}
},
"extension": {
- "type": "String"
+ "type": "Number"
},
"secret": {
"type": "String"
diff --git a/e2e/helpers/components_selectors.js b/e2e/helpers/components_selectors.js
index 06745cee1f..9afd063743 100644
--- a/e2e/helpers/components_selectors.js
+++ b/e2e/helpers/components_selectors.js
@@ -3,6 +3,7 @@
export default {
vnTextfield: 'vn-textfield > div > div > div > input',
+ vnInputNumber: 'vn-input-number > div > div > div > input',
vnSubmit: 'vn-submit > input',
vnFloatButton: 'vn-float-button > button'
};
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 8e38571339..ca6eaca4a0 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -78,7 +78,7 @@ export default {
clientPayMethod: {
payMethodAutocomplete: `vn-autocomplete[field="$ctrl.client.payMethodFk"]`,
IBANInput: `${components.vnTextfield}[name="iban"]`,
- dueDayInput: `${components.vnTextfield}[name="dueDay"]`,
+ dueDayInput: `${components.vnInputNumber}[name="dueDay"]`,
receivedCoreLCRCheckbox: `vn-check[label='Received LCR'] md-checkbox`,
receivedCoreVNLCheckbox: `vn-check[label='Received core VNL'] md-checkbox`,
receivedB2BVNLCheckbox: `vn-check[label='Received B2B VNL'] md-checkbox`,
@@ -132,13 +132,13 @@ export default {
},
clientCredit: {
addCreditFloatButton: `${components.vnFloatButton}`,
- creditInput: `${components.vnTextfield}[name="credit"]`,
+ creditInput: `${components.vnInputNumber}[name="credit"]`,
saveButton: `${components.vnSubmit}`,
firstCreditText: 'vn-client-credit-index vn-card > div vn-table vn-tbody > vn-tr'
},
clientGreuge: {
addGreugeFloatButton: `${components.vnFloatButton}`,
- amountInput: `${components.vnTextfield}[name="amount"]`,
+ amountInput: `${components.vnInputNumber}[name="amount"]`,
descriptionInput: `${components.vnTextfield}[name="description"]`,
typeAutocomplete: `vn-autocomplete[field="$ctrl.greuge.greugeTypeFk"]`,
saveButton: `${components.vnSubmit}`,
@@ -162,7 +162,7 @@ export default {
companyAutocomplete: 'vn-client-risk-index vn-autocomplete[field="$ctrl.companyFk"]',
newPaymentButton: `${components.vnFloatButton}`,
newPaymentBankInut: `vn-client-risk-create vn-textfield[field="$ctrl.receipt.bankFk"] input`,
- newPaymentAmountInput: `vn-client-risk-create vn-textfield[field="$ctrl.receipt.amountPaid"] input`,
+ newPaymentAmountInput: `vn-client-risk-create vn-input-number[field="$ctrl.receipt.amountPaid"] input`,
saveButton: `vn-client-risk-create vn-button[label="Save"]`,
firstRiskLineBalance: 'vn-client-risk-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)'
@@ -223,7 +223,7 @@ export default {
typeAutocomplete: `vn-autocomplete[field="$ctrl.item.typeFk"]`,
intrastatAutocomplete: `vn-autocomplete[field="$ctrl.item.intrastatFk"]`,
nameInput: `vn-textfield[label="Name"] input`,
- relevancyInput: `vn-textfield[label="Relevancy"] input`,
+ relevancyInput: `vn-input-number[label="Relevancy"] input`,
originAutocomplete: `vn-autocomplete[field="$ctrl.item.originFk"]`,
expenceAutocomplete: `vn-autocomplete[field="$ctrl.item.expenceFk"]`,
longNameInput: `vn-textfield[field="$ctrl.item.longName"] input`,
@@ -356,7 +356,7 @@ export default {
ticketPackages: {
packagesButton: `vn-left-menu a[ui-sref="ticket.card.package.index"]`,
firstPackageAutocomplete: `vn-autocomplete[label="Package"]`,
- firstQuantityInput: `vn-textfield[label="Quantity"] input`,
+ firstQuantityInput: `vn-input-number[label="Quantity"] input`,
firstRemovePackageButton: `vn-icon-button[vn-tooltip="Remove package"]`,
addPackageButton: `vn-icon-button[vn-tooltip="Add package"]`,
clearPackageAutocompleteButton: `vn-autocomplete[label="Package"] > div > div > div > vn-icon > i`,
@@ -440,8 +440,8 @@ export default {
request: 'vn-ticket-request-index > form > vn-card > div > vn-horizontal > vn-table > div > vn-tbody > vn-tr',
descriptionInput: `vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(1) > vn-textfield > div > div > div.infix > input`,
atenderAutocomplete: `vn-ticket-request-create vn-autocomplete[field="$ctrl.ticketRequest.atenderFk"]`,
- quantityInput: `vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(2) > vn-textfield:nth-child(1) > div > div > div.infix > input`,
- priceInput: `vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(2) > vn-textfield:nth-child(2) > div > div > div.infix > input`,
+ quantityInput: `vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(2) > vn-input-number:nth-child(1) > div > div > div.infix > input`,
+ priceInput: `vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(2) > vn-input-number:nth-child(2) > div > div > div.infix > input`,
firstRemoveRequestButton: `vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)`,
saveButton: `vn-ticket-request-create > form > div > vn-button-bar > vn-submit[label="Create"] input`,
firstDescription: 'vn-ticket-request-index > form > vn-card > div > vn-horizontal > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2)',
@@ -456,7 +456,7 @@ export default {
ticketService: {
addServiceButton: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(3) > vn-icon-button > button > vn-icon',
firstDescriptionInput: 'vn-ticket-service vn-textfield[label="Description"] input',
- firstQuantityInput: 'vn-ticket-service vn-textfield[label="Quantity"] input',
+ firstQuantityInput: 'vn-ticket-service vn-input-number[label="Quantity"] input',
firstPriceInput: 'vn-ticket-service vn-input-number[label="Price"] input',
firstVatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]',
fistDeleteServiceButton: 'vn-ticket-card > vn-main-block > div.content-block.ng-scope > vn-ticket-service > form > vn-card > div > vn-one:nth-child(1) > vn-horizontal:nth-child(1) > vn-auto > vn-icon-button[icon="delete"]',
@@ -485,7 +485,7 @@ export default {
addItemButton: `vn-claim-detail a vn-float-button`,
firstClaimableSaleFromTicket: 'vn-claim-detail > vn-dialog vn-tbody > vn-tr',
claimDetailLine: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr',
- secondItemQuantityInput: 'vn-claim-detail vn-tr:nth-child(2) vn-textfield[model="saleClaimed.quantity"] input',
+ secondItemQuantityInput: 'vn-claim-detail vn-tr:nth-child(2) vn-input-number[model="saleClaimed.quantity"] input',
totalClaimed: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-horizontal > div > vn-label-value:nth-child(2) > section > span',
secondItemDeleteButton: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(9) > vn-icon-button > button > vn-icon > i'
},
@@ -548,7 +548,7 @@ export default {
confirmButton: 'vn-order-line > vn-confirm button[response="ACCEPT"]',
},
workerPbx: {
- extensionInput: 'vn-worker-pbx vn-textfield[model="$ctrl.worker.sip.extension"] input',
+ extensionInput: 'vn-worker-pbx vn-input-number[model="$ctrl.worker.sip.extension"] input',
passwordInput: 'vn-worker-pbx vn-textfield[model="$ctrl.worker.sip.secret"] input',
saveButton: 'vn-worker-pbx vn-submit[label="Save"] input'
},
diff --git a/e2e/paths/claim-module/03_detail.spec.js b/e2e/paths/claim-module/03_detail.spec.js
index 55e12fc52b..f3c8f5792c 100644
--- a/e2e/paths/claim-module/03_detail.spec.js
+++ b/e2e/paths/claim-module/03_detail.spec.js
@@ -29,6 +29,7 @@ describe('Claim detail', () => {
it('should edit de second item claimed quantity', async() => {
const result = await nightmare
+ .clearInput(selectors.claimDetail.secondItemQuantityInput)
.write(selectors.claimDetail.secondItemQuantityInput, 10)
.write('body', '\u000d') // simulates enter
.waitForLastSnackbar();
diff --git a/front/core/components/input-number/index.html b/front/core/components/input-number/index.html
index 64d76485f9..ec34c43ca1 100644
--- a/front/core/components/input-number/index.html
+++ b/front/core/components/input-number/index.html
@@ -16,6 +16,7 @@
type="number"
name="{{::$ctrl.name}}"
ng-model="$ctrl.value"
+ vn-validation="{{$ctrl.rule}}"
ng-disabled="$ctrl.disabled"
ng-readonly="$ctrl.readonly"
ng-focus="$ctrl.hasFocus = true"
diff --git a/front/core/components/input-number/index.js b/front/core/components/input-number/index.js
index 9c187a8151..0d45082c53 100644
--- a/front/core/components/input-number/index.js
+++ b/front/core/components/input-number/index.js
@@ -90,6 +90,7 @@ ngModule.component('vnInputNumber', {
controller: InputNumber,
bindings: {
label: '@?',
+ name: '@?',
disabled: '{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}
{{::saleClaimed.sale.quantity}}
-
-
+ display-controls="false"
+ on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)">
+
{{::saleClaimed.sale.concept}}
{{::saleClaimed.sale.price | currency: 'EUR':2}}
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index ce47488293..0829381d8e 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -17,12 +17,11 @@
fields="['ibanRequired']"
initial-data="$ctrl.client.payMethod">
-
-
+
-
-
-
+
-
+
-
-
+
-
-
+
diff --git a/modules/client/front/credit/create/index.html b/modules/client/front/credit/create/index.html
index 79f17b2a2f..2c59a5388c 100644
--- a/modules/client/front/credit/create/index.html
+++ b/modules/client/front/credit/create/index.html
@@ -8,7 +8,11 @@
-
-
+
+
+
+
-
+
+
-
+
+
diff --git a/modules/ticket/front/package/index.html b/modules/ticket/front/package/index.html
index 5baf0580c9..c718d74fc7 100644
--- a/modules/ticket/front/package/index.html
+++ b/modules/ticket/front/package/index.html
@@ -25,12 +25,12 @@
field="package.packagingFk">
{{itemFk}} : {{name}}
-
-
+
-
-
+
+
+
+
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index 83b504021f..3e52495937 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -21,18 +21,15 @@
model="service.description"
rule="TicketService.description">
-
-
-
+
+ model="service.price">
-
-
+