Commit f29d5cde authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'rifka' into 'master'

jadi nama

See merge request !660
parents a8253b8c 42e0cbab
...@@ -125,7 +125,7 @@ export default class TaxPlanning extends Component { ...@@ -125,7 +125,7 @@ export default class TaxPlanning extends Component {
"submission_id": this.props.submissionID "submission_id": this.props.submissionID
} }
api.create().getDetailReportMB(payload).then(response => { api.create().getDetailReportMB(payload).then(response => {
console.log(response); // console.log(response);
let dataTable = [] let dataTable = []
if (response.data) { if (response.data) {
if (response.data.status == 'success') { if (response.data.status == 'success') {
...@@ -817,7 +817,7 @@ export default class TaxPlanning extends Component { ...@@ -817,7 +817,7 @@ export default class TaxPlanning extends Component {
let indexID = dataTable2.findIndex((val) => val[24] == splitform[0]) let indexID = dataTable2.findIndex((val) => val[24] == splitform[0])
if (indexID !== -1) { if (indexID !== -1) {
let data = dataTable2[indexID][20].fcp let data = dataTable2[indexID][20].fcp
console.log(dataTable2[indexID][20]); // console.log(dataTable2[indexID][20]);
// let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf // let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
// let valuezz = data.value == undefined ? data : data.value // let valuezz = data.value == undefined ? data : data.value
anjay.push(data == "" ? 0 : data) anjay.push(data == "" ? 0 : data)
...@@ -7453,12 +7453,12 @@ export default class TaxPlanning extends Component { ...@@ -7453,12 +7453,12 @@ export default class TaxPlanning extends Component {
<div className="grid grid-3x content-center"> <div className="grid grid-3x content-center">
{/* <div className="col-1"> */} {/* <div className="col-1"> */}
<div style={{ textAlign: 'right' }}> <div style={{ textAlign: 'right' }}>
{tableMeta.rowData[24] === 81 || {tableMeta.rowData[8] == "Tax Loss Carry Forward" ||
tableMeta.rowData[24] === 88 || tableMeta.rowData[8] === "Adjustment" ||
tableMeta.rowData[24] === 92 || tableMeta.rowData[8] === "Inc Tax Art 22" ||
tableMeta.rowData[24] === 93 || tableMeta.rowData[8] === "Inc Tax Art 23" ||
tableMeta.rowData[24] === 94 || tableMeta.rowData[8] === "Inc Tax Art 24" ||
tableMeta.rowData[24] === 95 tableMeta.rowData[8] === "Inc Tax Art 25"
? ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
......
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