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

modules/ticket/front/data/step-one/index.html

@@ -16,9 +16,11 @@
                 label="Address"
                 show-field="nickname"
                 value-field="id" 
-                field="$ctrl.ticket.addressFk">
-                <tpl-item>{{::nickname}} 
-                    <span ng-show="city || province || street">- {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}}</span>
+                field="$ctrl.ticket.addressFk"
+                order="isActive DESC">
+                <tpl-item ng-class="::{notActive: isActive === false}">
+                    <span class="inactive" translate>{{::isActive ? '' : 'INACTIVE'}}</span> {{::nickname}} 
+                    <span ng-show="::{{city || province || street}}">- {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}}</span>
                 </tpl-item>
             </vn-autocomplete>
             <vn-autocomplete vn-one

modules/ticket/front/data/step-one/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import {toJsonDate} from 'core/lib/date';
+import './style.scss';
 
 class Controller {
     constructor($scope, $http, $translate, vnApp) {

modules/ticket/front/data/step-one/style.scss

@@ -0,0 +1,13 @@
+@import 'colors';
+
+tpl-item{ 
+    &.notActive {
+        background-color: $main-bg;
+        color: $secondary-font-color;
+        width: 100%;
+    }
+
+    & > .inactive {
+        text-transform: uppercase;
+    }
+}