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

e2e/paths/item-module/09_regularize_item.spec.js

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

e2e/paths/ticket-module/07_edit_sale.spec.js

@@ -1,8 +1,8 @@
 import selectors from '../../helpers/selectors.js';
 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();
 
     beforeAll(() => {
@@ -466,7 +466,7 @@ describe('Ticket Edit sale path', () => {
             .waitToClick(selectors.ticketSales.moreMenuButton)
             .waitToClick(selectors.ticketSales.moreMenuUpdateDiscount)
             .write(selectors.ticketSales.moreMenuUpdateDiscountInput, 100)
-            .write('body', '\u000d') // simulates enter
+            .write('body', '\u000d')
             .waitForTextInElement(selectors.ticketSales.totalImport, '0.00')
             .waitToGetProperty(selectors.ticketSales.totalImport, 'innerText');
 

loopback/server/datasources.json

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

modules/client/back/models/sample.json

@@ -2,9 +2,9 @@
     "name": "Sample",
     "base": "VnModel",
     "options": {
-      "mysql": {
+        "mysql": {
-        "table": "sample"
+            "table": "sample"
-      }
+        }
     },
     "properties": {
         "id": {
@@ -19,14 +19,16 @@
             "type": "String"
         },
         "isVisible": {
-            "type": "Number"
+            "type": "Boolean"
         },
         "hasCompany": {
             "type": "Number"
         }
     },
-    "scope": {
+    "scopes": {
-        "where": {"isVisible": 1}
+        "visible": {
+            "where": {"isVisible": true}
+        }
     },
     "acls": [
       {

modules/client/front/index/index.html

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

modules/client/front/sample/create/index.html

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