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

front/core/components/field/index.html

@@ -13,7 +13,7 @@
         </label> 
     </div>
     <div class="icons pre">
-        <vn-icon
+        <vn-icon ng-show="::$ctrl.clearDisabled != true"
             icon="clear"
             translate-attr="{title: 'Clear'}"
             ng-click="$ctrl.onClear($event)">

front/core/components/field/index.js

@@ -203,6 +203,7 @@ ngModule.vnComponent('vnField', {
         type: '@?',
         autocomplete: '@?',
         placeholder: '@?',
+        clearDisabled: '<?',
         value: '=?',
         info: '@?',
         required: '<?',

front/core/components/field/index.spec.js

@@ -0,0 +1,24 @@
+describe('Component vnField', () => {
+    let $element;
+    let controller;
+
+    beforeEach(ngModule('vnCore'));
+
+    beforeEach(inject(($compile, $rootScope) => {
+        $element = $compile(`<vn-textfield></vn-textfield>`)($rootScope);
+        controller = $element.controller('vnTextfield');
+    }));
+
+    afterEach(() => {
+        $element.remove();
+    });
+
+    // Remove this block
+    describe('clearDisabled binding', () => {
+        it(`should enable the show property`, () => {
+            controller.clearDisabled = true;
+
+            expect(controller.clearDisabled).toEqual(true);
+        });
+    });
+});

front/core/components/textarea/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import Field from '../field';
+import './style.scss';
 
 export default class Textarea extends Field {
     constructor($element, $scope, $compile) {

front/core/components/textarea/style.scss

@@ -0,0 +1,8 @@
+.vn-textarea {
+    & > .container {
+        & > .icons {
+            display: flex;
+            align-items: flex-start;
+        }
+    }
+}

loopback/common/models/loggable.js

@@ -259,6 +259,10 @@ module.exports = function(Self) {
         removeUnloggable(definition, oldInstance);
         removeUnloggable(definition, newInstance);
 
+        // Prevent log with no new changes
+        const hasNewChanges = Object.keys(newInstance).length;
+        if (!hasNewChanges) return;
+
         let logRecord = {
             originFk: originId,
             userFk: userFk,

print/core/email.js

@@ -72,9 +72,10 @@ class Email extends Component {
             await getAttachments(this.path, this.attachments);
 
         const localeSubject = await this.getSubject();
+        const replyTo = this.args.replyTo || this.args.auth.email;
         const options = {
             to: this.args.recipient,
-            replyTo: this.args.auth.email,
+            replyTo: replyTo,
             subject: localeSubject,
             html: rendered,
             attachments: attachments

print/methods/closure.js

@@ -58,7 +58,8 @@ module.exports = app => {
                 const args = Object.assign({
                     ticketId: ticket.id,
                     recipientId: ticket.clientFk,
-                    recipient: ticket.recipient
+                    recipient: ticket.recipient,
+                    replyTo: ticket.salesPersonEmail
                 }, reqArgs);
 
                 const email = new Email('delivery-note-link', args);