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

5914-transferInvoiceOut #1761

Merged
jorgep merged 55 commits from 5914-transferInvoiceOut into dev 2023-10-26 12:39:11 +00:00
Conversation 2 Commits 55 Files Changed 30 +161 -168
8 changed files with 161 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ef74cab5c - Show all commits

66
modules/invoiceOut/back/methods/invoiceOut/transferInvoiceOut.js
View File

@ -6,10 +6,35 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [
{
arg: 'data',
type: 'Object',
arg: 'id',
type: 'number',
required: true
}
},
{
arg: 'ref',
type: 'string',
required: true
},
{
arg: 'newClientFk',
type: 'number',
required: true
},
{
arg: 'cplusRectificationId',
type: 'number',
required: true
},
{
arg: 'cplusInvoiceType477Id',
type: 'number',
required: true
},
{
arg: 'invoiceCorrectionTypeId',
type: 'number',
required: true
},
],
returns: {
type: 'boolean',
@ -21,7 +46,7 @@ module.exports = Self => {
}
});
Self.transferInvoiceOut = async(ctx, params, options) => {
Self.transferInvoiceOut = async(ctx, id, ref, newClientFk, cplusRectificationId, cplusInvoiceType477Id, invoiceCorrectionTypeId, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@ -34,16 +59,12 @@ module.exports = Self => {
myOptions.transaction = tx;
}
try {
const {id, ref, newClientFk, cplusRectificationId, cplusInvoiceType477FkId, invoiceCorrectionTypeId} = params;
if (!id || !ref || !newClientFk || !cplusRectificationId || !cplusInvoiceType477FkId || !invoiceCorrectionTypeId)
throw new UserError(`There are missing fields.`);
// Refund tickets and group
const filter = {where: {refFk: ref}};
const tickets = await models.Ticket.find(filter, myOptions);
const ticketsIds = tickets.map(ticket => ticket.id);
await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
console.log('Ticket refunded');
// Clone tickets
const refundAgencyMode = await models.AgencyMode.findOne({
include: {
@ -58,25 +79,20 @@ module.exports = Self => {
const refoundZoneId = refundAgencyMode.zones()[0].id;
const services = await models.TicketService.find(filter, myOptions);
const servicesIds = services.map(service => service.id);
const salesFilter = {
where: {id: {inq: salesIds}},
include: {
relation: 'components',
scope: {
fields: ['saleFk', 'componentFk', 'value']
}
}
};
const salesFilter = {where: {ticketFk: {inq: ticketsIds}}};
const sales = await models.Sale.find(salesFilter, myOptions);
const isRefund = false;
const clonedTicketIds = await models.Sale.clone(sales, refundAgencyMode, refoundZoneId, servicesIds, null, isRefund, myOptions);
const clonedTickets = await models.Sale.clone(sales, refundAgencyMode, refoundZoneId, servicesIds, null, false, false, myOptions);
console.log('cloned tickets');
// Update client
for (const clonedTicketId of clonedTicketIds) {
const ticket = await models.Ticket.findById(clonedTicketId, myOptions);
await ticket.updateAttributes({clientFk: newClientFk});
for (const clonedTicket of clonedTickets) {
// const ticket = await models.Ticket.findById(clonedTicketId, myOptions);
console.log(clonedTicket);
await clonedTicket.updateAttributes({clientFk: newClientFk}, myOptions);
console.log(clonedTicket);
}
// Quick invoice
const clonedTicketIds = clonedTickets.map(clonedTicket => clonedTicket.id);
console.log(clonedTicketIds);
const invoiceIds = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
// Insert InvoiceCorrection
@ -85,7 +101,7 @@ module.exports = Self => {
correctingFk: invoiceId,
correctedFk: id,
cplusRectificationTypeFk: cplusRectificationId,
cplusInvoiceType477Fk: cplusInvoiceType477FkId,
cplusInvoiceType477Fk: cplusInvoiceType477Id,
invoiceCorrectionType: invoiceCorrectionTypeId
});
}

3
modules/invoiceOut/front/descriptor-menu/index.html
View File

@ -222,12 +222,13 @@
<vn-horizontal>
<vn-autocomplete
vn-one
vn-id="cplusInvoiceType477"
vn-id="cplusInvoiceType"
data="cplusInvoiceType477"
show-field="description"
value-field="id"
required="true"
ng-model="$ctrl.cplusInvoiceType477"
search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
label="Class">
</vn-autocomplete>
<vn-autocomplete

14
modules/invoiceOut/front/descriptor-menu/index.js
View File

@ -128,14 +128,12 @@ class Controller extends Section {
transferInvoice() {
const params = {
data: {
id: this.invoiceOut.id,
ref: this.invoiceOut.ref,
newClientFk: this.invoiceOut.client.id,
cplusRectificationId: this.cplusRectificationType,
cplusInvoiceType477Id: this.cplusInvoiceType477,
invoiceCorrectionTypeId: this.invoiceCorrectionType
}
id: this.invoiceOut.id,
ref: this.invoiceOut.ref,
newClientFk: this.invoiceOut.client.id,
cplusRectificationId: this.cplusRectificationType,
cplusInvoiceType477Id: this.cplusInvoiceType477,
invoiceCorrectionTypeId: this.invoiceCorrectionType
};
this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => console.log(res.data));
}

151
modules/ticket/back/methods/sale/clone.js
View File

@ -1,67 +1,104 @@
module.exports = Self => {
jorgep marked this conversation as resolved
alexm commented 2023-09-25 11:22:16 +00:00
Review
Copy Link

Si quieres usar refundTickets en varios sitios no seria mejor ponerlo fuera de las funciones? (No estoy seguro de que funcione)

Si quieres usar refundTickets en varios sitios no seria mejor ponerlo fuera de las funciones? (No estoy seguro de que funcione)
jorgep commented 2023-09-25 13:23:03 +00:00
Review
Copy Link

Mirado juntos.

Mirado juntos.
Self.clone = async(sales, refundAgencyMode, refoundZoneId, servicesIds, withWarehouse, isRefund, myOptions) => {
Self.clone = async(sales, refundAgencyMode, refoundZoneId, servicesIds, withWarehouse, group, negative, myOptions) => {
const models = Self.app.models;
const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
let tx;
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
const [firstTicketId] = ticketsIds;
const now = Date.vnNew();
let updatedTickets = [];
let newTicket;
const filter = {
include: [
{relation: 'address'},
{
relation: 'sale',
inq: sales,
},
]
};
try {
for (const [index, ticketId] of ticketsIds.entries()) {
const ticket = await models.Ticket.findById(ticketId, filter, myOptions);
if (!group || !index) {
newTicket = await models.Ticket.create({
clientFk: ticket.clientFk,
shipped: now,
jorgep marked this conversation as resolved Outdated
alexm commented 2023-09-22 05:56:10 +00:00
Outdated
Review
Copy Link
if(group) ticketsIds = ticketsIds[0]

                for (let ticketId of ticketsIds) {
                    await createTicketRefund(
                        ticketId,
                        withWarehouse,
                        refundTickets,
                        mappedTickets,
                        now,
                        myOptions
                    );
                }

y te ahorres fer if y else

``` if(group) ticketsIds = ticketsIds[0] for (let ticketId of ticketsIds) { await createTicketRefund( ticketId, withWarehouse, refundTickets, mappedTickets, now, myOptions ); } ``` y te ahorres fer if y else
addressFk: ticket.address().id,
agencyModeFk: refundAgencyMode.id,
nickname: ticket.address().nickname,
warehouseFk: withWarehouse ? ticket.warehouseFk : null,
companyFk: ticket.companyFk,
landed: now,
zoneFk: refoundZoneId
}, myOptions);
jorgep marked this conversation as resolved
alexm commented 2023-09-25 11:19:32 +00:00
Review
Copy Link

Aqui

Aqui
updatedTickets.push(newTicket);
}
const sales = ticket.sale();
const saleIds = sales.map(sale => sale.id);
const saleComponentsFilter = {
where: {saleFk: {inq: saleIds}},
scope: {
fields: ['saleFk', 'componentFk', 'value']
jorgep marked this conversation as resolved Outdated
alexm commented 2023-09-22 05:59:03 +00:00
Outdated
Review
Copy Link

El map de mappedTickets realment el pots omplir fer el bucle

El map de mappedTickets realment el pots omplir fer el bucle
}
};
for (const sale of sales) {
const createdSale = await models.Sale.create({
ticketFk: newTicket.id,
itemFk: sale.itemFk,
quantity: (negative) ? - sale.quantity : sale.quantity,
concept: sale.concept,
price: sale.price,
discount: sale.discount,
}, myOptions);
const components = await models.SaleComponent.find(saleComponentsFilter, myOptions);
// const components = sale.components();
for (const component of components)
component.saleFk = createdSale.id;
for (const ticketId of ticketsIds) {
const filter = {include: {relation: 'address'}};
const ticket = await models.Ticket.findById(ticketId, filter, myOptions);
const ticketUpdated = await models.Ticket.create({
clientFk: ticket.clientFk,
shipped: now,
addressFk: ticket.address().id,
agencyModeFk: refundAgencyMode.id,
nickname: ticket.address().nickname,
warehouseFk: withWarehouse ? ticket.warehouseFk : null,
companyFk: ticket.companyFk,
landed: now,
zoneFk: refoundZoneId
}, myOptions);
updatedTickets.push(ticketUpdated);
}
for (const sale of sales) {
const createdSale = await models.Sale.create({
ticketFk: sale.ticketFk,
itemFk: sale.itemFk,
quantity: (isRefund) ? - sale.quantity : sale.quantity,
concept: sale.concept,
price: sale.price,
discount: sale.discount,
}, myOptions);
const components = sale.components();
for (const component of components)
component.saleFk = createdSale.id;
await models.SaleComponent.create(components, myOptions);
}
if (servicesIds && servicesIds.length > 0) {
const servicesFilter = {
where: {id: {inq: servicesIds}}
};
const services = await models.TicketService.find(servicesFilter, myOptions);
for (const service of services) {
await models.TicketService.create({
description: service.description,
quantity: (isRefund) ? - service.quantity : service.quantity,
price: service.price,
taxClassFk: service.taxClassFk,
ticketFk: service.ticketFk,
ticketServiceTypeFk: service.ticketServiceTypeFk,
}, myOptions);
await models.SaleComponent.create(components, myOptions);
}
jorgep marked this conversation as resolved Outdated
alexm commented 2023-09-25 12:02:53 +00:00
Outdated
Review
Copy Link

if (servicesIds && servicesIds.length)

if (servicesIds && servicesIds.length)
}
if (servicesIds && servicesIds.length > 0) {
const servicesFilter = {
where: {id: {inq: servicesIds}}
};
const services = await models.TicketService.find(servicesFilter, myOptions);
for (const service of services) {
await models.TicketService.create({
description: service.description,
quantity: (negative) ? - service.quantity : service.quantity,
price: service.price,
taxClassFk: service.taxClassFk,
ticketFk: service.ticketFk,
ticketServiceTypeFk: service.ticketServiceTypeFk,
}, myOptions);
}
}
const query = `CALL vn.ticket_recalc(?, NULL)`;
if (group) {
await Self.rawSql(query, [newTicket.id], myOptions);
if (tx) await tx.commit();
return {
refundTicket: newTicket,
originalTicketFk: firstTicketId
jorgep marked this conversation as resolved Outdated
alexm commented 2023-10-25 08:20:10 +00:00
Outdated
Review
Copy Link

Pero no quedarem en que clone.js no debia tindre res relacionat en refund

Pero no quedarem en que clone.js no debia tindre res relacionat en refund
};
} else {
for (const updatedTicket of updatedTickets)
await Self.rawSql(query, [updatedTicket.id], myOptions);
if (tx) await tx.commit();
return updatedTickets/* updatedTickets.map(updatedTicket => updatedTicket.id) */;
}
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
const query = `CALL vn.ticket_recalc(?, NULL)`;
for (const updatedTicket of updatedTickets)
await Self.rawSql(query, [updatedTicket.id], myOptions);
return updatedTickets.map(updatedTicket => updatedTicket.id);
};
};

87
modules/ticket/back/methods/sale/refund.js
View File

@ -155,19 +155,23 @@ module.exports = Self => {
}
};
const sales = await models.Sale.find(salesFilter, myOptions);
const group = true;
const isRefund = true;
const refundTicket = await cloneAndGroup(
const clonedTicket = await models.Sale.clone(
sales,
refundAgencyMode,
refoundZoneId,
servicesIds,
withWarehouse,
group,
isRefund,
true,
true,
myOptions
);
const refundTicket = clonedTicket.refundTicket;
await models.TicketRefund.create({
refundTicketFk: refundTicket.id,
originalTicketFk: clonedTicket.originalTicketFk,
}, myOptions);
if (tx) await tx.commit();
return refundTicket;
@ -177,74 +181,7 @@ module.exports = Self => {
}
};
async function cloneAndGroup(sales, refundAgencyMode, refoundZoneId, servicesIds, withWarehouse, group, isRefund, myOptions) {
if (!group) {
const tickets = await models.Sale.clone(sales,
refundAgencyMode,
refoundZoneId, servicesIds,
withWarehouse,
isRefund,
myOptions);
return tickets;
}
const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
const [firstTicketId] = ticketsIds;
const filter = {include: {relation: 'address'}};
const ticket = await models.Ticket.findById(firstTicketId, filter, myOptions);
const ticketUpdated = await models.Ticket.create({
clientFk: ticket.clientFk,
shipped: now,
addressFk: ticket.address().id,
agencyModeFk: refundAgencyMode.id,
nickname: ticket.address().nickname,
warehouseFk: withWarehouse ? ticket.warehouseFk : null,
companyFk: ticket.companyFk,
landed: now,
zoneFk: refoundZoneId
}, myOptions);
for (const sale of sales) {
const createdSale = await models.Sale.create({
ticketFk: ticketUpdated.id,
itemFk: sale.itemFk,
quantity: (isRefund) ? - sale.quantity : sale.quantity,
concept: sale.concept,
price: sale.price,
discount: sale.discount,
}, myOptions);
const components = sale.components();
for (const component of components)
component.saleFk = createdSale.id;
await models.SaleComponent.create(components, myOptions);
}
if (servicesIds && servicesIds.length > 0) {
const servicesFilter = {
where: {id: {inq: servicesIds}}
};
const services = await models.TicketService.find(servicesFilter, myOptions);
for (const service of services) {
await models.TicketService.create({
description: service.description,
quantity: (isRefund) ? - service.quantity : service.quantity,
price: service.price,
taxClassFk: service.taxClassFk,
ticketFk: ticketUpdated.id,
ticketServiceTypeFk: service.ticketServiceTypeFk,
}, myOptions);
}
}
const query = `CALL vn.ticket_recalc(?, NULL)`;
await Self.rawSql(query, [refundTicket.id], myOptions);
return ticketUpdated;
}
async function createTicketRefund(ticketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions) {
/* async function createTicketRefund(ticketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions) {
const models = Self.app.models;
const filter = {include: {relation: 'address'}};
@ -268,5 +205,5 @@ module.exports = Self => {
}, myOptions);
return refundTicket;
}
} */
};

2
modules/ticket/back/methods/sale/specs/refund.spec.js
View File

@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('Sale refund()', () => {
fdescribe('Sale refund()', () => {
const userId = 5;
const ctx = {req: {accessToken: userId}};
const activeCtx = {

1
modules/ticket/back/methods/ticket/refund.js
View File

@ -39,7 +39,6 @@ module.exports = Self => {
jorgep marked this conversation as resolved Outdated
jgallego commented 2023-09-22 05:37:33 +00:00
Outdated
Review
Copy Link

modules/ticket/back/methods/ticket/invoiceTicketsWithPdf.js este porque sale?

modules/ticket/back/methods/ticket/invoiceTicketsWithPdf.js este porque sale?
jorgep commented 2023-09-22 06:41:39 +00:00
Outdated
Review
Copy Link

Se me olvidó borrarlo

Se me olvidó borrarlo
try {
const filter = {where: {ticketFk: {inq: ticketsIds}}};
const sales = await models.Sale.find(filter, myOptions);
const salesIds = sales.map(sale => sale.id);

5
modules/ticket/back/models/ticket.json
View File

@ -136,6 +136,11 @@
"type": "belongsTo",
"model": "Zone",
"foreignKey": "zoneFk"
},
jorgep marked this conversation as resolved Outdated
jgallego commented 2023-09-22 05:38:53 +00:00
Outdated
Review
Copy Link

esta repetido arriba con ticketSales

esta repetido arriba con ticketSales
"sale": {
"type": "hasMany",
"model": "Sale",
"foreignKey": "ticketFk"
}
}
}