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

#5914 - hotFix-transferInvoice #1893

Merged
alexm merged 17 commits from 5914-hotFix-transferInvoice into test 2024-01-04 07:13:01 +00:00
Conversation 0 Commits 17 Files Changed 33 +50 -37
9 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e3a7e5f91 - Show all commits

7
db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `cplusInvoiceTyoeFk`;
ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrectionType_Fk33`;
ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrection_ibfk_1`;
ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `siiTypeInvoiceOut_FK` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `vn`.`siiTypeInvoiceOut`(id) ON UPDATE CASCADE;
ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `invoiceCorrectionType_FK` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `vn`.`invoiceCorrectionType`(id) ON UPDATE CASCADE;
ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `cplusRectificationType_FK` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType`(id) ON UPDATE CASCADE;

0
db/changes/235001/00-getTaxBases.sql → db/changes/240001/00-getTaxBases.sql
View File

2
db/changes/235001/01-newHasAnyPositiveBase.sql → db/changes/240001/01-newHasAnyPositiveBase.sql
View File

@ -14,7 +14,7 @@ BEGIN
CALL getTaxBases(); CALL getTaxBases();
SELECT positive > 0 INTO hasAnyPositiveBase SELECT positive INTO hasAnyPositiveBase
FROM tmp.taxBases; FROM tmp.taxBases;
DROP TEMPORARY TABLE DROP TEMPORARY TABLE

2
db/changes/235001/01-refactorHasAnyNegativeBase.sql → db/changes/240001/01-refactorHasAnyNegativeBase.sql
View File

@ -14,7 +14,7 @@ BEGIN
CALL getTaxBases(); CALL getTaxBases();
SELECT negative > 0 INTO hasAnyNegativeBase SELECT negative INTO hasAnyNegativeBase
FROM tmp.taxBases; FROM tmp.taxBases;
DROP TEMPORARY TABLE DROP TEMPORARY TABLE

27
modules/invoiceOut/back/models/invoice-correction.json
View File

@ -26,6 +26,33 @@
"invoiceCorrectionTypeFk": { "invoiceCorrectionTypeFk": {
"type": "number", "type": "number",
"required": true "required": true
},
"relations": {
"correcting": {
"type": "belongsTo",
"model": "InvoiceOut",
"foreignKey": "correctingFk"
},
"corrected": {
"type": "belongsTo",
"model": "InvoiceOut",
"foreignKey": "correctedFk"
},
"cplusRectificationType": {
"type": "belongsTo",
"model": "cplusRectificationType",
"foreignKey": "cplusRectificationTypeFk"
},
"siiTypeInvoiceOut": {
"type": "belongsTo",
"model": "siiTypeInvoiceOut",
"foreignKey": "siiTypeInvoiceOutFk"
},
"invoiceCorrectionType": {
"type": "belongsTo",
"model": "invoiceCorrectionType",
"foreignKey": "invoiceCorrectionTypeFk"
}
} }
} }
} }

7
modules/ticket/back/methods/ticket/canBeInvoiced.js
View File

@ -17,11 +17,6 @@ module.exports = function(Self) {
type: 'boolean' type: 'boolean'
} }
], ],
returns: {
arg: 'data',
type: 'boolean',
root: true
},
http: { http: {
path: `/canBeInvoiced`, path: `/canBeInvoiced`,
verb: 'get' verb: 'get'
@ -63,7 +58,5 @@ module.exports = function(Self) {
if (ticketsIds.length == 1 && priceZero) if (ticketsIds.length == 1 && priceZero)
throw new UserError(`A ticket with an amount of zero can't be invoiced`); throw new UserError(`A ticket with an amount of zero can't be invoiced`);
}); });
return true;
}; };
}; };

19
modules/ticket/back/methods/ticket/invoiceTickets.js
View File

@ -61,20 +61,19 @@ module.exports = function(Self) {
if (!isSameClient) if (!isSameClient)
throw new UserError(`You can't invoice tickets from multiple clients`); throw new UserError(`You can't invoice tickets from multiple clients`);
const client = await models.Client.findById(clientId, { const {hasToInvoiceByAddress} = await models.Client.findById(clientId, {
fields: ['id', 'hasToInvoiceByAddress'] fields: ['hasToInvoiceByAddress']
}, myOptions); }, myOptions);
let ticketsByAddress = {[firstTicket.addressFk]: ticketsIds}; let ticketsByAddress = hasToInvoiceByAddress
if (client.hasToInvoiceByAddress) { ? Object.values(tickets.reduce((group, {id, addressFk}) => {
ticketsByAddress = tickets.reduce((group, ticket) => {
const {addressFk} = ticket;
group[addressFk] = group[addressFk] ?? []; group[addressFk] = group[addressFk] ?? [];
alexm marked this conversation as resolved
jsegarra commented 2023-12-19 13:05:47 +00:00
Review
Copy Link

Todo esto es para hacer un Set de los Ids de tickets?
Porque más abajo haces object.values entonces las keys(addressFk) te dan igual, correcto?

Todo esto es para hacer un Set de los Ids de tickets? Porque más abajo haces object.values entonces las keys(addressFk) te dan igual, correcto?
group[addressFk].push(ticket.id); group[addressFk].push(id);
return group; return group;
}, {}); }, {}))
} : [[ticketsIds]];
for (const ticketIds of Object.values(ticketsByAddress))
for (const ticketIds of ticketsByAddress)
invoicesIds.push(await createInvoice(ctx, companyId, ticketIds, invoiceCorrection, myOptions)); invoicesIds.push(await createInvoice(ctx, companyId, ticketIds, invoiceCorrection, myOptions));
if (tx) await tx.commit(); if (tx) await tx.commit();

3
modules/ticket/back/methods/ticket/makeInvoice.js
View File

@ -106,8 +106,7 @@ module.exports = function(Self) {
); );
} }
if (resultInvoice.id) await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();

20
modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
View File

@ -27,10 +27,7 @@ describe('ticket canBeInvoiced()', () => {
WHERE id IN (?) WHERE id IN (?)
`, [ticketId], options); `, [ticketId], options);
const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options); await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
alexm marked this conversation as resolved
jgallego commented 2024-01-03 06:13:16 +00:00
Review
Copy Link

no hi ha cap test a de canBeInvoiced amb el 3 parametro a true

no hi ha cap test a de canBeInvoiced amb el 3 parametro a true
expect(canBeInvoiced).toEqual(false);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
error = e; error = e;
@ -59,10 +56,7 @@ describe('ticket canBeInvoiced()', () => {
WHERE id IN (?) WHERE id IN (?)
`, [ticketId], options); `, [ticketId], options);
const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options); await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
expect(canBeInvoiced).toEqual(false);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
error = e; error = e;
@ -95,10 +89,7 @@ describe('ticket canBeInvoiced()', () => {
WHERE id IN (?) WHERE id IN (?)
`, [ticketId], options); `, [ticketId], options);
const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options); await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
expect(canBeInvoiced).toEqual(false);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
error = e; error = e;
@ -123,10 +114,7 @@ describe('ticket canBeInvoiced()', () => {
WHERE id IN (?) WHERE id IN (?)
`, [ticketId], options); `, [ticketId], options);
const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options); await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
expect(canBeInvoiced).toEqual(true);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
await tx.rollback(); await tx.rollback();