verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

fixes #5074 ticket balance pone null #1308

Merged
alexandre merged 4 commits from 5074-ticket-balance-null into dev 2023-02-06 09:02:44 +00:00
Conversation 0 Commits 4 Files Changed 2 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/client/front/balance/create/index.js
View File

@ -59,11 +59,14 @@ class Controller extends Dialog {
if (value) { if (value) {
const accountingType = value.accountingType; const accountingType = value.accountingType;
if (accountingType.receiptDescription != null) {
this.receipt.description = accountingType.receiptDescription; this.receipt.description = [];
if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`; if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
} else if (this.originalDescription) this.receipt.description.push(accountingType.receiptDescription);
this.receipt.description = this.originalDescription; if (this.originalDescription)
this.receipt.description.push(this.originalDescription);
this.receipt.description.join(', ');
this.maxAmount = accountingType && accountingType.maxAmount; this.maxAmount = accountingType && accountingType.maxAmount;
this.receipt.payed = Date.vnNew(); this.receipt.payed = Date.vnNew();

2
modules/client/front/balance/create/index.spec.js
View File

@ -38,7 +38,7 @@ describe('Client', () => {
} }
}; };
expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2'); expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
}); });
}); });