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

feat(ManualJournals): Auto-increment.

Browse Source 
fix(BillPayment): Validate the opened payment bills.
fix(redux): presist redux state.
fix(useRequestQuery): hook.
This commit is contained in:
a.bouhuolia
2021-03-18 14:23:37 +02:00
parent 4e8bdee97a
commit 9ff8e3159d
79 changed files with 1326 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/api/controllers/Items.ts
View File

@@ -547,6 +547,14 @@ export default class ItemsController extends BaseController {
}],
});
}
if (error.errorType === 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS') {
return res.status(400).send({
errors: [{
type: 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS',
message: 'Cannot change item type to inventory with item has associated transactions.',
}],
});
}
}
next(error);
}

11
server/src/api/controllers/ManualJournals.ts
View File

@@ -104,7 +104,7 @@ export default class ManualJournalsController extends BaseController {
return [
check('date').exists().isISO8601(),
check('journal_number')
.exists()
.optional()
.isString()
.trim()
.escape()
@@ -470,6 +470,15 @@ export default class ManualJournalsController extends BaseController {
errors: [{ type: 'MANUAL_JOURNAL_ALREADY_PUBLISHED', code: 900 }],
});
}
if (error.errorType === 'MANUAL_JOURNAL_NO_REQUIRED') {
return res.boom.badRequest('', {
errors: [{
type: 'MANUAL_JOURNAL_NO_REQUIRED',
message: 'The manual journal number required.',
code: 1000
}],
});
}
}
next(error);
}

2
server/src/api/controllers/Organization.ts
View File

