Skip to content

T
Tia-dev
Commit f9a3fd1b authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Env dev

See merge request !1880
parents bca73b90 97ddf8b2
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/container/MasterData/Company/Company.js
View file @ f9a3fd1b
...@@ -195,7 +195,7 @@ export default class Perusahaan extends Component { ...@@ -195,7 +195,7 @@ export default class Perusahaan extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis')) check = tableMeta.rowData[7].findIndex((val) => val.field.includes('currency'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
...@@ -203,12 +203,12 @@ export default class Perusahaan extends Component { ...@@ -203,12 +203,12 @@ export default class Perusahaan extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis"> <a data-tip={tableMeta.rowData[7][check].message} data-for="currency">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="currency" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -220,7 +220,7 @@ export default class Perusahaan extends Component { ...@@ -220,7 +220,7 @@ export default class Perusahaan extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis')) check = tableMeta.rowData[7].findIndex((val) => val.field.includes('default_currency'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
...@@ -228,12 +228,12 @@ export default class Perusahaan extends Component { ...@@ -228,12 +228,12 @@ export default class Perusahaan extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis"> <a data-tip={tableMeta.rowData[7][check].message} data-for="default_currency">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="default_currency" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
......
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