QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-21 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2026-01-12 01:04:28 +02:00
parent 16f1d57279
commit 3c1273becb
32 changed files with 180 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/server/src/modules/Accounts/Accounts.controller.ts
View File

@@ -8,6 +8,7 @@ import {
Query, Query,
ParseIntPipe, ParseIntPipe,
Put, Put,
HttpCode,
} from '@nestjs/common'; } from '@nestjs/common';
import { AccountsApplication } from './AccountsApplication.service'; import { AccountsApplication } from './AccountsApplication.service';
import { CreateAccountDTO } from './CreateAccount.dto'; import { CreateAccountDTO } from './CreateAccount.dto';
@@ -43,6 +44,7 @@ export class AccountsController {
constructor(private readonly accountsApplication: AccountsApplication) { } constructor(private readonly accountsApplication: AccountsApplication) { }
@Post('validate-bulk-delete') @Post('validate-bulk-delete')
@HttpCode(200)
@ApiOperation({ @ApiOperation({
summary: summary:
'Validates which accounts can be deleted and returns counts of deletable and non-deletable accounts.', 'Validates which accounts can be deleted and returns counts of deletable and non-deletable accounts.',
@@ -64,6 +66,7 @@ export class AccountsController {
} }
@Post('bulk-delete') @Post('bulk-delete')
@HttpCode(200)
@ApiOperation({ summary: 'Deletes multiple accounts in bulk.' }) @ApiOperation({ summary: 'Deletes multiple accounts in bulk.' })
@ApiResponse({ @ApiResponse({
status: 200, status: 200,
@@ -125,6 +128,7 @@ export class AccountsController {
} }
@Post(':id/activate') @Post(':id/activate')
@HttpCode(200)
@ApiOperation({ summary: 'Activate the given account.' }) @ApiOperation({ summary: 'Activate the given account.' })
@ApiResponse({ @ApiResponse({
status: 200, status: 200,
@@ -142,6 +146,7 @@ export class AccountsController {
} }
@Post(':id/inactivate') @Post(':id/inactivate')
@HttpCode(200)
@ApiOperation({ summary: 'Inactivate the given account.' }) @ApiOperation({ summary: 'Inactivate the given account.' })
@ApiResponse({ @ApiResponse({
status: 200, status: 200,

7
packages/server/src/modules/Accounts/DeleteAccount.service.ts
View File

@@ -18,7 +18,7 @@ export class DeleteAccount {
private eventEmitter: EventEmitter2, private eventEmitter: EventEmitter2,
private uow: UnitOfWork, private uow: UnitOfWork,
private validator: CommandAccountValidators, private validator: CommandAccountValidators,
) {} ) { }
/** /**
* Authorize account delete. * Authorize account delete.
@@ -57,7 +57,10 @@ export class DeleteAccount {
trx?: Knex.Transaction, trx?: Knex.Transaction,
): Promise<void> => { ): Promise<void> => {
// Retrieve account or not found service error. // Retrieve account or not found service error.
const oldAccount = await this.accountModel().query().findById(accountId); const oldAccount = await this.accountModel()
.query()
.findById(accountId)
.throwIfNotFound();
// Authorize before delete account. // Authorize before delete account.
await this.authorize(accountId, oldAccount); await this.authorize(accountId, oldAccount);

6
packages/server/src/modules/Contacts/Contacts.controller.ts
View File

@@ -3,7 +3,7 @@ import {
Get, Get,
Query, Query,
Param, Param,
Post, Patch,
ParseIntPipe, ParseIntPipe,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiParam } from '@nestjs/swagger'; import { ApiTags, ApiOperation, ApiParam } from '@nestjs/swagger';
@@ -27,7 +27,7 @@ export class ContactsController {
return this.getAutoCompleteService.autocompleteContacts(query); return this.getAutoCompleteService.autocompleteContacts(query);
} }
@Post(':id/activate') @Patch(':id/activate')
@ApiOperation({ summary: 'Activate a contact' }) @ApiOperation({ summary: 'Activate a contact' })
@ApiParam({ name: 'id', type: 'number', description: 'Contact ID' }) @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
async activateContact(@Param('id', ParseIntPipe) contactId: number) { async activateContact(@Param('id', ParseIntPipe) contactId: number) {
@@ -35,7 +35,7 @@ export class ContactsController {
return { id: contactId, activated: true }; return { id: contactId, activated: true };
} }
@Post(':id/inactivate') @Patch(':id/inactivate')
@ApiOperation({ summary: 'Inactivate a contact' }) @ApiOperation({ summary: 'Inactivate a contact' })
@ApiParam({ name: 'id', type: 'number', description: 'Contact ID' }) @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
async inactivateContact(@Param('id', ParseIntPipe) contactId: number) { async inactivateContact(@Param('id', ParseIntPipe) contactId: number) {

11
packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts
View File

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
@ApiTags('Reports') @ApiTags('Reports')
@ApiCommonHeaders() @ApiCommonHeaders()
export class APAgingSummaryController { export class APAgingSummaryController {
constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) {} constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) { }
@Get() @Get()
@ApiOperation({ summary: 'Get payable aging summary' }) @ApiOperation({ summary: 'Get payable aging summary' })
@@ -37,12 +37,13 @@ export class APAgingSummaryController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.APAgingSummaryApp.table(filter); return this.APAgingSummaryApp.table(filter);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const csv = await this.APAgingSummaryApp.csv(filter); const csv = await this.APAgingSummaryApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class APAgingSummaryController {
res.send(csv); res.send(csv);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.APAgingSummaryApp.xlsx(filter); const buffer = await this.APAgingSummaryApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class APAgingSummaryController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.APAgingSummaryApp.pdf(filter); const pdfContent = await this.APAgingSummaryApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts
View File

@@ -38,8 +38,9 @@ export class ARAgingSummaryController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the xlsx format. // Retrieves the xlsx format.
if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.ARAgingSummaryApp.xlsx(filter); const buffer = await this.ARAgingSummaryApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -49,11 +50,11 @@ export class ARAgingSummaryController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the table format. // Retrieves the table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.ARAgingSummaryApp.table(filter); return this.ARAgingSummaryApp.table(filter);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.ARAgingSummaryApp.csv(filter); const buffer = await this.ARAgingSummaryApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -61,7 +62,7 @@ export class ARAgingSummaryController {
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.ARAgingSummaryApp.pdf(filter); const pdfContent = await this.ARAgingSummaryApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts
View File

@@ -43,13 +43,14 @@ export class BalanceSheetStatementController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
const table = await this.balanceSheetApp.table(query); const table = await this.balanceSheetApp.table(query);
return table; return table;
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.balanceSheetApp.csv(query); const buffer = await this.balanceSheetApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -57,7 +58,7 @@ export class BalanceSheetStatementController {
res.send(buffer); res.send(buffer);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.balanceSheetApp.xlsx(query); const buffer = await this.balanceSheetApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -67,7 +68,7 @@ export class BalanceSheetStatementController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.balanceSheetApp.pdf(query); const pdfContent = await this.balanceSheetApp.pdf(query);
res.set({ res.set({

11
packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts
View File

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
@ApiTags('Reports') @ApiTags('Reports')
@ApiCommonHeaders() @ApiCommonHeaders()
export class CashflowController { export class CashflowController {
constructor(private readonly cashflowSheetApp: CashflowSheetApplication) {} constructor(private readonly cashflowSheetApp: CashflowSheetApplication) { }
@Get() @Get()
@ApiResponse({ @ApiResponse({
@@ -37,11 +37,12 @@ export class CashflowController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.cashflowSheetApp.table(query); return this.cashflowSheetApp.table(query);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.cashflowSheetApp.csv(query); const buffer = await this.cashflowSheetApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class CashflowController {
res.status(200).send(buffer); res.status(200).send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.cashflowSheetApp.xlsx(query); const buffer = await this.cashflowSheetApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class CashflowController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.cashflowSheetApp.pdf(query); const pdfContent = await this.cashflowSheetApp.pdf(query);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts
View File

@@ -34,8 +34,9 @@ export class CustomerBalanceSummaryController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the xlsx format. // Retrieves the xlsx format.
if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.customerBalanceSummaryApp.xlsx(filter); const buffer = await this.customerBalanceSummaryApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
res.setHeader( res.setHeader(
@@ -44,18 +45,18 @@ export class CustomerBalanceSummaryController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.customerBalanceSummaryApp.csv(filter); const buffer = await this.customerBalanceSummaryApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
res.setHeader('Content-Type', 'text/csv'); res.setHeader('Content-Type', 'text/csv');
res.send(buffer); res.send(buffer);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.customerBalanceSummaryApp.table(filter); return this.customerBalanceSummaryApp.table(filter);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const buffer = await this.customerBalanceSummaryApp.pdf(filter); const buffer = await this.customerBalanceSummaryApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts
View File

@@ -39,11 +39,12 @@ export class GeneralLedgerController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the table format. // Retrieves the table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.generalLedgerApplication.table(query); return this.generalLedgerApplication.table(query);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.generalLedgerApplication.csv(query); const buffer = await this.generalLedgerApplication.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -51,7 +52,7 @@ export class GeneralLedgerController {
res.send(buffer); res.send(buffer);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.generalLedgerApplication.xlsx(query); const buffer = await this.generalLedgerApplication.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -61,7 +62,7 @@ export class GeneralLedgerController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.generalLedgerApplication.pdf(query); const pdfContent = await this.generalLedgerApplication.pdf(query);
res.set({ res.set({
'Content-Type': 'application/pdf', 'Content-Type': 'application/pdf',

9
packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts
View File

@@ -21,7 +21,8 @@ export class InventoryItemDetailsController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
if (acceptHeader.includes(AcceptType.ApplicationCsv)) { const accept = acceptHeader || '';
if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.inventoryItemDetailsApp.csv(query); const buffer = await this.inventoryItemDetailsApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -29,7 +30,7 @@ export class InventoryItemDetailsController {
res.send(buffer); res.send(buffer);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.inventoryItemDetailsApp.xlsx(query); const buffer = await this.inventoryItemDetailsApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -39,10 +40,10 @@ export class InventoryItemDetailsController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.inventoryItemDetailsApp.table(query); return this.inventoryItemDetailsApp.table(query);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const buffer = await this.inventoryItemDetailsApp.pdf(query); const buffer = await this.inventoryItemDetailsApp.pdf(query);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts
View File

@@ -37,11 +37,12 @@ export class InventoryValuationController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.inventoryValuationApp.table(query); return this.inventoryValuationApp.table(query);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.inventoryValuationApp.csv(query); const buffer = await this.inventoryValuationApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class InventoryValuationController {
res.send(buffer); res.send(buffer);
// Retrieves the xslx buffer format. // Retrieves the xslx buffer format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.inventoryValuationApp.xlsx(query); const buffer = await this.inventoryValuationApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class InventoryValuationController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.inventoryValuationApp.pdf(query); const pdfContent = await this.inventoryValuationApp.pdf(query);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts
View File

@@ -37,12 +37,13 @@ export class JournalSheetController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.journalSheetApp.table(query); return this.journalSheetApp.table(query);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.journalSheetApp.csv(query); const buffer = await this.journalSheetApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class JournalSheetController {
res.send(buffer); res.send(buffer);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.journalSheetApp.xlsx(query); const buffer = await this.journalSheetApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class JournalSheetController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the json format. // Retrieves the json format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.journalSheetApp.pdf(query); const pdfContent = await this.journalSheetApp.pdf(query);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts
View File

@@ -45,8 +45,9 @@ export class ProfitLossSheetController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the csv format. // Retrieves the csv format.
if (acceptHeader.includes(AcceptType.ApplicationCsv)) { if (accept.includes(AcceptType.ApplicationCsv)) {
const sheet = await this.profitLossSheetApp.csv(query); const sheet = await this.profitLossSheetApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -54,11 +55,11 @@ export class ProfitLossSheetController {
res.send(sheet); res.send(sheet);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.profitLossSheetApp.table(query); return this.profitLossSheetApp.table(query);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const sheet = await this.profitLossSheetApp.xlsx(query); const sheet = await this.profitLossSheetApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -68,7 +69,7 @@ export class ProfitLossSheetController {
); );
res.send(sheet); res.send(sheet);
// Retrieves the json format. // Retrieves the json format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.profitLossSheetApp.pdf(query); const pdfContent = await this.profitLossSheetApp.pdf(query);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts
View File

@@ -22,11 +22,12 @@ export class PurchasesByItemReportController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// JSON table response format. // JSON table response format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.purchasesByItemsApp.table(filter); return this.purchasesByItemsApp.table(filter);
// CSV response format. // CSV response format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.purchasesByItemsApp.csv(filter); const buffer = await this.purchasesByItemsApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -34,7 +35,7 @@ export class PurchasesByItemReportController {
res.send(buffer); res.send(buffer);
// Xlsx response format. // Xlsx response format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.purchasesByItemsApp.xlsx(filter); const buffer = await this.purchasesByItemsApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -44,7 +45,7 @@ export class PurchasesByItemReportController {
); );
res.send(buffer); res.send(buffer);
// PDF response format. // PDF response format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.purchasesByItemsApp.pdf(filter); const pdfContent = await this.purchasesByItemsApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts
View File

@@ -31,8 +31,9 @@ export class SalesByItemsController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the csv format. // Retrieves the csv format.
if (acceptHeader.includes(AcceptType.ApplicationCsv)) { if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.salesByItemsApp.csv(filter); const buffer = await this.salesByItemsApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -40,10 +41,10 @@ export class SalesByItemsController {
res.send(buffer); res.send(buffer);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.salesByItemsApp.table(filter); return this.salesByItemsApp.table(filter);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = this.salesByItemsApp.xlsx(filter); const buffer = this.salesByItemsApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -53,7 +54,7 @@ export class SalesByItemsController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the json format. // Retrieves the json format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.salesByItemsApp.pdf(filter); const pdfContent = await this.salesByItemsApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts
View File

@@ -37,11 +37,12 @@ export class SalesTaxLiabilitySummaryController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.salesTaxLiabilitySummaryApp.table(query); return this.salesTaxLiabilitySummaryApp.table(query);
// Retrieves the xlsx format. // Retrieves the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(query); const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -51,14 +52,14 @@ export class SalesTaxLiabilitySummaryController {
); );
res.send(buffer); res.send(buffer);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.salesTaxLiabilitySummaryApp.csv(query); const buffer = await this.salesTaxLiabilitySummaryApp.csv(query);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
res.setHeader('Content-Type', 'text/csv'); res.setHeader('Content-Type', 'text/csv');
res.send(buffer); res.send(buffer);
// Retrieves the json format. // Retrieves the json format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(query); const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(query);
res.set({ res.set({
'Content-Type': 'application/pdf', 'Content-Type': 'application/pdf',

17
packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryRepository.ts
View File

@@ -9,17 +9,18 @@ import { TaxRateModel } from '@/modules/TaxRates/models/TaxRate.model';
import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model'; import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model';
import { Account } from '@/modules/Accounts/models/Account.model'; import { Account } from '@/modules/Accounts/models/Account.model';
import { ModelObject } from 'objection'; import { ModelObject } from 'objection';
import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
@Injectable({ scope: Scope.TRANSIENT }) @Injectable({ scope: Scope.TRANSIENT })
export class SalesTaxLiabilitySummaryRepository { export class SalesTaxLiabilitySummaryRepository {
@Inject(TaxRateModel.name) @Inject(TaxRateModel.name)
private readonly taxRateModel: typeof TaxRateModel; private readonly taxRateModel: TenantModelProxy<typeof TaxRateModel>;
@Inject(AccountTransaction.name) @Inject(AccountTransaction.name)
private readonly accountTransactionModel: typeof AccountTransaction; private readonly accountTransactionModel: TenantModelProxy<typeof AccountTransaction>;
@Inject(Account.name) @Inject(Account.name)
private readonly accountModel: typeof Account; private readonly accountModel: TenantModelProxy<typeof Account>;
/** /**
* @param {SalesTaxLiabilitySummarySalesById} * @param {SalesTaxLiabilitySummarySalesById}
@@ -77,7 +78,7 @@ export class SalesTaxLiabilitySummaryRepository {
* @returns {Promise<TaxRate[]>} * @returns {Promise<TaxRate[]>}
*/ */
public getTaxRates = () => { public getTaxRates = () => {
return this.taxRateModel.query().orderBy('name', 'desc'); return this.taxRateModel().query().orderBy('name', 'desc');
}; };
/** /**
@@ -86,13 +87,13 @@ export class SalesTaxLiabilitySummaryRepository {
*/ */
public async getTaxesPayableSumGroupedByRateId(): Promise<SalesTaxLiabilitySummaryPayableById> { public async getTaxesPayableSumGroupedByRateId(): Promise<SalesTaxLiabilitySummaryPayableById> {
// Retrieves tax payable accounts. // Retrieves tax payable accounts.
const taxPayableAccounts = await this.accountModel const taxPayableAccounts = await this.accountModel()
.query() .query()
.whereIn('accountType', [ACCOUNT_TYPE.TAX_PAYABLE]); .whereIn('accountType', [ACCOUNT_TYPE.TAX_PAYABLE]);
const payableAccountsIds = taxPayableAccounts.map((account) => account.id); const payableAccountsIds = taxPayableAccounts.map((account) => account.id);
const groupedTaxesById = await this.accountTransactionModel const groupedTaxesById = await this.accountTransactionModel()
.query() .query()
.whereIn('account_id', payableAccountsIds) .whereIn('account_id', payableAccountsIds)
.whereNot('tax_rate_id', null) .whereNot('tax_rate_id', null)
@@ -110,7 +111,7 @@ export class SalesTaxLiabilitySummaryRepository {
*/ */
public taxesSalesSumGroupedByRateId = public taxesSalesSumGroupedByRateId =
async (): Promise<SalesTaxLiabilitySummarySalesById> => { async (): Promise<SalesTaxLiabilitySummarySalesById> => {
const incomeAccounts = await this.accountModel const incomeAccounts = await this.accountModel()
.query() .query()
.whereIn('accountType', [ .whereIn('accountType', [
ACCOUNT_TYPE.INCOME, ACCOUNT_TYPE.INCOME,
@@ -118,7 +119,7 @@ export class SalesTaxLiabilitySummaryRepository {
]); ]);
const incomeAccountsIds = incomeAccounts.map((account) => account.id); const incomeAccountsIds = incomeAccounts.map((account) => account.id);
const groupedTaxesById = await this.accountTransactionModel const groupedTaxesById = await this.accountTransactionModel()
.query() .query()
.whereIn('account_id', incomeAccountsIds) .whereIn('account_id', incomeAccountsIds)
.whereNot('tax_rate_id', null) .whereNot('tax_rate_id', null)

9
packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts
View File

@@ -23,12 +23,13 @@ export class TransactionsByCustomerController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the json table format. // Retrieves the json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.transactionsByCustomersApp.table(filter); return this.transactionsByCustomersApp.table(filter);
// Retrieve the csv format. // Retrieve the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const csv = await this.transactionsByCustomersApp.csv(filter); const csv = await this.transactionsByCustomersApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -37,7 +38,7 @@ export class TransactionsByCustomerController {
res.send(csv); res.send(csv);
// Retrieve the xlsx format. // Retrieve the xlsx format.
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.transactionsByCustomersApp.xlsx(filter); const buffer = await this.transactionsByCustomersApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
res.setHeader( res.setHeader(
@@ -47,7 +48,7 @@ export class TransactionsByCustomerController {
res.send(buffer); res.send(buffer);
// Retrieve the json format. // Retrieve the json format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.transactionsByCustomersApp.pdf(filter); const pdfContent = await this.transactionsByCustomersApp.pdf(filter);
res.set({ res.set({
'Content-Type': 'application/pdf', 'Content-Type': 'application/pdf',

1
packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReferenceRepository.ts
View File

@@ -24,6 +24,7 @@ export class TransactionsByReferenceRepository {
): Promise<Array<ModelObject<AccountTransaction>>> { ): Promise<Array<ModelObject<AccountTransaction>>> {
return this.accountTransactionModel() return this.accountTransactionModel()
.query() .query()
.skipUndefined()
.where('reference_id', referenceId) .where('reference_id', referenceId)
.where('reference_type', referenceType) .where('reference_type', referenceType)
.withGraphFetched('account'); .withGraphFetched('account');

9
packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts
View File

@@ -23,8 +23,9 @@ export class TransactionsByVendorController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the xlsx format. // Retrieves the xlsx format.
if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.transactionsByVendorsApp.xlsx(filter); const buffer = await this.transactionsByVendorsApp.xlsx(filter);
res.setHeader('Content-Type', 'application/vnd.openxmlformats'); res.setHeader('Content-Type', 'application/vnd.openxmlformats');
@@ -32,7 +33,7 @@ export class TransactionsByVendorController {
res.send(buffer); res.send(buffer);
// Retrieves the csv format. // Retrieves the csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.transactionsByVendorsApp.csv(filter); const buffer = await this.transactionsByVendorsApp.csv(filter);
res.setHeader('Content-Type', 'text/csv'); res.setHeader('Content-Type', 'text/csv');
@@ -40,10 +41,10 @@ export class TransactionsByVendorController {
res.send(buffer); res.send(buffer);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.transactionsByVendorsApp.table(filter); return this.transactionsByVendorsApp.table(filter);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.transactionsByVendorsApp.pdf(filter); const pdfContent = await this.transactionsByVendorsApp.pdf(filter);
res.set({ res.set({
'Content-Type': 'application/pdf', 'Content-Type': 'application/pdf',

9
packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts
View File

@@ -40,15 +40,16 @@ export class TrialBalanceSheetController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
const filter = { const filter = {
...query, ...query,
accountIds: castArray(query.accountIds), accountIds: castArray(query.accountIds),
}; };
// Retrieves in json table format. // Retrieves in json table format.
if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.trialBalanceSheetApp.table(filter); return this.trialBalanceSheetApp.table(filter);
// Retrieves in xlsx format // Retrieves in xlsx format
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.trialBalanceSheetApp.xlsx(filter); const buffer = await this.trialBalanceSheetApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -58,7 +59,7 @@ export class TrialBalanceSheetController {
); );
res.send(buffer); res.send(buffer);
// Retrieves in csv format. // Retrieves in csv format.
} else if (acceptHeader.includes(AcceptType.ApplicationCsv)) { } else if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.trialBalanceSheetApp.csv(filter); const buffer = await this.trialBalanceSheetApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -66,7 +67,7 @@ export class TrialBalanceSheetController {
res.send(buffer); res.send(buffer);
// Retrieves in pdf format. // Retrieves in pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.trialBalanceSheetApp.pdf(filter); const pdfContent = await this.trialBalanceSheetApp.pdf(filter);
res.set({ res.set({

9
packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts
View File

@@ -35,15 +35,16 @@ export class VendorBalanceSummaryController {
@Res({ passthrough: true }) res: Response, @Res({ passthrough: true }) res: Response,
@Headers('accept') acceptHeader: string, @Headers('accept') acceptHeader: string,
) { ) {
const accept = acceptHeader || '';
// Retrieves the csv format. // Retrieves the csv format.
if (acceptHeader.includes(AcceptType.ApplicationCsv)) { if (accept.includes(AcceptType.ApplicationCsv)) {
const buffer = await this.vendorBalanceSummaryApp.csv(filter); const buffer = await this.vendorBalanceSummaryApp.csv(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
res.setHeader('Content-Type', 'text/csv'); res.setHeader('Content-Type', 'text/csv');
res.send(buffer); res.send(buffer);
} else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) { } else if (accept.includes(AcceptType.ApplicationXlsx)) {
const buffer = await this.vendorBalanceSummaryApp.xlsx(filter); const buffer = await this.vendorBalanceSummaryApp.xlsx(filter);
res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -52,10 +53,10 @@ export class VendorBalanceSummaryController {
res.send(buffer); res.send(buffer);
// Retrieves the json table format. // Retrieves the json table format.
} else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) { } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
return this.vendorBalanceSummaryApp.table(filter); return this.vendorBalanceSummaryApp.table(filter);
// Retrieves the pdf format. // Retrieves the pdf format.
} else if (acceptHeader.includes(AcceptType.ApplicationPdf)) { } else if (accept.includes(AcceptType.ApplicationPdf)) {
const pdfContent = await this.vendorBalanceSummaryApp.pdf(filter); const pdfContent = await this.vendorBalanceSummaryApp.pdf(filter);
res.set({ res.set({

2
packages/server/src/modules/Items/DeleteItem.service.ts
View File

@@ -25,7 +25,7 @@ export class DeleteItemService {
@Inject(Item.name) @Inject(Item.name)
private readonly itemModel: TenantModelProxy<typeof Item>, private readonly itemModel: TenantModelProxy<typeof Item>,
) {} ) { }
/** /**
* Delete the given item from the storage. * Delete the given item from the storage.

15
packages/server/src/modules/Items/Item.controller.ts
View File

@@ -8,6 +8,7 @@ import {
Get, Get,
Put, Put,
Query, Query,
HttpCode,
} from '@nestjs/common'; } from '@nestjs/common';
import { TenantController } from '../Tenancy/Tenant.controller'; import { TenantController } from '../Tenancy/Tenant.controller';
import { ItemsApplicationService } from './ItemsApplication.service'; import { ItemsApplicationService } from './ItemsApplication.service';
@@ -156,9 +157,10 @@ export class ItemsController extends TenantController {
async editItem( async editItem(
@Param('id') id: string, @Param('id') id: string,
@Body() editItemDto: EditItemDto, @Body() editItemDto: EditItemDto,
): Promise<number> { ): Promise<{ id: number; message: string }> {
const itemId = parseInt(id, 10); const itemId = parseInt(id, 10);
return this.itemsApplication.editItem(itemId, editItemDto); await this.itemsApplication.editItem(itemId, editItemDto);
return { id: itemId, message: 'The item has been successfully updated.' };
} }
@Post() @Post()
@@ -168,8 +170,12 @@ export class ItemsController extends TenantController {
description: 'The item has been successfully created.', description: 'The item has been successfully created.',
}) })
// @UsePipes(new ZodValidationPipe(createItemSchema)) // @UsePipes(new ZodValidationPipe(createItemSchema))
async createItem(@Body() createItemDto: CreateItemDto): Promise<number> { async createItem(
return this.itemsApplication.createItem(createItemDto); @Body() createItemDto: CreateItemDto,
): Promise<{ id: number; message: string }> {
const itemId = await this.itemsApplication.createItem(createItemDto);
return { id: itemId, message: 'The item has been successfully created.' };
} }
@Delete(':id') @Delete(':id')
@@ -347,6 +353,7 @@ export class ItemsController extends TenantController {
} }
@Post('validate-bulk-delete') @Post('validate-bulk-delete')
@HttpCode(200)
@ApiOperation({ @ApiOperation({
summary: summary:
'Validates which items can be deleted and returns counts of deletable and non-deletable items.', 'Validates which items can be deleted and returns counts of deletable and non-deletable items.',

6
packages/server/src/modules/Items/ItemsEntries.service.ts
View File

@@ -28,7 +28,7 @@ export class ItemsEntriesService {
@Inject(ItemEntry.name) @Inject(ItemEntry.name)
private readonly itemEntryModel: TenantModelProxy<typeof ItemEntry>, private readonly itemEntryModel: TenantModelProxy<typeof ItemEntry>,
) {} ) { }
/** /**
* Retrieve the inventory items entries of the reference id and type. * Retrieve the inventory items entries of the reference id and type.
@@ -226,6 +226,10 @@ export class ItemsEntriesService {
return entries.map((entry) => { return entries.map((entry) => {
const item = items.find((i) => i.id === entry.itemId); const item = items.find((i) => i.id === entry.itemId);
if (!item) {
throw new Error(`Item with id ${entry.itemId} not found`);
}
return { return {
...entry, ...entry,
sellAccountId: entry.sellAccountId || item.sellAccountId, sellAccountId: entry.sellAccountId || item.sellAccountId,

39
packages/server/test/accounts.e2e-spec.ts
View File

@@ -7,12 +7,12 @@ import {
} from './init-app-test'; } from './init-app-test';
const makeAccountRequest = () => ({ const makeAccountRequest = () => ({
name: faker.finance.accountName(), name: `${faker.finance.accountName()} ${Date.now()}-${faker.string.alphanumeric({ length: 4 })}`,
accountType: 'asset', accountType: 'cash',
code: faker.string.alphanumeric({ length: 6 }).toUpperCase(), code: faker.string.alphanumeric({ length: 6 }).toUpperCase(),
}); });
describe('Accounts (e2e)', () => { describe.only('Accounts (e2e)', () => {
it('/accounts (POST)', () => { it('/accounts (POST)', () => {
return request(app.getHttpServer()) return request(app.getHttpServer())
.post('/accounts') .post('/accounts')
@@ -35,7 +35,9 @@ describe('Accounts (e2e)', () => {
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId = response.body.id; const accountId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
@@ -50,17 +52,15 @@ describe('Accounts (e2e)', () => {
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId = response.body.id; const accountId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
.put(`/accounts/${accountId}`) .put(`/accounts/${accountId}`)
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send({ .send(makeAccountRequest())
name: faker.finance.accountName(),
accountType: 'asset',
})
.expect(200); .expect(200);
}); });
@@ -69,7 +69,8 @@ describe('Accounts (e2e)', () => {
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId = response.body.id; const accountId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
@@ -87,7 +88,8 @@ describe('Accounts (e2e)', () => {
.send({ .send({
...makeAccountRequest(), ...makeAccountRequest(),
active: false, active: false,
}); })
.expect(201);
const accountId = response.body.id; const accountId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
@@ -105,7 +107,8 @@ describe('Accounts (e2e)', () => {
.send({ .send({
...makeAccountRequest(), ...makeAccountRequest(),
active: true, active: true,
}); })
.expect(201);
const accountId = response.body.id; const accountId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
@@ -128,14 +131,16 @@ describe('Accounts (e2e)', () => {
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId1 = response1.body.id; const accountId1 = response1.body.id;
const response2 = await request(app.getHttpServer()) const response2 = await request(app.getHttpServer())
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId2 = response2.body.id; const accountId2 = response2.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())
@@ -153,14 +158,16 @@ describe('Accounts (e2e)', () => {
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId1 = response1.body.id; const accountId1 = response1.body.id;
const response2 = await request(app.getHttpServer()) const response2 = await request(app.getHttpServer())
.post('/accounts') .post('/accounts')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeAccountRequest()); .send(makeAccountRequest())
.expect(201);
const accountId2 = response2.body.id; const accountId2 = response2.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())

28
packages/server/test/banking-accounts.e2e-spec.ts
View File

@@ -2,19 +2,19 @@ import * as request from 'supertest';
import { app, AuthorizationHeader, orgainzationId } from './init-app-test'; import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
describe('Banking Accounts (e2e)', () => { describe('Banking Accounts (e2e)', () => {
it('/banking/accounts (GET)', () => { // it('/banking/accounts (GET)', () => {
return request(app.getHttpServer()) // return request(app.getHttpServer())
.get('/banking/accounts') // .get('/banking/accounts')
.set('organization-id', orgainzationId) // .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) // .set('Authorization', AuthorizationHeader)
.expect(200); // .expect(200);
}); // });
it('/banking/accounts/:bankAccountId/summary (GET)', () => { // it('/banking/accounts/:bankAccountId/summary (GET)', () => {
return request(app.getHttpServer()) // return request(app.getHttpServer())
.get('/banking/accounts/1/summary') // .get('/banking/accounts/1/summary')
.set('organization-id', orgainzationId) // .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) // .set('Authorization', AuthorizationHeader)
.expect(200); // .expect(200);
}); // });
}); });

8
packages/server/test/contacts.e2e-spec.ts
View File

@@ -32,17 +32,17 @@ describe('Contacts (e2e)', () => {
.expect(200); .expect(200);
}); });
it('/contacts/:id/activate (POST)', () => { it('/contacts/:id/activate (PATCH)', () => {
return request(app.getHttpServer()) return request(app.getHttpServer())
.post(`/contacts/${customerId}/activate`) .patch(`/contacts/${customerId}/activate`)
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.expect(200); .expect(200);
}); });
it('/contacts/:id/inactivate (POST)', () => { it('/contacts/:id/inactivate (PATCH)', () => {
return request(app.getHttpServer()) return request(app.getHttpServer())
.post(`/contacts/${vendorId}/inactivate`) .patch(`/contacts/${vendorId}/inactivate`)
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.expect(200); .expect(200);

10
packages/server/test/init-app-test.ts
View File

@@ -5,10 +5,10 @@ import { AppModule } from '../src/modules/App/App.module';
let app: INestApplication; let app: INestApplication;
const email = 'ahmed@sa1234dsad.com'; const email = 'big@big.com';
const password = '123123123'; const password = '123123123';
let orgainzationId = 'hpgpqfqom8zic574'; let orgainzationId = '';
let authenticationToken = ''; let authenticationToken = '';
let AuthorizationHeader = ''; let AuthorizationHeader = '';
@@ -22,11 +22,13 @@ beforeAll(async () => {
const signinResponse = await request(app.getHttpServer()) const signinResponse = await request(app.getHttpServer())
.post('/auth/signin') .post('/auth/signin')
.send({ email, password }) .send({ email, password });
.expect(201);
console.log(signinResponse.body);
authenticationToken = signinResponse.body.access_token; authenticationToken = signinResponse.body.access_token;
AuthorizationHeader = `Bearer ${authenticationToken}`; AuthorizationHeader = `Bearer ${authenticationToken}`;
orgainzationId = signinResponse.body.organization_id;
}); });
afterAll(async () => { afterAll(async () => {

5
packages/server/test/items.e2e-spec.ts
View File

@@ -12,12 +12,12 @@ const makeItemRequest = () => ({
type: 'service', type: 'service',
}); });
describe('Items (e2e)', () => { describe.only('Items (e2e)', () => {
it('/items (POST)', () => { it('/items (POST)', () => {
return request(app.getHttpServer()) return request(app.getHttpServer())
.post('/items') .post('/items')
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', `Bearer ${authenticationToken}`) .set('Authorization', AuthorizationHeader)
.send(makeItemRequest()) .send(makeItemRequest())
.expect(201); .expect(201);
}); });
@@ -28,6 +28,7 @@ describe('Items (e2e)', () => {
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send(makeItemRequest()); .send(makeItemRequest());
const itemId = response.body.id; const itemId = response.body.id;
return request(app.getHttpServer()) return request(app.getHttpServer())

2
packages/server/test/sale-invoices.e2e-spec.ts
View File

@@ -42,7 +42,7 @@ describe('Sale Invoices (e2e)', () => {
.set('organization-id', orgainzationId) .set('organization-id', orgainzationId)
.set('Authorization', AuthorizationHeader) .set('Authorization', AuthorizationHeader)
.send({ .send({
name: faker.commerce.productName(), name: `${faker.commerce.productName()} ${Date.now()}-${faker.string.alphanumeric({ length: 4 })}`,
sellable: true, sellable: true,
purchasable: true, purchasable: true,
sellAccountId: 1026, sellAccountId: 1026,

4
packages/webapp/src/hooks/query/contacts.tsx
View File

@@ -52,7 +52,7 @@ export function useActivateContact(props) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const apiRequest = useApiRequest(); const apiRequest = useApiRequest();
return useMutation((id) => apiRequest.post(`contacts/${id}/activate`), { return useMutation((id) => apiRequest.patch(`contacts/${id}/activate`), {
onSuccess: (res, id) => { onSuccess: (res, id) => {
// Invalidate specific contact. // Invalidate specific contact.
queryClient.invalidateQueries([t.CONTACT, id]); queryClient.invalidateQueries([t.CONTACT, id]);
@@ -71,7 +71,7 @@ export function useInactivateContact(props) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const apiRequest = useApiRequest(); const apiRequest = useApiRequest();
return useMutation((id) => apiRequest.post(`contacts/${id}/inactivate`), { return useMutation((id) => apiRequest.patch(`contacts/${id}/inactivate`), {
onSuccess: (res, id) => { onSuccess: (res, id) => {
// Invalidate specific item. // Invalidate specific item.
queryClient.invalidateQueries([t.CONTACT, id]); queryClient.invalidateQueries([t.CONTACT, id]);