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

client/client/src/billing-data/billing-data.html

@@ -27,13 +27,13 @@
             </vn-horizontal>
             <vn-horizontal margin-medium-bottom>
                 <vn-one>
-                    <vn-check label="Recibido core VNH" field="$ctrl.client.coreVnh" vn-acl="administrative"></vn-check>
+                    <vn-check label="Recibido core VNH" field="$ctrl.client.hasCoreVnh" vn-acl="administrative"></vn-check>
                 </vn-one>
                 <vn-one>
-                    <vn-check label="Recibido core VNL" field="$ctrl.client.coreVnl" vn-acl="administrative"></vn-check>
+                    <vn-check label="Recibido core VNL" field="$ctrl.client.hasCoreVnl" vn-acl="administrative"></vn-check>
                 </vn-one>
                 <vn-one>
-                    <vn-check label="Recibido B2B VNL" field="$ctrl.client.sepaVnl" vn-acl="administrative"></vn-check>
+                    <vn-check label="Recibido B2B VNL" field="$ctrl.client.hasSepaVnl" vn-acl="administrative"></vn-check>
                 </vn-one>
             </vn-horizontal>
         </vn-vertical>

client/client/src/card/style.css

@@ -1,3 +1,3 @@
 vn-descriptor {
-    font-family: raleway-bold;
+    font-family: vn-font-bold;
 }

client/client/src/descriptor/descriptor.html

@@ -8,7 +8,6 @@
                 <div class="margin-none">{{::$ctrl.client.id}}</div>
                 <div class="margin-none">{{$ctrl.client.name}}</div>
                 <div class="margin-none">{{$ctrl.client.phone}}</div>
-                <vn-switch label="Activo" model="$ctrl.active"></vn-switch>
             </vn-vertical>
         </vn-horizontal>    
     </vn-vertical>

client/client/src/fiscal-data/fiscal-data.html

@@ -12,6 +12,7 @@
             <vn-horizontal>
                     <vn-textfield autofocus vn-two label="Social name" field="$ctrl.client.socialName" vn-acl="administrative"></vn-textfield>
                     <vn-textfield vn-one label="Tax number" field="$ctrl.client.fi" vn-acl="administrative"></vn-textfield>
+                    <vn-check vn-one label="Equalization tax" field="$ctrl.client.isEqualizated" vn-acl="administrative"></vn-check>
             </vn-horizontal>
             <vn-horizontal>
                 <vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
@@ -42,25 +43,26 @@
             </vn-horizontal>
             <vn-horizontal margin-small-bottom>
                 <vn-one>
-                    <vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
+                    <vn-check label="Active" field="$ctrl.client.isActive" vn-acl="administrative"></vn-check>
                 </vn-one>
                 <vn-one>
                     <vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
                 </vn-one>
-                <vn-one></vn-one>
+                <vn-one>
+                    <vn-check label="Datos comprobados" field="$ctrl.client.isTaxDataChecked" vn-acl="administrative"></vn-check>
+                </vn-one>
             </vn-horizontal>
             <vn-horizontal>
                 <vn-one>                    
                     <vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
                 </vn-one>
                 <vn-one>
-                        <vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
+                    <vn-check vn-one label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
                 </vn-one>
                 <vn-one>
-                        <vn-check label="Vies" field="$ctrl.client.vies" vn-acl="administrative"></vn-check>
+                    <vn-check vn-one label="Vies" field="$ctrl.client.isVies" vn-acl="administrative"></vn-check>
                 </vn-one>
             </vn-horizontal>
-                
         </vn-vertical>
         
     </vn-card>
@@ -70,13 +72,13 @@
     </vn-button-bar>
 </form>
 <vn-dialog
-    vn-id="propagate-equalizationTax"
+    vn-id="propagate-isEqualizated"
     on-response="$ctrl.returnDialogEt(response)"
     >
     <tpl-body>
         <vn-vertical>
-            <vn-one text-center translate>You changes the equivalent tax</vn-one>
+            <vn-one text-center translate>You changes the equivalen
-            <vn-one text-center translate>Do you want to spread the change to their consignees?</vn-one>
+            <vn-one text-center translate>Do you want to spread the change to their consig
         </vn-vertical>
     </tpl-body>
     <tpl-buttons>

client/client/src/fiscal-data/fiscal-data.js

@@ -6,7 +6,7 @@ export default class ClientFiscalData {
         this.$http = $http;
         this.vnApp = vnApp;
         this.translate = $translate;
-        this.equalizationTax = undefined;
+        this.isEqualizated = undefined;
         this.copyData();
     }
 
