Skip to content

T
Tia-dev
Commit d4bcfd6f authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

parents 381a7432 b3b76858
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
src/container/Laporan/SubHolding.js
View file @ d4bcfd6f
......@@ -646,7 +646,7 @@ export default class SubHolding extends Component {
PLID = null
}
this.setState({ PLID }, () => {
let payloads = {...payload, submission_id: this.state.PLID, months: this.state.month.month_id, quarter: 0}
let payloads = {...payload, report_id: 28, submission_id: this.state.PLID, months: this.state.month.month_id, quarter: 0}
console.log(payloads);
api.create().getReportPL(payloads).then(response => {
console.log(response);
......@@ -1034,7 +1034,7 @@ export default class SubHolding extends Component {
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
0
item.tax_planning_report.total_current_year,
])
}
if (item.children !== null) {
......@@ -1084,7 +1084,7 @@ export default class SubHolding extends Component {
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
0
item.tax_planning_report.total_current_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -2895,7 +2895,7 @@ export default class SubHolding extends Component {
}
} else if (this.state.report.value === 3) {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_profit_loss/export_report?submission_id=${this.state.PLID === null ? "" : this.state.PLID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_profit_loss/export_report?submission_id=${this.state.PLID === null ? "" : this.state.PLID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
)
res = await res.blob()
this.setState({ loading: false })
......@@ -2907,10 +2907,10 @@ export default class SubHolding extends Component {
a.click();
}
} else if (this.state.report.value === 4) {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
console.log(url);
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
)
res = await res.blob()
this.setState({ loading: false })
......
src/container/Laporan/TableSubHolding.js
View file @ d4bcfd6f
......@@ -4415,7 +4415,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleForecastDBPL(tableMeta, `${Number(this.props.periode) + 1}`, 20)).toFixed(1)}
// value={Number(handleForecastDBPL(tableMeta, `${Number(this.props.periode) + 1}`, 20)).toFixed(1)}
value={Number(tableMeta.rowData[20], tableMeta, 20).toFixed(1)}
/>
}
/>
......@@ -4459,7 +4460,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleForecastDBPL(tableMeta, `${Number(this.props.periode) + 2}`, 21)).toFixed(1)}
// value={Number(handleForecastDBPL(tableMeta, `${Number(this.props.periode) + 2}`, 21)).toFixed(1)}
value={Number(tableMeta.rowData[21], tableMeta, 21).toFixed(1)}
/>
}
/>
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @ d4bcfd6f
......@@ -1211,7 +1211,7 @@ export default class SummaryOfTriputra extends Component {
item.revenue_eight,
item.revenue_nine,
item.revenue_ten,
item.revenue_twelve,
item.revenue_eleven,
item.ebitda_one,
item.ebitda_two,
item.ebitda_three,
......@@ -1222,7 +1222,7 @@ export default class SummaryOfTriputra extends Component {
item.ebitda_eight,
item.ebitda_nine,
item.ebitda_ten,
item.ebitda_twelve,
item.ebitda_eleven,
item.tpat_one,
item.tpat_two,
item.tpat_three,
......@@ -1233,7 +1233,7 @@ export default class SummaryOfTriputra extends Component {
item.tpat_eight,
item.tpat_nine,
item.tpat_ten,
item.tpat_twelve,
item.tpat_eleven,
item.npat_one,
item.npat_two,
item.npat_three,
......@@ -1244,7 +1244,7 @@ export default class SummaryOfTriputra extends Component {
item.npat_eight,
item.npat_nine,
item.npat_ten,
item.npat_twelve,
item.npat_eleven,
item.total_asset_one,
item.total_asset_two,
item.total_asset_three,
......@@ -1255,7 +1255,7 @@ export default class SummaryOfTriputra extends Component {
item.total_asset_eight,
item.total_asset_nine,
item.total_asset_ten,
item.total_asset_twelve,
item.total_asset_eleven,
item.total_equity_one,
item.total_equity_two,
item.total_equity_three,
......@@ -1266,7 +1266,7 @@ export default class SummaryOfTriputra extends Component {
item.total_equity_eight,
item.total_equity_nine,
item.total_equity_ten,
item.total_equity_twelve,
item.total_equity_eleven,
item.order,
])
}
......@@ -1294,7 +1294,7 @@ export default class SummaryOfTriputra extends Component {
item.revenue_eight,
item.revenue_nine,
item.revenue_ten,
item.revenue_twelve,
item.revenue_eleven,
item.ebitda_one,
item.ebitda_two,
item.ebitda_three,
......@@ -1305,7 +1305,7 @@ export default class SummaryOfTriputra extends Component {
item.ebitda_eight,
item.ebitda_nine,
item.ebitda_ten,
item.ebitda_twelve,
item.ebitda_eleven,
item.tpat_one,
item.tpat_two,
item.tpat_three,
......@@ -1316,7 +1316,7 @@ export default class SummaryOfTriputra extends Component {
item.tpat_eight,
item.tpat_nine,
item.tpat_ten,
item.tpat_twelve,
item.tpat_eleven,
item.npat_one,
item.npat_two,
item.npat_three,
......@@ -1327,7 +1327,7 @@ export default class SummaryOfTriputra extends Component {
item.npat_eight,
item.npat_nine,
item.npat_ten,
item.npat_twelve,
item.npat_eleven,
item.total_asset_one,
item.total_asset_two,
item.total_asset_three,
......@@ -1338,7 +1338,7 @@ export default class SummaryOfTriputra extends Component {
item.total_asset_eight,
item.total_asset_nine,
item.total_asset_ten,
item.total_asset_twelve,
item.total_asset_eleven,
item.total_equity_one,
item.total_equity_two,
item.total_equity_three,
......@@ -1349,7 +1349,7 @@ export default class SummaryOfTriputra extends Component {
item.total_equity_eight,
item.total_equity_nine,
item.total_equity_ten,
item.total_equity_twelve,
item.total_equity_eleven,
item.order,
])
if (item.children !== null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment