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

e2e/paths/ticket-module/13_create_ticket_services.spec.js

@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';
 
-describe('Ticket services path', () => {
+xdescribe('Ticket services path', () => {
     const nightmare = createNightmare();
 
     beforeAll(() => {

front/core/components/input-range/index.js

@@ -11,7 +11,7 @@ export default class inputRange extends Input {
             this._value = this.input.value;
             this.$.$applyAsync();
             if (this._value && this.onChange)
-                this.onChange();
+                this.emit('change', {value: this._value});
         });
     }
 

loopback/locale/en.json

@@ -25,5 +25,6 @@
 	"NO_AGENCY_AVAILABLE": "NO_AGENCY_AVAILABLE",
 	"Warehouse cannot be blank": "Warehouse cannot be blank",
 	"Agency cannot be blank": "Agency cannot be blank",
-	"The IBAN does not have the correct format": "The IBAN does not have the correct format"
+	"The IBAN does not have the correct format": "The IBAN does not have the correct format",
+	"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows"
 }

modules/claim/front/action/index.html

@@ -35,7 +35,7 @@
                         min="1"
                         step="1"
                         vn-acl="salesAssistant"
-                        on-change="$ctrl.saveResponsibility()">
+                        on-change="$ctrl.saveResponsibility(value)">
                     </vn-input-range>
                 </vn-tool-bar>
             </vn-horizontal>

modules/claim/front/action/index.js

@@ -146,10 +146,10 @@ class Controller {
         this.$.descriptor.show();
     }
 
-    saveResponsibility() {
+    saveResponsibility(value) {
         let query = `/claim/api/Claims/updateClaim`;
 
-        this.$http.post(query, {responsibility: this.claim.responsibility}).then(res => {
+        this.$http.post(query, {responsibility: value}).then(() => {
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
     }

modules/claim/front/summary/index.html

@@ -30,6 +30,7 @@
                 <vn-one>
                     <vn-input-range
                         vn-one 
+                        disabled="true"
                         label="Responsability"
                         value="$ctrl.summary.claim.responsibility"
                         max="5"

modules/client/back/methods/invoice-out/download.js

@@ -54,6 +54,6 @@ module.exports = Self => {
 
         await fs.access(file.path);
         let stream = fs.createReadStream(file.path);
-        return [stream, file.contentType, `attachment; filename="${file.name}"`];
+        return [stream, file.contentType, `filename="${file.name}"`];
     };
 };

modules/client/back/models/receipt.json

@@ -2,15 +2,15 @@
   "name": "Receipt",
   "base": "VnModel",
   "options": {
-      "mysql": {
+        "mysql": {
-          "table": "receipt"
+            "table": "receipt"
-      }
+        }
     },
     "properties": {
-    "id": {
+        "id": {
-        "id": true,
+            "id": true,
-        "type": "Number",
+            "type": "Number",
-        "description": "Identifier"
+            "description": "Identifier"
         },
         "amountPaid": {
             "type": "Number"
@@ -48,11 +48,11 @@
             "type": "belongsTo",
             "model": "Bank",
             "foreignKey": "bankFk"
-            },
+        },
         "invoice": {
             "type": "belongsTo",
             "model": "InvoiceOut",
             "foreignKey": "invoiceFk"
-            }
+        }
     }
 }

modules/client/front/risk/index/index.html

@@ -61,7 +61,9 @@
                         <vn-td>{{::risk.payed | dateTime:'dd/MM/yyyy'}}</vn-td>
                         <vn-td>{{::risk.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
                         <vn-td>{{::risk.firstName}} {{::risk.name}}</vn-td>
-                        <vn-td>{{::risk.ref ? 'N/FRA ' + risk.ref : ''}}</vn-td>
+                        <vn-td>
+                            <span ng-show="risk.ref" translate>BILL</span> {{::risk.ref}}
+                        </vn-td>
                         <vn-td number>{{::risk.bankFk}}</vn-td>
                         <vn-td number>{{::risk.debit | currency:'€':2}}</vn-td>
                         <vn-td number>{{::risk.credit | currency:'€':2}}</vn-td>
@@ -74,7 +76,8 @@
                         </vn-td>
                         <vn-td center>
                             <a ng-show="risk.pdf"
-                                href="api/InvoiceOuts/{{::risk.ref}}/download?access_token={{::$ctrl.accessToken}}">
+                                target="_blank"
+                                href="api/InvoiceOuts/{{::risk.id}}/download?access_token={{::$ctrl.accessToken}}">
                                 <vn-icon-button
                                     icon="cloud_download"
                                     title="Download PDF">

modules/client/front/risk/index/locale/es.yml

@@ -7,4 +7,5 @@ New payment: Añadir pago
 Havings: Haber
 Balance: Balance
 Total by company: Total por empresa
-Download PDF: Descargar PDF
+Download PDF: Descargar PDF
+BILL: N/FRA

modules/ticket/front/routes.json

@@ -232,7 +232,6 @@
         {"state": "ticket.card.volume", "icon": "icon-volume"},
         {"state": "ticket.card.expedition", "icon": "icon-package"},
         {"state": "ticket.card.package.index", "icon": "icon-bucket"},
-        {"state": "ticket.card.service", "icon": "icon-services"},
         {"state": "ticket.card.tracking.index", "icon": "remove_red_eye"},
         {"state": "ticket.card.saleChecked", "icon": "assignment"},
         {"state": "ticket.card.components", "icon": "icon-components"},