verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

#255 Download invoice PDF bug fixed

This commit is contained in:
Juan Ferrer 2019-01-15 12:04:34 +01:00
parent be5a8803ec
commit 48f11f942e
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
loopback/locale/en.json
View File

@ -25,5 +25,6 @@
"NO_AGENCY_AVAILABLE": "NO_AGENCY_AVAILABLE", "NO_AGENCY_AVAILABLE": "NO_AGENCY_AVAILABLE",
"Warehouse cannot be blank": "Warehouse cannot be blank", "Warehouse cannot be blank": "Warehouse cannot be blank",
"Agency cannot be blank": "Agency 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"
} }

18
modules/client/back/models/receipt.json
View File

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

6
modules/client/front/risk/index/index.html
View File

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

3
modules/client/front/risk/index/locale/es.yml
View File

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