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

fix(server): hotbug retireving empty results of inventory valuation and sales by items sheets

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-01-21 14:34:36 +02:00
parent d052c23560
commit abffdd1029
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheet.ts
View File

@@ -259,6 +259,6 @@ export class InventoryValuationSheet extends FinancialSheet {
const items = this.itemsSection(); const items = this.itemsSection();
const total = this.totalSection(items); const total = this.totalSection(items);
return items.length > 0 ? { items, total } : {}; return { items, total };
} }
} }

4
packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetTable.ts
View File

@@ -84,7 +84,9 @@ export class InventoryValuationSheetTable extends R.compose(
const itemsRows = this.itemsRowsMapper(this.data.items); const itemsRows = this.itemsRowsMapper(this.data.items);
const totalRow = this.totalRowMapper(this.data.total); const totalRow = this.totalRowMapper(this.data.total);
return [...itemsRows, totalRow]; return R.compose(
R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
)([...itemsRows]) as ITableRow[];
} }
/** /**

10
packages/server/src/services/FinancialStatements/SalesByItems/SalesByItems.ts
View File

@@ -7,7 +7,7 @@ import {
IAccountTransaction, IAccountTransaction,
ISalesByItemsItem, ISalesByItemsItem,
ISalesByItemsTotal, ISalesByItemsTotal,
ISalesByItemsSheetStatement, ISalesByItemsSheetData,
IItem, IItem,
} from '@/interfaces'; } from '@/interfaces';
@@ -146,7 +146,7 @@ export default class SalesByItemsReport extends FinancialSheet {
* @param {IInventoryValuationItem[]} items * @param {IInventoryValuationItem[]} items
* @returns {IInventoryValuationTotal} * @returns {IInventoryValuationTotal}
*/ */
totalSection(items: ISalesByItemsItem[]): ISalesByItemsTotal { private totalSection(items: ISalesByItemsItem[]): ISalesByItemsTotal {
const quantitySold = sumBy(items, (item) => item.quantitySold); const quantitySold = sumBy(items, (item) => item.quantitySold);
const soldCost = sumBy(items, (item) => item.soldCost); const soldCost = sumBy(items, (item) => item.soldCost);
@@ -163,12 +163,12 @@ export default class SalesByItemsReport extends FinancialSheet {
/** /**
* Retrieve the sheet data. * Retrieve the sheet data.
* @returns {ISalesByItemsSheetStatement} * @returns {ISalesByItemsSheetData}
*/ */
reportData(): ISalesByItemsSheetStatement { public reportData(): ISalesByItemsSheetData {
const items = this.itemsSection(); const items = this.itemsSection();
const total = this.totalSection(items); const total = this.totalSection(items);
return items.length > 0 ? { items, total } : {}; return { items, total };
} }
} }

4
packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsTable.ts
View File

@@ -83,7 +83,9 @@ export class SalesByItemsTable extends R.compose(
const itemsRows = this.itemsMap(this.data.items); const itemsRows = this.itemsMap(this.data.items);
const totalRow = this.totalMap(this.data.total); const totalRow = this.totalMap(this.data.total);
return [...itemsRows, totalRow]; return R.compose(
R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
)([...itemsRows]) as ITableRow[];
} }
/** /**