Skip to content

T
Tia-dev
Commit a339d97f authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'faisal' into 'master' 

apdate lagi

See merge request !431
parents ebd6bdc4 3f864df2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ a339d97f
......@@ -2026,7 +2026,7 @@ export default class FixedAssetsMovement extends Component {
<div style={{ width: '50%' }}>
{this.props.isApprover == true || this.state.dataTable.length == 0 ? null :
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && (
{((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false ) && (
<div>
<a data-tip={'Download Template'} data-for="template">
<button
......@@ -2044,7 +2044,7 @@ export default class FixedAssetsMovement extends Component {
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
</div>
)}
{(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && (
{((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false ) && (
<div>
<a data-tip={'Upload'} data-for="upload">
<button
......@@ -2122,7 +2122,7 @@ export default class FixedAssetsMovement extends Component {
</button>
</div>
{this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION' ?
((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) &&
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%'}}>
<button
className="button"
......@@ -2191,7 +2191,7 @@ export default class FixedAssetsMovement extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
</div> : null
</div>
}
</div>
</Paper>
......
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