mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 21:00:31 +00:00
feat: payment made form in new and edit mode.
This commit is contained in:
@@ -151,7 +151,8 @@ export default class BillsController extends BaseController {
|
||||
get dueBillsListingValidationSchema() {
|
||||
return [
|
||||
query('vendor_id').optional().trim().escape(),
|
||||
]
|
||||
query('payment_made_id').optional().trim().escape(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -331,7 +332,13 @@ export default class BillsController extends BaseController {
|
||||
errors: [{ type: 'BILL_ENTRIES_IDS_NOT_FOUND', code: 900 }],
|
||||
});
|
||||
}
|
||||
if (error.errorType === 'ITEMS_NOT_FOUND') {
|
||||
return res.boom.badRequest(null, {
|
||||
errors: [{ type: 'ITEMS_NOT_FOUND', code: 1000 }],
|
||||
});
|
||||
}
|
||||
}
|
||||
console.log(error.errorType);
|
||||
next(error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,8 +198,14 @@ export default class BillsPayments extends BaseController {
|
||||
const { id: billPaymentId } = req.params;
|
||||
|
||||
try {
|
||||
const billPayment = await this.billPaymentService.getBillPayment(tenantId, billPaymentId);
|
||||
return res.status(200).send({ bill_payment: billPayment });
|
||||
const { billPayment, payableBills } = await this.billPaymentService.getBillPayment(tenantId, billPaymentId);
|
||||
|
||||
return res.status(200).send({
|
||||
bill_payment: {
|
||||
...this.transfromToResponse({ ...billPayment }),
|
||||
payable_bills: payableBills,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
next(error);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Router, Request, Response, NextFunction } from 'express';
|
||||
import { check, param, query } from 'express-validator';
|
||||
import { raw } from 'objection';
|
||||
import { Service, Inject } from 'typedi';
|
||||
import BaseController from '../BaseController';
|
||||
import asyncMiddleware from 'api/middleware/asyncMiddleware';
|
||||
@@ -52,11 +51,11 @@ export default class SaleInvoicesController extends BaseController{
|
||||
this.handleServiceErrors,
|
||||
);
|
||||
router.get(
|
||||
'/due', [
|
||||
'/payable', [
|
||||
...this.dueSalesInvoicesListValidationSchema,
|
||||
],
|
||||
this.validationResult,
|
||||
asyncMiddleware(this.getDueInvoices.bind(this)),
|
||||
asyncMiddleware(this.getPayableInvoices.bind(this)),
|
||||
this.handleServiceErrors,
|
||||
);
|
||||
router.get(
|
||||
@@ -251,12 +250,12 @@ export default class SaleInvoicesController extends BaseController{
|
||||
* @param {NextFunction} next -
|
||||
* @return {Response|void}
|
||||
*/
|
||||
public async getDueInvoices(req: Request, res: Response, next: NextFunction) {
|
||||
public async getPayableInvoices(req: Request, res: Response, next: NextFunction) {
|
||||
const { tenantId } = req;
|
||||
const { customerId } = this.matchedQueryData(req);
|
||||
|
||||
try {
|
||||
const salesInvoices = await this.saleInvoiceService.getDueInvoices(tenantId, customerId);
|
||||
const salesInvoices = await this.saleInvoiceService.getPayableInvoices(tenantId, customerId);
|
||||
|
||||
return res.status(200).send({
|
||||
sales_invoices: this.transfromToResponse(salesInvoices),
|
||||
|
||||
Reference in New Issue
Block a user