@@ -67,7 +67,7 @@ export default class OrganizationController extends BaseController {
if (error instanceof ServiceError) {
if (error.errorType === 'tenant_not_found') {
return res.status(400).send({
errors: [{ type: 'TENANT.NOT.FOUND', code: 100 }],
// errors: [{ type: 'TENANT.NOT.FOUND', code: 100 }],
});
}
if (error.errorType === 'tenant_already_initialized') {

135
server/src/api/controllers/Purchases/Bills.ts
View File

@@ -31,62 +31,54 @@ export default class BillsController extends BaseController {
const router = Router();
router.post(
'/', [
...this.billValidationSchema,
],
'/',
[...this.billValidationSchema],
this.validationResult,
asyncMiddleware(this.newBill.bind(this)),
this.handleServiceError,
this.handleServiceError
);
router.post(
'/:id/open', [
...this.specificBillValidationSchema,
],
'/:id/open',
[...this.specificBillValidationSchema],
this.validationResult,
asyncMiddleware(this.openBill.bind(this)),
this.handleServiceError,
this.handleServiceError
);
router.post(
'/:id', [
...this.billEditValidationSchema,
...this.specificBillValidationSchema,
],
'/:id',
[...this.billEditValidationSchema, ...this.specificBillValidationSchema],
this.validationResult,
asyncMiddleware(this.editBill.bind(this)),
this.handleServiceError,
this.handleServiceError
);
router.get(
'/due', [
...this.dueBillsListingValidationSchema
],
'/due',
[...this.dueBillsListingValidationSchema],
this.validationResult,
asyncMiddleware(this.getDueBills.bind(this)),
this.handleServiceError,
)
router.get(
'/:id', [
...this.specificBillValidationSchema,
],
this.validationResult,
asyncMiddleware(this.getBill.bind(this)),
this.handleServiceError,
this.handleServiceError
);
router.get(
'/', [
...this.billsListingValidationSchema,
],
'/:id',
[...this.specificBillValidationSchema],
this.validationResult,
asyncMiddleware(this.getBill.bind(this)),
this.handleServiceError
);
router.get(
'/',
[...this.billsListingValidationSchema],
this.validationResult,
asyncMiddleware(this.billsList.bind(this)),
this.handleServiceError,
this.dynamicListService.handlerErrorsToResponse,
this.dynamicListService.handlerErrorsToResponse
);
router.delete(
'/:id', [
...this.specificBillValidationSchema
],
'/:id',
[...this.specificBillValidationSchema],
this.validationResult,
asyncMiddleware(this.deleteBill.bind(this)),
this.handleServiceError,
this.handleServiceError
);
return router;
}
@@ -110,8 +102,14 @@ export default class BillsController extends BaseController {
check('entries.*.item_id').exists().isNumeric().toInt(),
check('entries.*.rate').exists().isNumeric().toFloat(),
check('entries.*.quantity').exists().isNumeric().toFloat(),
check('entries.*.discount').optional({ nullable: true }).isNumeric().toFloat(),
check('entries.*.description').optional({ nullable: true }).trim().escape(),
check('entries.*.discount')
.optional({ nullable: true })
.isNumeric()
.toFloat(),
check('entries.*.description')
.optional({ nullable: true })
.trim()
.escape(),
];
}
@@ -135,8 +133,14 @@ export default class BillsController extends BaseController {
check('entries.*.item_id').exists().isNumeric().toInt(),
check('entries.*.rate').exists().isNumeric().toFloat(),
check('entries.*.quantity').exists().isNumeric().toFloat(),
check('entries.*.discount').optional({ nullable: true }).isNumeric().toFloat(),
check('entries.*.description').optional({ nullable: true }).trim().escape(),
check('entries.*.discount')
.optional({ nullable: true })
.isNumeric()
.toFloat(),
check('entries.*.description')
.optional({ nullable: true })
.trim()
.escape(),
];
}
@@ -167,7 +171,7 @@ export default class BillsController extends BaseController {
query('payment_made_id').optional().trim().escape(),
];
}
/**
* Creates a new bill and records journal transactions.
* @param {Request} req
@@ -179,7 +183,11 @@ export default class BillsController extends BaseController {
const billDTO: IBillDTO = this.matchedBodyData(req);
try {
const storedBill = await this.billsService.createBill(tenantId, billDTO, user);
const storedBill = await this.billsService.createBill(
tenantId,
billDTO,
user
);
return res.status(200).send({
id: storedBill.id,
@@ -293,7 +301,11 @@ export default class BillsController extends BaseController {
filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
}
try {
const { bills, pagination, filterMeta } = await this.billsService.getBills(tenantId, filter);
const {
bills,
pagination,
filterMeta,
} = await this.billsService.getBills(tenantId, filter);
return res.status(200).send({
bills,
@@ -307,9 +319,9 @@ export default class BillsController extends BaseController {
/**
* Listing all due bills of the given vendor.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
*/
public async getDueBills(req: Request, res: Response, next: NextFunction) {
const { tenantId } = req;
@@ -325,12 +337,17 @@ export default class BillsController extends BaseController {
/**
* Handles service errors.
* @param {Error} error
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @param {Error} error
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
*/
handleServiceError(error: Error, req: Request, res: Response, next: NextFunction) {
handleServiceError(
error: Error,
req: Request,
res: Response,
next: NextFunction
) {
if (error instanceof ServiceError) {
if (error.errorType === 'BILL_NOT_FOUND') {
return res.status(400).send({
@@ -349,8 +366,8 @@ export default class BillsController extends BaseController {
}
if (error.errorType === 'BILL_ITEMS_NOT_PURCHASABLE') {
return res.status(400).send({
errors: [{ type: 'BILL_ITEMS_NOT_PURCHASABLE', code: 700 }]
})
errors: [{ type: 'BILL_ITEMS_NOT_PURCHASABLE', code: 700 }],
});
}
if (error.errorType === 'NOT_PURCHASE_ABLE_ITEMS') {
return res.status(400).send({
@@ -377,7 +394,23 @@ export default class BillsController extends BaseController {
errors: [{ type: 'BILL_ALREADY_OPEN', code: 1100 }],
});
}
if (error.errorType === 'contact_not_found') {
return res.boom.badRequest(null, {
errors: [
{ type: 'VENDOR_NOT_FOUND', message: 'Vendor not found.', code: 1200 },
],
});
}
if (error.errorType === 'BILL_HAS_ASSOCIATED_PAYMENT_ENTRIES') {
return res.status(400).send({
errors: [{
type: 'BILL_HAS_ASSOCIATED_PAYMENT_ENTRIES',
message: 'Cannot delete bill that has associated payment transactions.',
code: 1200
}],
});
}
}
next(error);
next(error);
}
}

9
server/src/api/controllers/Purchases/BillsPayments.ts
View File

@@ -415,6 +415,15 @@ export default class BillsPayments extends BaseController {
errors: [{ type: 'PAYMENT_NUMBER_SHOULD_NOT_MODIFY', code: 1100 }],
});
}
if (error.errorType === 'BILLS_NOT_OPENED_YET') {
return res.status(400).send({
errors: [{
type: 'BILLS_NOT_OPENED_YET',
message: 'The given bills are not opened yet.',
code: 1200,
}],
});
}
}
next(error);
}

