Compare commits
No commits in common. "a1641504f1dd358b2f55aabd0296b8df854727c4" and "40aafaf571dfaa12dbe681ec160ab333bafdd70f" have entirely different histories.
a1641504f1
...
40aafaf571
|
@ -6,7 +6,6 @@ export default <ReportConfigEntity>{
|
||||||
...IncomeReportPerItemMaster,
|
...IncomeReportPerItemMaster,
|
||||||
group_name: REPORT_GROUP.tenant_report,
|
group_name: REPORT_GROUP.tenant_report,
|
||||||
unique_name: `${REPORT_GROUP.tenant_report}__income_per_item_master`,
|
unique_name: `${REPORT_GROUP.tenant_report}__income_per_item_master`,
|
||||||
label: 'Pendapatan',
|
|
||||||
whereCondition(filterModel) {
|
whereCondition(filterModel) {
|
||||||
const queryFilter = [];
|
const queryFilter = [];
|
||||||
const breakdown = filterModel.tr_item__breakdown_bundling;
|
const breakdown = filterModel.tr_item__breakdown_bundling;
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
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`,
|
||||||
|
};
|
|
@ -1,6 +1,8 @@
|
||||||
import { ReportConfigEntity } from '../../entities/report-config.entity';
|
import { ReportConfigEntity } from '../../entities/report-config.entity';
|
||||||
|
import IncomeReportPerItem from './configs/income-per-item';
|
||||||
import IncomeReportPerItemMaster from './configs/income-per-item-master';
|
import IncomeReportPerItemMaster from './configs/income-per-item-master';
|
||||||
|
|
||||||
export const TenantReportConfig: ReportConfigEntity[] = [
|
export const TenantReportConfig: ReportConfigEntity[] = [
|
||||||
|
IncomeReportPerItem,
|
||||||
IncomeReportPerItemMaster,
|
IncomeReportPerItemMaster,
|
||||||
];
|
];
|
||||||
|
|
|
@ -127,20 +127,8 @@ export default <ReportConfigEntity>{
|
||||||
type: DATA_TYPE.MEASURE,
|
type: DATA_TYPE.MEASURE,
|
||||||
format: DATA_FORMAT.CURRENCY,
|
format: DATA_FORMAT.CURRENCY,
|
||||||
},
|
},
|
||||||
{
|
// TODO => tambahkan total dpp per item
|
||||||
column: 'tr_item__payment_total_dpp',
|
// TODO => tambahkan total tax
|
||||||
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',
|
column: 'tr_item__total_price',
|
||||||
query: 'tr_item.total_price',
|
query: 'tr_item.total_price',
|
||||||
|
|
|
@ -112,20 +112,8 @@ export default <ReportConfigEntity>{
|
||||||
type: DATA_TYPE.MEASURE,
|
type: DATA_TYPE.MEASURE,
|
||||||
format: DATA_FORMAT.CURRENCY,
|
format: DATA_FORMAT.CURRENCY,
|
||||||
},
|
},
|
||||||
{
|
// TODO => tambahkan total dpp per item
|
||||||
column: 'tr_item__payment_total_dpp',
|
// TODO => tambahkan total tax
|
||||||
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',
|
column: 'tr_item__total_price',
|
||||||
query: 'tr_item.total_price',
|
query: 'tr_item.total_price',
|
||||||
|
|
Loading…
Reference in New Issue