Skip to content

T
Tia-dev
Commit a4d1b038 authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

tp ketinggalan

See merge request !1041
parents 709526c1 755119ba
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 14 deletions
src/container/Laporan/SubHolding.js
View file @ a4d1b038
......@@ -843,7 +843,6 @@ export default class SubHolding extends Component {
if (response.data) {
if (response.data.status === 'success') {
let res = response.data.data
console.log(res)
const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
if (indexIDzz === -1) {
......@@ -885,6 +884,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
])
}
if (item.children !== null) {
......@@ -934,6 +934,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
])
if (item.children !== null) {
if (item.children.length > 0) {
......
src/container/Laporan/TableSubHolding.js
View file @ a4d1b038
......@@ -9991,7 +9991,7 @@ export default class TableSubHolding extends Component {
<div className="col-1">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10014,7 +10014,7 @@ export default class TableSubHolding extends Component {
<div className="col-2">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10037,7 +10037,7 @@ export default class TableSubHolding extends Component {
<div className="col-3">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10060,7 +10060,7 @@ export default class TableSubHolding extends Component {
<div className="col-4">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10085,7 +10085,7 @@ export default class TableSubHolding extends Component {
<div className="col-1">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10108,7 +10108,7 @@ export default class TableSubHolding extends Component {
<div className="col-2">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10131,7 +10131,7 @@ export default class TableSubHolding extends Component {
<div className="col-3">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10154,7 +10154,7 @@ export default class TableSubHolding extends Component {
<div className="col-4">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10179,7 +10179,7 @@ export default class TableSubHolding extends Component {
<div className="col-1">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10202,7 +10202,7 @@ export default class TableSubHolding extends Component {
<div className="col-2">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10225,7 +10225,7 @@ export default class TableSubHolding extends Component {
<div className="col-3">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10248,7 +10248,7 @@ export default class TableSubHolding extends Component {
<div className="col-4">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -10271,7 +10271,7 @@ export default class TableSubHolding extends Component {
<div className="col-5">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<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