1
server/src/api/controllers/Sales/PaymentReceives.ts
View File

@@ -170,7 +170,6 @@ export default class PaymentReceivesController extends BaseController {
message: 'The payment receive has been created successfully.',
});
} catch (error) {
console.log(error);
next(error);
}
}

53
server/src/api/controllers/Settings.ts
View File

@@ -34,52 +34,31 @@ export default class SettingsController extends BaseController{
/**
* Save settings validation schema.
*/
get saveSettingsValidationSchema() {
private get saveSettingsValidationSchema() {
return [
body('options').isArray({ min: 1 }),
body('options.*.key').exists().trim().escape().isLength({ min: 1 }),
body('options.*.value').exists().trim().escape().isLength({ min: 1 }),
body('options.*.group').exists().trim().escape().isLength({ min: 1 }),
body('options.*.key').exists().trim().isLength({ min: 1 }),
body('options.*.value').exists().trim().isLength({ min: 1 }),
body('options.*.group').exists().trim().isLength({ min: 1 }),
];
}
/**
* Retrieve the application options from the storage.
*/
get getSettingsSchema() {
private get getSettingsSchema() {
return [
query('key').optional().trim().escape(),
query('group').optional().trim().escape(),
];
}
/**
* Observes application configuration option, whether all options configured
* sets `app_configured` option.
* @param {Setting} settings
*/
observeAppConfigsComplete(settings) {
if (!settings.get('app_configured', false)) {
const definedOptions = getDefinedOptions();
const isNotConfigured = definedOptions.some((option) => {
const isDefined = isDefinedOptionConfigurable(option.key, option.group);
const hasStoredOption = settings.get({ key: option.key, group: option.group });
return (isDefined && !hasStoredOption);
});
if (!isNotConfigured) {
settings.set('app_configured', true);
}
}
}
/**
* Saves the given options to the storage.
* @param {Request} req -
* @param {Response} res -
*/
async saveSettings(req: Request, res: Response) {
public async saveSettings(req: Request, res: Response, next) {
const { Option } = req.models;
const optionsDTO: IOptionsDTO = this.matchedBodyData(req);
const { settings } = req;
@@ -100,15 +79,17 @@ export default class SettingsController extends BaseController{
optionsDTO.options.forEach((option: IOptionDTO) => {
settings.set({ ...option });
});
this.observeAppConfigsComplete(settings);
try {
await settings.save();
await settings.save();
return res.status(200).send({
type: 'success',
code: 'OPTIONS.SAVED.SUCCESSFULLY',
message: 'Options have been saved successfully.',
});
return res.status(200).send({
type: 'success',
code: 'OPTIONS.SAVED.SUCCESSFULLY',
message: 'Options have been saved successfully.',
});
} catch (error) {
next(error);
}
}
/**
@@ -116,7 +97,7 @@ export default class SettingsController extends BaseController{
* @param {Request} req
* @param {Response} res
*/
getSettings(req: Request, res: Response) {
public getSettings(req: Request, res: Response) {
const { settings } = req;
const allSettings = settings.all();

102
server/src/api/controllers/Setup.ts Normal file
View File

@@ -0,0 +1,102 @@
import { Router, Request, Response, NextFunction } from 'express';
import { check, ValidationChain } from 'express-validator';
import BaseController from './BaseController';
import SetupService from 'services/Setup/SetupService';
import { Inject, Service } from 'typedi';
import { IOrganizationSetupDTO } from 'interfaces';
import { ServiceError } from 'exceptions';
// Middlewares
import JWTAuth from 'api/middleware/jwtAuth';
import AttachCurrentTenantUser from 'api/middleware/AttachCurrentTenantUser';
import SubscriptionMiddleware from 'api/middleware/SubscriptionMiddleware';
import TenancyMiddleware from 'api/middleware/TenancyMiddleware';
import EnsureTenantIsInitialized from 'api/middleware/EnsureTenantIsInitialized';
import SettingsMiddleware from 'api/middleware/SettingsMiddleware';
@Service()
export default class SetupController extends BaseController {
@Inject()
setupService: SetupService;
router() {
const router = Router('/setup');
router.use(JWTAuth);
router.use(AttachCurrentTenantUser);
router.use(TenancyMiddleware);
router.use(SubscriptionMiddleware('main'));
router.use(EnsureTenantIsInitialized);
router.use(SettingsMiddleware);
router.post(
'/organization',
this.organizationSetupSchema,
this.validationResult,
this.asyncMiddleware(this.organizationSetup.bind(this)),
this.handleServiceErrors
);
return router;
}
/**
* Organization setup schema.
*/
private get organizationSetupSchema(): ValidationChain[] {
return [
check('organization_name').exists().trim(),
check('base_currency').exists(),
check('time_zone').exists(),
check('fiscal_year').exists(),
check('industry').optional(),
];
}
/**
* Organization setup.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @returns
*/
async organizationSetup(req: Request, res: Response, next: NextFunction) {
const { tenantId } = req;
const setupDTO: IOrganizationSetupDTO = this.matchedBodyData(req);
try {
await this.setupService.organizationSetup(tenantId, setupDTO);
return res.status(200).send({
message: 'The setup settings set successfully.',
});
} catch (error) {
next(error);
}
}
/**
* Handles service errors.
* @param {Error} error
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
*/
handleServiceErrors(
error: Error,
req: Request,
res: Response,
next: NextFunction
) {
if (error instanceof ServiceError) {
if (error.errorType === 'TENANT_IS_ALREADY_SETUPED') {
return res.status(400).send({
errors: [{ type: 'TENANT_IS_ALREADY_SETUPED', code: 1000 }],
});
}
if (error.errorType === 'BASE_CURRENCY_INVALID') {
return res.status(400).send({
errors: [{ type: 'BASE_CURRENCY_INVALID', code: 110 }],
});
}
}
next(error);
}
}

20
server/src/api/index.ts
View File

@@ -40,6 +40,8 @@ import Subscription from 'api/controllers/Subscription';
import Licenses from 'api/controllers/Subscription/Licenses';
import InventoryAdjustments from 'api/controllers/Inventory/InventoryAdjustments';
import Setup from 'api/controllers/Setup';
export default () => {
const app = Router();
@@ -53,22 +55,7 @@ export default () => {
app.use('/subscription', Container.get(Subscription).router());
app.use('/organization', Container.get(Organization).router());
app.use('/ping', Container.get(Ping).router());
// - Settings routes.
// ---------------------------
const settings = Router();
settings.use(JWTAuth);
settings.use(AttachCurrentTenantUser);
settings.use(TenancyMiddleware);
settings.use(SubscriptionMiddleware('main'));
settings.use(EnsureTenantIsInitialized);
settings.use(SettingsMiddleware);
settings.use('/', Container.get(Settings).router());
app.use('/settings', settings);
app.use('/setup', Container.get(Setup).router());
// - Dashboard routes.
// ---------------------------
const dashboard = Router();
@@ -86,6 +73,7 @@ export default () => {
dashboard.use('/users', Container.get(Users).router());
dashboard.use('/invite', Container.get(InviteUsers).authRouter());
dashboard.use('/currencies', Container.get(Currencies).router());
dashboard.use('/settings', Container.get(Settings).router());
dashboard.use('/accounts', Container.get(Accounts).router());
dashboard.use('/account_types', Container.get(AccountTypes).router());
dashboard.use('/manual-journals', Container.get(ManualJournals).router());