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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Carlos Jimenez Ruiz 2019-03-01 07:33:31 +01:00
parent 79a1785296 d6997a85ff
commit 0762b734fb
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/paths/item-module/09_regularize_item.spec.js
View File

@ -1,7 +1,8 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare'; import createNightmare from '../../helpers/nightmare';
describe('Item regularize path', () => { // #1186 repearar e2e ticket.sale, item.regularize.
xdescribe('Item regularize path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
beforeAll(() => { beforeAll(() => {
nightmare nightmare

6
e2e/paths/ticket-module/07_edit_sale.spec.js
View File

@ -1,8 +1,8 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare'; import createNightmare from '../../helpers/nightmare';
// #1152 refactor ticket.sale, update price no funciona correctamente. // #1186 repearar e2e ticket.sale, item.regularize.
describe('Ticket Edit sale path', () => { xdescribe('Ticket Edit sale path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
beforeAll(() => { beforeAll(() => {
@ -466,7 +466,7 @@ describe('Ticket Edit sale path', () => {
.waitToClick(selectors.ticketSales.moreMenuButton) .waitToClick(selectors.ticketSales.moreMenuButton)
.waitToClick(selectors.ticketSales.moreMenuUpdateDiscount) .waitToClick(selectors.ticketSales.moreMenuUpdateDiscount)
.write(selectors.ticketSales.moreMenuUpdateDiscountInput, 100) .write(selectors.ticketSales.moreMenuUpdateDiscountInput, 100)
.write('body', '\u000d') // simulates enter .write('body', '\u000d')
.waitForTextInElement(selectors.ticketSales.totalImport, '0.00') .waitForTextInElement(selectors.ticketSales.totalImport, '0.00')
.waitToGetProperty(selectors.ticketSales.totalImport, 'innerText'); .waitToGetProperty(selectors.ticketSales.totalImport, 'innerText');

3
loopback/server/datasources.json
View File

@ -13,7 +13,6 @@
"password": "root", "password": "root",
"multipleStatements": true, "multipleStatements": true,
"connectTimeout": 20000, "connectTimeout": 20000,
"acquireTimeout": 20000, "acquireTimeout": 20000
"dateStrings": true
} }
} }

8
modules/client/back/models/sample.json
View File

@ -19,14 +19,16 @@
"type": "String" "type": "String"
}, },
"isVisible": { "isVisible": {
"type": "Number" "type": "Boolean"
}, },
"hasCompany": { "hasCompany": {
"type": "Number" "type": "Number"
} }
}, },
"scope": { "scopes": {
"where": {"isVisible": 1} "visible": {
"where": {"isVisible": true}
}
}, },
"acls": [ "acls": [
{ {

2
modules/client/front/index/index.html
View File

@ -40,7 +40,7 @@
</vn-one> </vn-one>
<vn-horizontal class="buttons"> <vn-horizontal class="buttons">
<vn-icon-button <vn-icon-button
ng-click="$ctrl.preview($event)" ng-click="$ctrl.openSummary(client, $event)"
vn-tooltip="Preview" vn-tooltip="Preview"
icon="desktop_windows"> icon="desktop_windows">
</vn-icon-button> </vn-icon-button>

2
modules/client/front/sample/create/index.html
View File

@ -14,7 +14,7 @@
field="$ctrl.clientSample.typeFk" field="$ctrl.clientSample.typeFk"
model="ClientSample.typeFk" model="ClientSample.typeFk"
fields="['code','hasCompany']" fields="['code','hasCompany']"
url="/client/api/Samples" url="/client/api/Samples/visible"
show-field="description" show-field="description"
value-field="id" value-field="id"
label="Sample"> label="Sample">