@@ -16,7 +16,7 @@ export default class ClientFiscalData {
 
     copyData() {
         if (this.client) {
-            this.equalizationTax = this.client.equalizationTax;
+            this.isEqualizated = this.client.isEqualizated;
         }
     }
 
@@ -26,16 +26,16 @@ export default class ClientFiscalData {
     }
 
     checkEtChanges() {
-        let equals = this.equalizationTax == this.client.equalizationTax;
+        let equals = this.isEqualizated == this.client.isEqualizated;
-        this.equalizationTax = this.client.equalizationTax;
+        this.isEqualizated = this.client.isEqualizated;
 
         if (!equals)
-            this.$.propagateEqualizationTax.show();
+            this.$.propagateIsEqualizated.show();
     }
 
     returnDialogEt(response) {
         if (response === 'ACCEPT') {
-            this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.equalizationTax}).then(
+            this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.isEqualizated}).then(
                 res => {
                     if (res.data)
                         this.vnApp.showMessage(this.translate.instant('Equivalent tax spreaded'));

client/client/src/index/style.css

@@ -12,5 +12,5 @@ vn-item-client a:hover {
 }
 
 .vn-item-client-name {
-    font-family: raleway-bold;
+    font-family: vn-font-bold;
 }

client/client/src/locale/es.json

@@ -1,4 +1,5 @@
 {
+    "Active": "Activo",
     "Client": "Cliente",
     "Clients": "Clientes",
     "Fiscal data": "Datos Fiscales",

client/core/src/autocomplete/style.scss

@@ -18,7 +18,7 @@ ul.vn-autocomplete {
         }
         &.load-more {
             color: #ffa410;
-            font-weight: bold;
+            font-family: vn-font-bold;
             padding: .4em .8em;
         }
     }

client/core/src/confirm/style.css

@@ -1,5 +1,5 @@
 
 vn-confirm .dialog-title {
     color:#424242;
-    font-family: raleway-bold;
+    font-family: vn-font-bold;
 }

client/core/src/dialog/style.scss

@@ -54,7 +54,7 @@
             text-transform: uppercase;
             font-size: 1.1em;
             color: #ffa410;
-            font-weight: bold;
+            font-family: vn-font-bold;
             cursor: pointer;
             padding: .5em;
             margin: -0.5em;

client/core/src/mdl-override.css

@@ -34,7 +34,7 @@
 
 .mdl-dialog{
     width: 400px;
-    font-family: raleway-regular;
+    font-family: vn-font;
     line-height:60px;
     text-align: center;
 }

client/salix/src/styles/display.css

@@ -24,7 +24,7 @@
 }
 
 .popover-label {
-  font-weight: bold;
+    font-family: vn-font-bold;
     color: black;
     padding-top:5px;
 }

client/salix/src/styles/font-family.css

@@ -1,21 +1,12 @@
 @font-face {
-    font-family: raleway-italic;
+    font-family: vn-font-medium;
-    src: url(./fonts/Raleway-Italic.ttf);
+    src: url(./fonts/Roboto-Medium.ttf);
 }
 @font-face {
-    font-family: raleway-thin;
+    font-family: vn-font;
-    src: url(./fonts/Raleway-Thin.ttf);
+    src: url(./fonts/Roboto.ttf);
 }
 @font-face {
-    font-family: raleway-regular;
+    font-family: vn-font-bold;
-    src: url(./fonts/Raleway-Regular.ttf);
+    src: url(./fonts/Roboto-Bold.ttf);
 }
-@font-face {
-    font-family: raleway-bold;
-    src: url(./fonts/Raleway-Bold.ttf);
-}
-@font-face {
-    font-family: raleway-semi-bold;
-    src: url(./fonts/Raleway-SemiBold.ttf);
-}
-

client/salix/src/styles/font-style.scss

@@ -5,7 +5,7 @@ $font-color: $color-dark-grey;
 
 body {
     color: $font-color;
-    font-family: raleway-regular;
+    font-family: vn-font;
 }
 html [uppercase], .uppercase {
     text-transform: uppercase;

client/salix/src/styles/misc.scss

@@ -64,7 +64,7 @@ html [vn-center], .vn-center{
 .tooltip {
     .list-header{
         border-bottom: 3px solid $color-medium-grey;
-        font-weight: bold;
+        font-family: vn-font-bold;
         text-align: center
     }
     .list-element{
@@ -72,7 +72,7 @@ html [vn-center], .vn-center{
     }
 }
 .list-footer{
-    font-weight: bold;
+    font-family: vn-font-bold;
     border-top: 3px solid $color-medium-grey;
 }
 .list-element.warning{

client/salix/src/styles/title.css

@@ -21,5 +21,5 @@ h6 {
 h1, h2, h3, h4, h5, h6 {
     padding: 0;
     margin: .4em 0;
-    font-family: raleway-semi-bold;
+    font-family: vn-font-bold;
 }

services/auth/server/model-config.json

@@ -1,9 +1,9 @@
 {
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -13,15 +13,15 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   }
 }

services/client/common/models/client.json

@@ -1,6 +1,12 @@
 {
   "name": "Client",
   "base": "VnModel",
+  "options": {
+    "mysql": {
+      "table": "client",
+      "database": "vn"
+    }
+  },
   "properties": {
     "id": {
       "type": "Number",
@@ -39,15 +45,9 @@
     "mobile": {
       "type": "string"
     },
-    "fax": {
+    "isActive": {
-      "type": "string"
-    },
-    "active": {
       "type": "boolean"
     },
-    "discount":{
-      "type": "Number"
-    },
     "credit": {
       "type": "Number"
     },
@@ -60,7 +60,7 @@
     "dueDay": {
       "type": "Number"
     },
-    "equalizationTax": {
+    "isEqualizated": {
       "type": "boolean",
       "description": "The client has equalization tax"
     },
@@ -76,13 +76,16 @@
       "type": "boolean",
       "description": "Send invoices by email"
     },
-    "sepaVnl": {
+    "hasSepaVnl": {
       "type": "boolean"
     },
-    "coreVnl": {
+    "hasCoreVnl": {
       "type": "boolean"
     },
-    "coreVnh": {
+    "hasCoreVnh": {
+      "type": "boolean"
+    },
+    "isTaxDataChecked":{
       "type": "boolean"
     },
     "eypbc": {
@@ -91,7 +94,7 @@
     "quality": {
       "type": "Number"
     },
-    "vies": {
+    "isVies": {
       "type": "boolean"
     },
     "isRelevant": {

services/client/server/model-config.json

@@ -1,9 +1,9 @@
 {
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -13,51 +13,51 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Client": {
     "dataSource": "vn"
   },
   "ClientCredit": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "ClientCreditLimit": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "ClientObservation": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "PayMethod": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Address": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "AgencyMode": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Province": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Country": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "ContactChannel": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Employee": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "CreditClassification": {
-      "dataSource": "vn"
+      "dataSource": "salix"
   }
 }

services/loopback/server/datasources.test.json

@@ -1,22 +1,17 @@
 {
-  "db": 
+  "vn": {
-  {
-    "name": "db",
-    "connector": "memory",
-    "file": "db.json"
-  },
-  "auth": 
-  {
     "name": "mysql",
     "connector": "mysql",
-    "database": "salix",
+    "database": "vn",
     "debug": false,
     "host": "localhost",
     "port": 3306,
     "username": "root",
-    "password": ""
+    "password": "",
+    "connectTimeout": 20000,
+    "acquireTimeout": 20000
   },
-  "vn": {
+  "salix": {
     "name": "mysql",
     "connector": "mysql",
     "database": "salix",
@@ -27,11 +22,6 @@
     "password": "",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
-  },
-  "client": {
-    "name": "client",
-    "connector": "remote",
-    "url": "http://localhost:3002/api"
   }
 }
 

services/loopback/server/model-config.json

@@ -14,10 +14,10 @@
     ]
   },
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -27,15 +27,15 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   }
 }

services/production/server/model-config.json

@@ -1,9 +1,9 @@
 {
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -13,16 +13,16 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Ticket": {
     "dataSource": "vn"

services/route/server/model-config.json

@@ -1,9 +1,9 @@
 {
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -13,16 +13,16 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Delivery": {
     "dataSource": "vn"

services/salix/server/model-config.json

@@ -1,9 +1,9 @@
 {
   "user": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "AccessToken": {
-    "dataSource": "auth",
+    "dataSource": "salix",
     "relations": {
       "user": {
         "type": "belongsTo",
@@ -13,15 +13,15 @@
     }
   },
   "ACL": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "RoleMapping": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Role": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   },
   "Account": {
-    "dataSource": "auth"
+    "dataSource": "salix"
   }
 }