QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add user id to sale invoice non-inventory journal entries.

Browse Source
This commit is contained in:
a.bouhuolia
2021-01-02 16:10:11 +02:00
parent edb439b29e
commit d3cbb3074b
5 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/api/controllers/Sales/SalesInvoices.ts
View File

@@ -146,14 +146,15 @@ export default class SaleInvoicesController extends BaseController {
* @param {Function} next
*/
async newSaleInvoice(req: Request, res: Response, next: NextFunction) {
const { tenantId } = req;
const saleInvoiceOTD: ISaleInvoiceDTO = this.matchedBodyData(req);
const { tenantId, user } = req;
const saleInvoiceDTO: ISaleInvoiceDTO = this.matchedBodyData(req);
try {
// Creates a new sale invoice with associated entries.
const storedSaleInvoice = await this.saleInvoiceService.createSaleInvoice(
tenantId,
saleInvoiceOTD
saleInvoiceDTO,
user
);
return res.status(200).send({
id: storedSaleInvoice.id,
@@ -171,7 +172,7 @@ export default class SaleInvoicesController extends BaseController {
* @param {Function} next
*/
async editSaleInvoice(req: Request, res: Response, next: NextFunction) {
const { tenantId } = req;
const { tenantId, user } = req;
const { id: saleInvoiceId } = req.params;
const saleInvoiceOTD: ISaleInvoiceDTO = this.matchedBodyData(req);
@@ -180,7 +181,8 @@ export default class SaleInvoicesController extends BaseController {
await this.saleInvoiceService.editSaleInvoice(
tenantId,
saleInvoiceId,
saleInvoiceOTD
saleInvoiceOTD,
user
);
return res.status(200).send({
id: saleInvoiceId,
@@ -198,12 +200,15 @@ export default class SaleInvoicesController extends BaseController {
* @param {NextFunction} next -
*/
async deliverSaleInvoice(req: Request, res: Response, next: NextFunction) {
const { tenantId } = req;
const { tenantId, user } = req;
const { id: saleInvoiceId } = req.params;
try {
await this.saleInvoiceService.deliverSaleInvoice(tenantId, saleInvoiceId);
await this.saleInvoiceService.deliverSaleInvoice(
tenantId,
saleInvoiceId,
user
);
return res.status(200).send({
id: saleInvoiceId,
message: 'The given sale invoice has been delivered successfully',
@@ -221,11 +226,11 @@ export default class SaleInvoicesController extends BaseController {
*/
async deleteSaleInvoice(req: Request, res: Response, next: NextFunction) {
const { id: saleInvoiceId } = req.params;
const { tenantId } = req;
const { tenantId, user } = req;
try {
// Deletes the sale invoice with associated entries and journal transaction.
await this.saleInvoiceService.deleteSaleInvoice(tenantId, saleInvoiceId);
await this.saleInvoiceService.deleteSaleInvoice(tenantId, saleInvoiceId, user);
return res.status(200).send({
id: saleInvoiceId,
@@ -388,7 +393,9 @@ export default class SaleInvoicesController extends BaseController {
}
if (error.errorType === 'INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES') {
return res.boom.badRequest(null, {
errors: [{ type: 'INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES', code: 1100 }],
errors: [
{ type: 'INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES', code: 1100 },
],
});
}
}