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

db/tests/vn/zone_getEvents.spec.js

@@ -0,0 +1,33 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('zone zone_getEvents()', () => {
+    it(`should return data for a agencyMode with deliveryMethod pickup`, async() => {
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        let params = {
+            zoneGeoFk: 1,
+            agencyModeFk: 1};
+
+        stmt = new ParameterizedSQL('CALL zone_getEvents(?, ?)', [
+            params.zoneGeoFk,
+            params.agencyModeFk,
+
+        ]);
+        stmts.push(stmt);
+        let firstResultIndex = stmts.push(stmt) - 1;
+        let secondResultIndex = firstResultIndex + 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let zonesEvents = result[secondResultIndex];
+
+        expect(zonesEvents.length).toBeGreaterThan(0);
+    });
+});

modules/order/front/catalog/index.html

@@ -11,7 +11,7 @@
     data="$ctrl.items">
 </vn-crud-model>
 <vn-portal slot="topbar">
-    <vn-searchbar 
+    <vn-searchbar vn-id="searchbar"
         auto-state="false"
         info="Search by item id or name"
         on-search="$ctrl.onSearch($params)">

modules/order/front/catalog/index.js

@@ -206,7 +206,7 @@ class Controller extends Section {
 
     removeItemId() {
         this.itemId = null;
-        this.applyFilters();
+        this.$.searchbar.doSearch({}, 'bar');
     }
 
     removeItemName() {

print/templates/email/delivery-note-link/locale/en.yml

@@ -0,0 +1,10 @@
+subject: Your delivery note
+title: "Here is your delivery note!"
+dear: Dear client
+description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
+  You can download it by clicking <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
+copyLink: 'As an alternative, you can copy the following link in your browser:'
+poll: If you wish, you can answer our satisfaction survey to
+   help us provide better service. Your opinion is very important for us!
+help: Any questions that arise, do not hesitate to consult it, <strong>we are here to assist you!</strong>
+conclusion: Thanks for your attention!

print/templates/email/delivery-note/locale/en.yml

@@ -0,0 +1,9 @@
+subject: Your delivery note
+title: "Here is your delivery note!"
+dear: Dear client
+description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
+  You can download it by clicking on the attachment of this email.
+poll: If you wish, you can answer our satisfaction survey to
+   help us provide better service. Your opinion is very important for us!
+help: Any questions that arise, do not hesitate to consult it, <strong>we are here to assist you!</strong>
+conclusion: Thanks for your attention!