2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
faab039022
commit
531937ebbc
|
@ -2,3 +2,6 @@ DELETE FROM `salix`.`ACL` WHERE id = 189;
|
||||||
DELETE FROM `salix`.`ACL` WHERE id = 188;
|
DELETE FROM `salix`.`ACL` WHERE id = 188;
|
||||||
UPDATE `salix`.`ACL` tdms SET tdms.accessType = '*'
|
UPDATE `salix`.`ACL` tdms SET tdms.accessType = '*'
|
||||||
WHERE tdms.id = 165;
|
WHERE tdms.id = 165;
|
||||||
|
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES ('InvoiceOut', 'createManualInvoice', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
drop procedure `vn`.`invoiceFromClient`;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
$$
|
||||||
|
create
|
||||||
|
definer = root@`%` procedure `vn`.`invoiceFromClient`(IN vMaxTicketDate datetime, IN vClientFk INT, IN vCompanyFk INT)
|
||||||
|
BEGIN
|
||||||
|
DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, CURDATE());
|
||||||
|
SET vMaxTicketDate = util.dayend(vMaxTicketDate);
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
|
||||||
|
CREATE TEMPORARY TABLE `ticketToInvoice`
|
||||||
|
(PRIMARY KEY (`id`))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT id FROM ticket t
|
||||||
|
WHERE t.clientFk = vClientFk
|
||||||
|
AND t.refFk IS NULL
|
||||||
|
AND t.companyFk = vCompanyFk
|
||||||
|
AND (t.shipped BETWEEN vMinTicketDate AND vMaxTicketDate);
|
||||||
|
END;;$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,45 @@
|
||||||
|
drop procedure `vn`.`invoiceOut_newFromClient`;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
$$
|
||||||
|
create
|
||||||
|
definer = root@`%` procedure `vn`.`invoiceOut_newFromClient`(IN vClientFk int, IN vSerial char(2), IN vMaxShipped date,
|
||||||
|
IN vCompanyFk int, IN vTaxArea varchar(25),
|
||||||
|
IN vRef varchar(25), OUT vInvoiceId int)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Factura los tickets de un cliente hasta una fecha dada
|
||||||
|
* @param vClientFk Id del cliente a facturar
|
||||||
|
* @param vSerial Serie de factura
|
||||||
|
* @param vMaxShipped Fecha hasta la cual cogera tickets para facturar
|
||||||
|
* @param vCompanyFk Id de la empresa desde la que se factura
|
||||||
|
* @param vTaxArea Tipo de iva en relacion a la empresa y al cliente, NULL por defecto
|
||||||
|
* @param vRef Referencia de la factura en caso que se quiera forzar, NULL por defecto
|
||||||
|
* @return vInvoiceId factura
|
||||||
|
*/
|
||||||
|
|
||||||
|
DECLARE vIsRefEditable BOOLEAN;
|
||||||
|
|
||||||
|
IF vRef IS NOT NULL THEN
|
||||||
|
SELECT isRefEditable INTO vIsRefEditable
|
||||||
|
FROM invoiceOutSerial
|
||||||
|
WHERE code = vSerial;
|
||||||
|
|
||||||
|
IF NOT vIsRefEditable THEN
|
||||||
|
CALL util.throw('serial non editable');
|
||||||
|
END IF;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
CALL invoiceFromClient(vMaxShipped, vClientFk, vCompanyFk);
|
||||||
|
CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
|
||||||
|
|
||||||
|
UPDATE invoiceOut
|
||||||
|
SET `ref` = vRef
|
||||||
|
WHERE id = vInvoiceId
|
||||||
|
AND vRef IS NOT NULL;
|
||||||
|
|
||||||
|
IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
|
||||||
|
CALL invoiceOutBooking(vInvoiceId);
|
||||||
|
END IF;
|
||||||
|
END;;$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,38 @@
|
||||||
|
drop procedure `vn`.`invoiceOut_newFromTicket`;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
$$
|
||||||
|
create
|
||||||
|
definer = root@`%` procedure `vn`.`invoiceOut_newFromTicket`(IN vTicketFk int, IN vSerial char(2), IN vTaxArea varchar(25),
|
||||||
|
IN vRef varchar(25), OUT vInvoiceId int)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Factura un ticket
|
||||||
|
* @param vTicketFk Id del ticket
|
||||||
|
* @param vSerial Serie de factura
|
||||||
|
* @param vTaxArea Area de la factura en caso de querer forzarlo,
|
||||||
|
* en la mayoria de los casos poner NULL
|
||||||
|
* @return vInvoiceId
|
||||||
|
*/
|
||||||
|
DECLARE vIsRefEditable BOOLEAN;
|
||||||
|
CALL invoiceFromTicket(vTicketFk);
|
||||||
|
CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
|
||||||
|
|
||||||
|
IF vRef IS NOT NULL THEN
|
||||||
|
SELECT isRefEditable INTO vIsRefEditable
|
||||||
|
FROM invoiceOutSerial
|
||||||
|
WHERE code = vSerial;
|
||||||
|
IF NOT vIsRefEditable THEN
|
||||||
|
CALL util.throw('serial non editable');
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
UPDATE invoiceOut
|
||||||
|
SET `ref` = vRef
|
||||||
|
WHERE id = vInvoiceId;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
|
||||||
|
CALL invoiceOutBooking(vInvoiceId);
|
||||||
|
END IF;
|
||||||
|
END;;$$
|
||||||
|
DELIMITER ;
|
|
@ -98,6 +98,6 @@
|
||||||
"Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
|
"Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
|
||||||
"None": "None",
|
"None": "None",
|
||||||
"error densidad = 0": "error densidad = 0",
|
"error densidad = 0": "error densidad = 0",
|
||||||
"nickname": "nickname",
|
"This document already exists on this ticket": "This document already exists on this ticket",
|
||||||
"This document already exists on this ticket": "This document already exists on this ticket"
|
"serial non editable": "This serial doesn't allow to set a reference"
|
||||||
}
|
}
|
|
@ -184,5 +184,13 @@
|
||||||
"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
|
"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
|
||||||
"This document already exists on this ticket": "Este documento ya existe en el ticket",
|
"This document already exists on this ticket": "Este documento ya existe en el ticket",
|
||||||
"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
|
"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
|
||||||
"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes"
|
"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
|
||||||
|
"This client is not invoiceable": "Este cliente no es facturable",
|
||||||
|
"serial non editable": "Esta serie no permite asignar la referencia",
|
||||||
|
"Max shipped required": "La fecha límite es requerida",
|
||||||
|
"Can't invoice to future": "No se puede facturar a futuro",
|
||||||
|
"Can't invoice to past": "No se puede facturar a pasado",
|
||||||
|
"This ticket is already invoiced": "Este ticket ya está facturado",
|
||||||
|
"A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
|
||||||
|
"A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa"
|
||||||
}
|
}
|
|
@ -0,0 +1,188 @@
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.remoteMethodCtx('createManualInvoice', {
|
||||||
|
description: 'Make a manual invoice',
|
||||||
|
accessType: 'WRITE',
|
||||||
|
accepts: [
|
||||||
|
{
|
||||||
|
arg: 'clientFk',
|
||||||
|
type: 'any',
|
||||||
|
description: 'The invoiceable client id'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'ticketFk',
|
||||||
|
type: 'any',
|
||||||
|
description: 'The invoiceable ticket id'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'maxShipped',
|
||||||
|
type: 'date',
|
||||||
|
description: 'The maximum shipped date'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'serial',
|
||||||
|
type: 'string',
|
||||||
|
description: 'The invoice serial'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'taxArea',
|
||||||
|
type: 'string',
|
||||||
|
description: 'The invoice tax area'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'reference',
|
||||||
|
type: 'string',
|
||||||
|
description: 'The invoice reference'
|
||||||
|
}
|
||||||
|
],
|
||||||
|
returns: {
|
||||||
|
type: 'object',
|
||||||
|
root: true
|
||||||
|
},
|
||||||
|
http: {
|
||||||
|
path: '/createManualInvoice',
|
||||||
|
verb: 'POST'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Self.createManualInvoice = async(ctx, options) => {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const args = ctx.args;
|
||||||
|
|
||||||
|
let tx;
|
||||||
|
const myOptions = {};
|
||||||
|
|
||||||
|
if (typeof options == 'object')
|
||||||
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
|
if (!myOptions.transaction) {
|
||||||
|
tx = await Self.beginTransaction({});
|
||||||
|
myOptions.transaction = tx;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ticketId = args.ticketFk;
|
||||||
|
let clientId = args.clientFk;
|
||||||
|
let maxShipped = args.maxShipped;
|
||||||
|
let companyId;
|
||||||
|
let query;
|
||||||
|
try {
|
||||||
|
if (ticketId) {
|
||||||
|
const ticket = await models.Ticket.findById(ticketId, null, myOptions);
|
||||||
|
const company = await models.Company.findById(ticket.companyFk, null, myOptions);
|
||||||
|
|
||||||
|
clientId = ticket.clientFk;
|
||||||
|
maxShipped = ticket.shipped;
|
||||||
|
companyId = ticket.companyFk;
|
||||||
|
|
||||||
|
// Validates invoiced ticket
|
||||||
|
if (ticket.refFk)
|
||||||
|
throw new UserError('This ticket is already invoiced');
|
||||||
|
|
||||||
|
// Validates ticket amount
|
||||||
|
if (ticket.totalWithVat == 0) {
|
||||||
|
// Change state to delivered
|
||||||
|
throw new UserError(`A ticket with an amount of zero can't be invoiced`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validates ticket nagative base
|
||||||
|
const hasNegativeBase = await getNegativeBase(ticketId, myOptions);
|
||||||
|
|
||||||
|
if (hasNegativeBase && company.code == 'VNL')
|
||||||
|
throw new UserError(`A ticket with a negative base can't be invoiced`);
|
||||||
|
} else {
|
||||||
|
if (!maxShipped)
|
||||||
|
throw new UserError(`Max shipped required`);
|
||||||
|
|
||||||
|
const company = await models.Ticket.findOne({
|
||||||
|
fields: ['companyFk'],
|
||||||
|
where: {
|
||||||
|
clientFk: clientId,
|
||||||
|
shipped: {lte: maxShipped}
|
||||||
|
}
|
||||||
|
}, myOptions);
|
||||||
|
companyId = company.companyFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set shipped at night
|
||||||
|
maxShipped.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
|
// Validate invoiceable client
|
||||||
|
const isClientInvoiceable = await isInvoiceable(clientId, myOptions);
|
||||||
|
if (!isClientInvoiceable)
|
||||||
|
throw new UserError(`This client is not invoiceable`);
|
||||||
|
|
||||||
|
// Can't invoice tickets into future
|
||||||
|
const tomorrow = new Date();
|
||||||
|
tomorrow.setDate(tomorrow.getDate() + 1);
|
||||||
|
|
||||||
|
if (maxShipped >= tomorrow)
|
||||||
|
throw new UserError(`Can't invoice to future`);
|
||||||
|
|
||||||
|
const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
|
||||||
|
if (new Date() < maxInvoiceDate)
|
||||||
|
throw new UserError(`Can't invoice to past`);
|
||||||
|
|
||||||
|
if (ticketId) {
|
||||||
|
query = `CALL invoiceOut_newFromTicket(?, ?, ?, ?, @newInvoiceId)`;
|
||||||
|
await Self.rawSql(query, [
|
||||||
|
ticketId,
|
||||||
|
args.serial,
|
||||||
|
args.taxArea,
|
||||||
|
args.reference
|
||||||
|
], myOptions);
|
||||||
|
} else {
|
||||||
|
query = `CALL invoiceOut_newFromClient(?, ?, ?, ?, ?, ?, @newInvoiceId)`;
|
||||||
|
await Self.rawSql(query, [
|
||||||
|
clientId,
|
||||||
|
args.serial,
|
||||||
|
maxShipped,
|
||||||
|
companyId,
|
||||||
|
args.taxArea,
|
||||||
|
args.reference
|
||||||
|
], myOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
const [newInvoice] = await Self.rawSql(`SELECT @newInvoiceId id`, null, myOptions);
|
||||||
|
if (newInvoice.id)
|
||||||
|
await Self.createPdf(ctx, newInvoice.id, myOptions);
|
||||||
|
|
||||||
|
if (tx) await tx.commit();
|
||||||
|
|
||||||
|
return newInvoice;
|
||||||
|
} catch (e) {
|
||||||
|
if (tx) await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
async function isInvoiceable(clientId, options) {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const query = `SELECT (hasToInvoice AND isTaxDataChecked) AS invoiceable
|
||||||
|
FROM client
|
||||||
|
WHERE id = ?`;
|
||||||
|
const [result] = await models.InvoiceOut.rawSql(query, [clientId], options);
|
||||||
|
|
||||||
|
return result.invoiceable;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getNegativeBase(ticketId, options) {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const query = 'SELECT vn.hasSomeNegativeBase(?) AS base';
|
||||||
|
const [result] = await models.InvoiceOut.rawSql(query, [ticketId], options);
|
||||||
|
|
||||||
|
return result.base;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getMaxIssued(serial, companyId, options) {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const query = `SELECT MAX(issued) AS issued
|
||||||
|
FROM invoiceOut
|
||||||
|
WHERE serial = ? AND companyFk = ?`;
|
||||||
|
const [maxIssued] = await models.InvoiceOut.rawSql(query,
|
||||||
|
[serial, companyId], options);
|
||||||
|
const maxInvoiceDate = maxIssued && maxIssued.issued || new Date();
|
||||||
|
|
||||||
|
return maxInvoiceDate;
|
||||||
|
}
|
||||||
|
};
|
|
@ -58,11 +58,18 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const invoiceYear = invoiceOut.created.getFullYear().toString();
|
const created = invoiceOut.created;
|
||||||
const container = await models.InvoiceContainer.container(invoiceYear);
|
const year = created.getFullYear().toString();
|
||||||
|
const month = created.getMonth().toString();
|
||||||
|
const day = created.getDate().toString();
|
||||||
|
|
||||||
|
const container = await models.InvoiceContainer.container(year);
|
||||||
const rootPath = container.client.root;
|
const rootPath = container.client.root;
|
||||||
const fileName = `${invoiceOut.ref}.pdf`;
|
const fileName = `${invoiceOut.ref}.pdf`;
|
||||||
fileSrc = path.join(rootPath, invoiceYear, fileName);
|
const src = path.join(rootPath, year, month, day);
|
||||||
|
fileSrc = path.join(src, fileName);
|
||||||
|
|
||||||
|
await fs.mkdir(src, {recursive: true});
|
||||||
|
|
||||||
const writeStream = fs.createWriteStream(fileSrc);
|
const writeStream = fs.createWriteStream(fileSrc);
|
||||||
writeStream.on('open', () => {
|
writeStream.on('open', () => {
|
||||||
|
|
|
@ -34,13 +34,14 @@ module.exports = Self => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const invoiceOut = await Self.findById(id, {}, myOptions);
|
const invoiceOut = await Self.findById(id, {}, myOptions);
|
||||||
const tickets = await Self.app.models.Ticket.find({where: {refFk: invoiceOut.ref}}, myOptions);
|
const tickets = await Self.app.models.Ticket.find({
|
||||||
|
where: {refFk: invoiceOut.ref}
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
const promises = [];
|
const promises = [];
|
||||||
|
|
||||||
tickets.forEach(ticket => {
|
for (let ticket of tickets)
|
||||||
promises.push(ticket.updateAttribute('refFk', null, myOptions));
|
promises.push(ticket.updateAttribute('refFk', null, myOptions));
|
||||||
});
|
|
||||||
|
|
||||||
await Promise.all(promises);
|
await Promise.all(promises);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
const fs = require('fs-extra');
|
const fs = require('fs-extra');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
Self.remoteMethod('download', {
|
Self.remoteMethod('download', {
|
||||||
|
@ -33,24 +34,31 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.download = async function(id) {
|
Self.download = async function(id, options) {
|
||||||
let file;
|
const models = Self.app.models;
|
||||||
let env = process.env.NODE_ENV;
|
const myOptions = {};
|
||||||
let [invoice] = await Self.rawSql(`SELECT invoiceOut_getPath(?) path`, [id]);
|
|
||||||
|
|
||||||
if (env && env != 'development') {
|
if (typeof options == 'object')
|
||||||
file = {
|
Object.assign(myOptions, options);
|
||||||
path: `/var/lib/salix/pdfs/${invoice.path}`,
|
|
||||||
|
const invoiceOut = await models.InvoiceOut.findById(id, null, myOptions);
|
||||||
|
|
||||||
|
const created = invoiceOut.created;
|
||||||
|
const year = created.getFullYear().toString();
|
||||||
|
const month = created.getMonth().toString();
|
||||||
|
const day = created.getDate().toString();
|
||||||
|
|
||||||
|
const container = await models.InvoiceContainer.container(year);
|
||||||
|
const rootPath = container.client.root;
|
||||||
|
const src = path.join(rootPath, year, month, day);
|
||||||
|
const fileName = `${invoiceOut.ref}.pdf`;
|
||||||
|
const fileSrc = path.join(src, fileName);
|
||||||
|
|
||||||
|
const file = {
|
||||||
|
path: fileSrc,
|
||||||
contentType: 'application/pdf',
|
contentType: 'application/pdf',
|
||||||
name: `${id}.pdf`
|
name: `${id}.pdf`
|
||||||
};
|
};
|
||||||
} else {
|
|
||||||
file = {
|
|
||||||
path: `${process.cwd()}/README.md`,
|
|
||||||
contentType: 'text/plain',
|
|
||||||
name: `README.md`
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
await fs.access(file.path);
|
await fs.access(file.path);
|
||||||
let stream = fs.createReadStream(file.path);
|
let stream = fs.createReadStream(file.path);
|
||||||
|
|
|
@ -2,7 +2,25 @@
|
||||||
"InvoiceOut": {
|
"InvoiceOut": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"InvoiceOutSerial": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"InvoiceContainer": {
|
"InvoiceContainer": {
|
||||||
"dataSource": "invoiceStorage"
|
"dataSource": "invoiceStorage"
|
||||||
|
},
|
||||||
|
"TaxArea": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"TaxClass": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"TaxClassCode": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"TaxCode": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"TaxType": {
|
||||||
|
"dataSource": "vn"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"name": "InvoiceOutSerial",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "invoiceOutSerial"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"code": {
|
||||||
|
"type": "string",
|
||||||
|
"id": true,
|
||||||
|
"description": "Identifier"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"isTaxed": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"isCEE": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"taxArea": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "TaxArea",
|
||||||
|
"foreignKey": "taxAreaFk"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"acls": [{
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "$everyone",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}]
|
||||||
|
}
|
|
@ -6,4 +6,5 @@ module.exports = Self => {
|
||||||
require('../methods/invoiceOut/delete')(Self);
|
require('../methods/invoiceOut/delete')(Self);
|
||||||
require('../methods/invoiceOut/book')(Self);
|
require('../methods/invoiceOut/book')(Self);
|
||||||
require('../methods/invoiceOut/createPdf')(Self);
|
require('../methods/invoiceOut/createPdf')(Self);
|
||||||
|
require('../methods/invoiceOut/createManualInvoice')(Self);
|
||||||
};
|
};
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"name": "TaxArea",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "taxArea"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"code": {
|
||||||
|
"type": "string",
|
||||||
|
"id": true,
|
||||||
|
"description": "Identifier"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"acls": [{
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "$everyone",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}]
|
||||||
|
}
|
|
@ -7,3 +7,4 @@ import './summary';
|
||||||
import './card';
|
import './card';
|
||||||
import './descriptor';
|
import './descriptor';
|
||||||
import './descriptor-popover';
|
import './descriptor-popover';
|
||||||
|
import './index/manual';
|
||||||
|
|
|
@ -57,6 +57,26 @@
|
||||||
</vn-table>
|
</vn-table>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
</vn-data-viewer>
|
</vn-data-viewer>
|
||||||
|
<div fixed-bottom-right>
|
||||||
|
<vn-vertical style="align-items: center;">
|
||||||
|
<vn-button class="round sm vn-mb-sm"
|
||||||
|
icon="icon-invoices"
|
||||||
|
ng-click="invoicingOptions.show($event)"
|
||||||
|
vn-tooltip="Make invoice..."
|
||||||
|
tooltip-position="left"
|
||||||
|
vn-acl="invoicing"
|
||||||
|
vn-acl-action="remove">
|
||||||
|
</vn-button>
|
||||||
|
|
||||||
|
<vn-menu vn-id="invoicingOptions">
|
||||||
|
<vn-item translate
|
||||||
|
name="manualInvoice"
|
||||||
|
ng-click="manualInvoicing.show()">
|
||||||
|
Manual invoicing
|
||||||
|
</vn-item>
|
||||||
|
</vn-menu>
|
||||||
|
</vn-vertical>
|
||||||
|
</div>
|
||||||
<vn-popup vn-id="summary">
|
<vn-popup vn-id="summary">
|
||||||
<vn-invoice-out-summary
|
<vn-invoice-out-summary
|
||||||
invoice-out="$ctrl.selectedInvoiceOut">
|
invoice-out="$ctrl.selectedInvoiceOut">
|
||||||
|
@ -65,3 +85,6 @@
|
||||||
<vn-client-descriptor-popover
|
<vn-client-descriptor-popover
|
||||||
vn-id="clientDescriptor">
|
vn-id="clientDescriptor">
|
||||||
</vn-client-descriptor-popover>
|
</vn-client-descriptor-popover>
|
||||||
|
<vn-invoice-out-manual
|
||||||
|
vn-id="manual-invoicing">
|
||||||
|
</vn-invoice-out-manual>
|
|
@ -0,0 +1,75 @@
|
||||||
|
<tpl-title translate>
|
||||||
|
Create manual invoice
|
||||||
|
</tpl-title>
|
||||||
|
<tpl-body id="manifold-form">
|
||||||
|
<vn-crud-model
|
||||||
|
auto-load="true"
|
||||||
|
url="InvoiceOutSerials"
|
||||||
|
data="invoiceOutSerials"
|
||||||
|
order="code">
|
||||||
|
</vn-crud-model>
|
||||||
|
<vn-crud-model
|
||||||
|
auto-load="true"
|
||||||
|
url="TaxAreas"
|
||||||
|
data="taxAreas"
|
||||||
|
order="code">
|
||||||
|
</vn-crud-model>
|
||||||
|
<vn-horizontal class="manifold-panel">
|
||||||
|
<vn-autocomplete
|
||||||
|
url="Tickets"
|
||||||
|
label="Ticket"
|
||||||
|
search-function="{or: [{id: $search}, {nickname: {like: '%'+$search+'%'}}]}"
|
||||||
|
show-field="nickname"
|
||||||
|
value-field="id"
|
||||||
|
ng-model="$ctrl.invoice.ticketFk"
|
||||||
|
order="shipped DESC"
|
||||||
|
on-change="$ctrl.invoice.clientFk = null">
|
||||||
|
<tpl-item>
|
||||||
|
{{::id}} - {{::nickname}}
|
||||||
|
</tpl-item>
|
||||||
|
</vn-autocomplete>
|
||||||
|
<vn-none class="or vn-px-md" translate>Or</vn-none>
|
||||||
|
<vn-autocomplete
|
||||||
|
url="Clients"
|
||||||
|
label="Client"
|
||||||
|
search-function="{or: [{id: $search}, {name: {like: '%'+$search+'%'}}]}"
|
||||||
|
show-field="name"
|
||||||
|
value-field="id"
|
||||||
|
ng-model="$ctrl.invoice.clientFk"
|
||||||
|
on-change="$ctrl.invoice.ticketFk = null">
|
||||||
|
</vn-autocomplete>
|
||||||
|
<vn-date-picker
|
||||||
|
vn-one
|
||||||
|
label="Max date"
|
||||||
|
ng-model="$ctrl.invoice.maxShipped">
|
||||||
|
</vn-date-picker>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-autocomplete
|
||||||
|
data="invoiceOutSerials"
|
||||||
|
label="Serial"
|
||||||
|
show-field="description"
|
||||||
|
value-field="code"
|
||||||
|
ng-model="$ctrl.invoice.serial"
|
||||||
|
required="true">
|
||||||
|
</vn-autocomplete>
|
||||||
|
<vn-autocomplete
|
||||||
|
data="taxAreas"
|
||||||
|
label="Area"
|
||||||
|
show-field="code"
|
||||||
|
value-field="code"
|
||||||
|
ng-model="$ctrl.invoice.taxArea"
|
||||||
|
required="true">
|
||||||
|
</vn-autocomplete>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield
|
||||||
|
label="Reference"
|
||||||
|
ng-model="$ctrl.invoice.reference">
|
||||||
|
</vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
</tpl-body>
|
||||||
|
<tpl-buttons>
|
||||||
|
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||||
|
<button response="accept" translate vn-focus>Make invoice</button>
|
||||||
|
</tpl-buttons>
|
|
@ -0,0 +1,47 @@
|
||||||
|
import ngModule from '../../module';
|
||||||
|
import Dialog from 'core/components/dialog';
|
||||||
|
import './style.scss';
|
||||||
|
|
||||||
|
class Controller extends Dialog {
|
||||||
|
constructor($element, $, $transclude) {
|
||||||
|
super($element, $, $transclude);
|
||||||
|
|
||||||
|
this.invoice = {
|
||||||
|
maxShipped: new Date()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
responseHandler(response) {
|
||||||
|
try {
|
||||||
|
if (response !== 'accept')
|
||||||
|
return super.responseHandler(response);
|
||||||
|
|
||||||
|
if (this.invoice.clientFk && !this.invoice.maxShipped)
|
||||||
|
throw new Error('Client and the max shipped should be filled');
|
||||||
|
|
||||||
|
if (!this.invoice.serial || !this.invoice.taxArea)
|
||||||
|
throw new Error('Some fields are required');
|
||||||
|
|
||||||
|
return this.$http.post(`InvoiceOuts/createManualInvoice`, this.invoice)
|
||||||
|
.then(res => {
|
||||||
|
this.$state.go('invoiceOut.card.summary', {id: res.data.id});
|
||||||
|
super.responseHandler(response);
|
||||||
|
})
|
||||||
|
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
|
||||||
|
} catch (e) {
|
||||||
|
this.vnApp.showError(this.$t(e.message));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Controller.$inject = ['$element', '$scope', '$transclude'];
|
||||||
|
|
||||||
|
ngModule.vnComponent('vnInvoiceOutManual', {
|
||||||
|
slotTemplate: require('./index.html'),
|
||||||
|
controller: Controller,
|
||||||
|
bindings: {
|
||||||
|
ticketFk: '<?',
|
||||||
|
clientFk: '<?'
|
||||||
|
}
|
||||||
|
});
|
|
@ -0,0 +1,66 @@
|
||||||
|
import './index';
|
||||||
|
|
||||||
|
describe('InvoiceOut', () => {
|
||||||
|
describe('Component vnInvoiceOutManual', () => {
|
||||||
|
let controller;
|
||||||
|
let $httpBackend;
|
||||||
|
|
||||||
|
beforeEach(ngModule('invoiceOut'));
|
||||||
|
|
||||||
|
beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
|
||||||
|
$httpBackend = _$httpBackend_;
|
||||||
|
let $scope = $rootScope.$new();
|
||||||
|
const $element = angular.element('<vn-invoice-out-manual></vn-invoice-out-manual>');
|
||||||
|
const $transclude = {
|
||||||
|
$$boundTransclude: {
|
||||||
|
$$slots: []
|
||||||
|
}
|
||||||
|
};
|
||||||
|
controller = $componentController('vnInvoiceOutManual', {$element, $scope, $transclude});
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('responseHandler()', () => {
|
||||||
|
it('should throw an error when clientFk property is set and the maxShipped is not filled', () => {
|
||||||
|
jest.spyOn(controller.vnApp, 'showError');
|
||||||
|
|
||||||
|
controller.invoice = {
|
||||||
|
clientFk: 1101,
|
||||||
|
serial: 'T',
|
||||||
|
taxArea: 'B'
|
||||||
|
};
|
||||||
|
|
||||||
|
controller.responseHandler('accept');
|
||||||
|
|
||||||
|
expect(controller.vnApp.showError).toHaveBeenCalledWith(`Client and the max shipped should be filled`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should throw an error when some required fields are not filled in', () => {
|
||||||
|
jest.spyOn(controller.vnApp, 'showError');
|
||||||
|
|
||||||
|
controller.invoice = {
|
||||||
|
ticketFk: 1101
|
||||||
|
};
|
||||||
|
|
||||||
|
controller.responseHandler('accept');
|
||||||
|
|
||||||
|
expect(controller.vnApp.showError).toHaveBeenCalledWith(`Some fields are required`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should make an http POST query and then call to the parent showSuccess() method', () => {
|
||||||
|
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||||
|
|
||||||
|
controller.invoice = {
|
||||||
|
ticketFk: 1101,
|
||||||
|
serial: 'T',
|
||||||
|
taxArea: 'B'
|
||||||
|
};
|
||||||
|
|
||||||
|
$httpBackend.expect('POST', `InvoiceOuts/createManualInvoice`).respond({id: 1});
|
||||||
|
controller.responseHandler('accept');
|
||||||
|
$httpBackend.flush();
|
||||||
|
|
||||||
|
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,4 @@
|
||||||
|
Create manual invoice: Crear factura manual
|
||||||
|
Some fields are required: Algunos campos son obligatorios
|
||||||
|
Client and max shipped fields should be filled: Los campos de cliente y fecha límite deben rellenarse
|
||||||
|
Max date: Fecha límite
|
|
@ -0,0 +1,5 @@
|
||||||
|
.vn-invoice-out-manual {
|
||||||
|
tpl-body {
|
||||||
|
width: 500px
|
||||||
|
}
|
||||||
|
}
|
|
@ -65,18 +65,6 @@
|
||||||
"Tag": {
|
"Tag": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"TaxClass": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
},
|
|
||||||
"TaxClassCode": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
},
|
|
||||||
"TaxCode": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
},
|
|
||||||
"TaxType": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
},
|
|
||||||
"FixedPrice": {
|
"FixedPrice": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue