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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +8 -1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5489a5edbc - Show all commits

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

@ -33,7 +33,6 @@ class Controller extends Dialog {
} }
}; };
this.getAmountPaid();
this.$http.get(`Clients/findOne`, {filter}) this.$http.get(`Clients/findOne`, {filter})
.then(res => { .then(res => {
this.receipt.email = res.data.email; this.receipt.email = res.data.email;
@ -52,6 +51,7 @@ class Controller extends Dialog {
set companyFk(value) { set companyFk(value) {
this.receipt.companyFk = value; this.receipt.companyFk = value;
this.getAmountPaid();
} }
set description(value) { set description(value) {

7
modules/entry/back/methods/entry/print.js
View File

@ -53,6 +53,13 @@ module.exports = Self => {
} }
if (!merger._doc) throw new UserError('The entry not have stickers'); if (!merger._doc) throw new UserError('The entry not have stickers');
await Self.rawSql(`
UPDATE buy
SET printedStickers = stickers
WHERE entryFk = ?
`, [id], myOptions);
return [await merger.saveAsBuffer(), 'application/pdf', `filename="entry-${id}.pdf"`]; return [await merger.saveAsBuffer(), 'application/pdf', `filename="entry-${id}.pdf"`];
}; };
}; };