mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-20 06:40:31 +00:00
fix(server): foreign currency in account transactions transformer
This commit is contained in:
@@ -177,7 +177,7 @@ export default class ItemsController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Validate list query schema.
|
* Validate list query schema.
|
||||||
*/
|
*/
|
||||||
get validateListQuerySchema() {
|
private get validateListQuerySchema() {
|
||||||
return [
|
return [
|
||||||
query('column_sort_by').optional().trim().escape(),
|
query('column_sort_by').optional().trim().escape(),
|
||||||
query('sort_order').optional().isIn(['desc', 'asc']),
|
query('sort_order').optional().isIn(['desc', 'asc']),
|
||||||
@@ -193,32 +193,20 @@ export default class ItemsController extends BaseController {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate autocomplete list query schema.
|
|
||||||
*/
|
|
||||||
get autocompleteQuerySchema() {
|
|
||||||
return [
|
|
||||||
query('column_sort_by').optional().trim().escape(),
|
|
||||||
query('sort_order').optional().isIn(['desc', 'asc']),
|
|
||||||
|
|
||||||
query('stringified_filter_roles').optional().isJSON(),
|
|
||||||
query('limit').optional().isNumeric().toInt(),
|
|
||||||
|
|
||||||
query('keyword').optional().isString().trim().escape(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores the given item details to the storage.
|
* Stores the given item details to the storage.
|
||||||
* @param {Request} req
|
* @param {Request} req
|
||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
*/
|
*/
|
||||||
async newItem(req: Request, res: Response, next: NextFunction) {
|
private async newItem(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const itemDTO: IItemDTO = this.matchedBodyData(req);
|
const itemDTO: IItemDTO = this.matchedBodyData(req);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const storedItem = await this.itemsApplication.createItem(tenantId, itemDTO);
|
const storedItem = await this.itemsApplication.createItem(
|
||||||
|
tenantId,
|
||||||
|
itemDTO
|
||||||
|
);
|
||||||
|
|
||||||
return res.status(200).send({
|
return res.status(200).send({
|
||||||
id: storedItem.id,
|
id: storedItem.id,
|
||||||
@@ -234,7 +222,7 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Request} req
|
* @param {Request} req
|
||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
*/
|
*/
|
||||||
async editItem(req: Request, res: Response, next: NextFunction) {
|
private async editItem(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const itemId: number = req.params.id;
|
const itemId: number = req.params.id;
|
||||||
const item: IItemDTO = this.matchedBodyData(req);
|
const item: IItemDTO = this.matchedBodyData(req);
|
||||||
@@ -257,7 +245,7 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async activateItem(req: Request, res: Response, next: NextFunction) {
|
private async activateItem(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const itemId: number = req.params.id;
|
const itemId: number = req.params.id;
|
||||||
|
|
||||||
@@ -279,7 +267,11 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async inactivateItem(req: Request, res: Response, next: NextFunction) {
|
private async inactivateItem(
|
||||||
|
req: Request,
|
||||||
|
res: Response,
|
||||||
|
next: NextFunction
|
||||||
|
) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const itemId: number = req.params.id;
|
const itemId: number = req.params.id;
|
||||||
|
|
||||||
@@ -300,7 +292,7 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Request} req
|
* @param {Request} req
|
||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
*/
|
*/
|
||||||
async deleteItem(req: Request, res: Response, next: NextFunction) {
|
private async deleteItem(req: Request, res: Response, next: NextFunction) {
|
||||||
const itemId: number = req.params.id;
|
const itemId: number = req.params.id;
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
|
|
||||||
@@ -322,7 +314,7 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @return {Response}
|
* @return {Response}
|
||||||
*/
|
*/
|
||||||
async getItem(req: Request, res: Response, next: NextFunction) {
|
private async getItem(req: Request, res: Response, next: NextFunction) {
|
||||||
const itemId: number = req.params.id;
|
const itemId: number = req.params.id;
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
|
|
||||||
@@ -342,7 +334,7 @@ export default class ItemsController extends BaseController {
|
|||||||
* @param {Request} req
|
* @param {Request} req
|
||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
*/
|
*/
|
||||||
async getItemsList(req: Request, res: Response, next: NextFunction) {
|
private async getItemsList(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ export enum AccountNormal {
|
|||||||
|
|
||||||
export interface IAccountsTransactionsFilter {
|
export interface IAccountsTransactionsFilter {
|
||||||
accountId?: number;
|
accountId?: number;
|
||||||
|
limit?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IAccountTransaction {
|
export interface IAccountTransaction {
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ export default class AccountTransactionTransformer extends Transformer {
|
|||||||
* @returns {string}
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
protected formattedFcCredit(transaction: IAccountTransaction) {
|
protected formattedFcCredit(transaction: IAccountTransaction) {
|
||||||
return this.formatMoney(this.fcDebit(transaction), {
|
return this.formatMoney(this.fcCredit(transaction), {
|
||||||
currencyCode: transaction.currencyCode,
|
currencyCode: transaction.currencyCode,
|
||||||
excerptZero: true,
|
excerptZero: true,
|
||||||
});
|
});
|
||||||
@@ -117,7 +117,7 @@ export default class AccountTransactionTransformer extends Transformer {
|
|||||||
* @returns {string}
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
protected formattedFcDebit(transaction: IAccountTransaction) {
|
protected formattedFcDebit(transaction: IAccountTransaction) {
|
||||||
return this.formatMoney(this.fcCredit(transaction), {
|
return this.formatMoney(this.fcDebit(transaction), {
|
||||||
currencyCode: transaction.currencyCode,
|
currencyCode: transaction.currencyCode,
|
||||||
excerptZero: true,
|
excerptZero: true,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user