eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

Merge pull request 'feat/adjustment-report' (#84) from feat/adjustment-report into development
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details 

Reviewed-on: #84
fix/report 20.1.61-alpha.1
firmanr 2024-09-11 03:52:02 +00:00
parent 40aafaf571 6c5019f814
commit a1641504f1
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts
View File

@ -6,6 +6,7 @@ export default <ReportConfigEntity>{
...IncomeReportPerItemMaster,
group_name: REPORT_GROUP.tenant_report,
unique_name: `${REPORT_GROUP.tenant_report}__income_per_item_master`,
label: 'Pendapatan',
whereCondition(filterModel) {
const queryFilter = [];
const breakdown = filterModel.tr_item__breakdown_bundling;

9
src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts
View File

@ -1,9 +0,0 @@
import { REPORT_GROUP } from '../../../constant';
import { ReportConfigEntity } from '../../../entities/report-config.entity';
import IncomeReportPerItem from '../../transaction-report/configs/income-per-item';
export default <ReportConfigEntity>{
...IncomeReportPerItem,
group_name: REPORT_GROUP.tenant_report,
unique_name: `${REPORT_GROUP.tenant_report}__income_per_item`,
};

2
src/modules/reports/shared/configs/tenant-report/index.ts
View File

@ -1,8 +1,6 @@
import { ReportConfigEntity } from '../../entities/report-config.entity';
import IncomeReportPerItem from './configs/income-per-item';
import IncomeReportPerItemMaster from './configs/income-per-item-master';
export const TenantReportConfig: ReportConfigEntity[] = [
IncomeReportPerItem,
IncomeReportPerItemMaster,
];

16
src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts
View File

@ -127,8 +127,20 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
// TODO => tambahkan total dpp per item
// TODO => tambahkan total tax
{
column: 'tr_item__payment_total_dpp',
query: 'tr_item.payment_total_dpp',
label: 'DPP',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item__payment_total_tax',
query: 'tr_item.payment_total_tax',
label: 'Total Pajak',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item__total_price',
query: 'tr_item.total_price',

16
src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts
View File

@ -112,8 +112,20 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
// TODO => tambahkan total dpp per item
// TODO => tambahkan total tax
{
column: 'tr_item__payment_total_dpp',
query: 'tr_item.payment_total_dpp',
label: 'DPP',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item__payment_total_tax',
query: 'tr_item.payment_total_tax',
label: 'Total Pajak',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item__total_price',
query: 'tr_item.total_price',