Merge branch 'dev' into 6125-roleCreditLimit

Reviewed-on: #1783
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

db/changes/234201/00-aclClient.sql

@@ -0,0 +1,3 @@
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+	VALUES('TicketCollection', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');

front/core/components/index.js

@@ -39,6 +39,7 @@ import './range';
 import './input-time';
 import './input-file';
 import './label';
+import './link-phone';
 import './list';
 import './popover';
 import './popup';

front/core/components/link-phone/index.html

@@ -0,0 +1,14 @@
+<span ng-if="$ctrl.phoneNumber">
+    {{$ctrl.phoneNumber}}
+    <a href="tel:{{$ctrl.phoneNumber}}">
+        <vn-icon
+            flat
+            round
+            icon="phone"
+            title="MicroSIP"
+            ng-click="$event.stopPropagation();"
+        >
+        </vn-icon>
+    </a>
+</span>
+<span ng-if="!$ctrl.phoneNumber">-</span>

front/core/components/link-phone/index.js

@@ -0,0 +1,15 @@
+import ngModule from '../../module';
+import './style.scss';
+class Controller {
+    constructor() {
+        this.phoneNumber = null;
+    }
+}
+
+ngModule.vnComponent('vnLinkPhone', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        phoneNumber: '<',
+    }
+});

front/core/components/link-phone/style.scss

@@ -0,0 +1,7 @@
+vn-link-phone {
+    vn-icon {
+    font-size: 1.1em;
+    vertical-align: bottom;
+}
+}
+

modules/client/front/summary/index.html

@@ -45,11 +45,18 @@
             <vn-label-value label="Contact"
                 value="{{$ctrl.summary.contact}}">
             </vn-label-value>
-            <vn-label-value label="Phone"
+            <vn-label-value label="Phone">
-                value="{{$ctrl.summary.phone}}">
+                
+                <vn-link-phone
+                phone-number="$ctrl.summary.phone"
+                ></vn-link-phone>
+                
             </vn-label-value>
-            <vn-label-value label="Mobile"
+            <vn-label-value label="Mobile">
-                value="{{$ctrl.summary.mobile}}">
+                
+                <vn-link-phone
+                phone-number="$ctrl.summary.mobile"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Email" no-ellipsize
                 value="{{$ctrl.listEmails($ctrl.summary.email)}}">

modules/item/back/models/item-shelving.json

@@ -47,6 +47,11 @@
 			"type": "belongsTo",
 			"model": "VnUser",
 			"foreignKey": "userFk"
+		},
+		"shelving": {
+			"type": "belongsTo",
+			"model": "Shelving",
+			"foreignKey": "shelvingFk"
 		}
 	}
 }

modules/order/front/summary/index.html

@@ -48,8 +48,10 @@
             <vn-label-value label="Landed" 
                 value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
-            <vn-label-value label="Phone" 
+            <vn-label-value label="Phone">
-            value="{{$ctrl.summary.address.phone}}">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.address.phone"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Created from" 
                 value="{{$ctrl.summary.sourceApp}}">

modules/route/front/roadmap/summary/index.html

@@ -25,7 +25,10 @@
         <vn-one>
             <vn-label-value
                 label="Phone"
-                value="{{summary.phone}}">
+            >
+                <vn-link-phone
+                phone-number="summary.phone"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value
                 label="Worker"

modules/route/front/roadmap/summary/style.scss

@@ -1,10 +1,9 @@
 @import "variables";
 
 vn-roadmap-summary .summary {
-    a {
+    a:not(vn-link-phone a) {
         display: flex;
         align-items: center;
         height: 18.328px;
     }
-
 }

modules/ticket/back/models/ticket-collection.json

@@ -10,6 +10,9 @@
         "id": {
             "id": true,
             "type": "number"
+        },
+        "usedShelves": {
+            "type": "number"
         }
     },
     "relations": {

modules/ticket/front/summary/index.html

@@ -83,19 +83,29 @@
             </vn-label-value>
             <vn-label-value label="Address phone"
                 ng-if="$ctrl.summary.address.phone != null"
-                value="{{$ctrl.summary.address.phone}}">
+               >
+               <vn-link-phone
+                    phone-number="$ctrl.summary.address.phone"
+               ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Address mobile"
                 ng-if="$ctrl.summary.address.mobile != null"
-                value="{{$ctrl.summary.address.mobile}}">
+            >
+                <vn-link-phone
+                    phone-number="$ctrl.summary.address.mobile"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Client phone"
-                ng-if="$ctrl.summary.client.phone != null"
+                ng-if="$ctrl.summary.client.phone != null">
-                value="{{$ctrl.summary.client.phone}}">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.client.phone"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Client mobile"
-                ng-if="$ctrl.summary.client.mobile != null"
+                ng-if="$ctrl.summary.client.mobile != null">
-                value="{{$ctrl.summary.client.mobile}}">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.client.mobile"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Address" no-ellipsize
                 value="{{$ctrl.formattedAddress}}">

modules/ticket/front/summary/style.scss

@@ -47,4 +47,9 @@ vn-ticket-summary .summary {
             }
         }
     }
+    
+    vn-icon.tel {
+        font-size: 1.1em;
+        vertical-align: bottom;
+    }
 }

modules/worker/back/models/worker.json

@@ -47,6 +47,9 @@
         },
         "locker": {
             "type" : "number"
+        },
+        "isF11Allowed": {
+            "type" : "boolean"
         }
     },
     "relations": {

modules/worker/front/descriptor/index.html

@@ -28,11 +28,17 @@
             </vn-label-value>
             <vn-label-value
                 label="Phone"
-                value="{{$ctrl.worker.phone}}">
+            >
+                <vn-link-phone
+                    phone-number="$ctrl.worker.phone"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value
                 label="Extension"
-                value="{{$ctrl.worker.sip.extension}}">
+            > 
+                <vn-link-phone
+                    phone-number="$ctrl.worker.sip.extension"
+                ></vn-link-phone>
             </vn-label-value>
         </div>
         <div class="icons">

modules/worker/front/descriptor/index.js

@@ -1,6 +1,5 @@
 import ngModule from '../module';
 import Descriptor from 'salix/components/descriptor';
-
 class Controller extends Descriptor {
     constructor($element, $, $rootScope) {
         super($element, $);

modules/worker/front/summary/index.html

@@ -42,14 +42,21 @@
                     {{::worker.boss.name}}
                 </span>
             </vn-label-value>
-            <vn-label-value label="Mobile extension"
+            <vn-label-value label="Mobile extension">
-                value="{{worker.mobileExtension}}">
+                <vn-link-phone
+                    phone-number="worker.mobileExtension"
+                ></vn-link-phone>
             </vn-label-value>
-            <vn-label-value label="Business phone"
+            <vn-label-value label="Business phone">
-                value="{{worker.phone}}">
+                <vn-link-phone
+                    phone-number="worker.phone"
+                ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Personal phone"
-            value="{{worker.client.phone}}">
+            >
+            <vn-link-phone
+                phone-number="worker.client.phone"
+            ></vn-link-phone>
             </vn-label-value>
             <vn-label-value label="Locker"
             value="{{worker.locker}}">

modules/worker/front/summary/index.js

@@ -1,6 +1,5 @@
 import ngModule from '../module';
 import Summary from 'salix/components/summary';
-
 class Controller extends Summary {
     get worker() {
         return this._worker;