Commit 647efe9e authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

Didam

See merge request !994
parents 7526ba8b 984c1bea
...@@ -117,7 +117,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -117,7 +117,8 @@ export default class ListOfCreditFacilities extends Component {
updateBy: '-', updateBy: '-',
notes: "", notes: "",
viewOnly: true, viewOnly: true,
dataDelete: [] dataDelete: [],
saveTambahan: true
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
...@@ -3975,7 +3976,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3975,7 +3976,7 @@ export default class ListOfCreditFacilities extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.setState({totalOutStand: totalLoan}, () => { onClick={() => this.setState({totalOutStand: totalLoan, saveTambahan: false}, () => {
this.handleCalculate() this.handleCalculate()
})} })}
> >
...@@ -3987,7 +3988,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3987,7 +3988,7 @@ export default class ListOfCreditFacilities extends Component {
className="button" className="button"
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4013,7 +4014,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4013,7 +4014,7 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4149,7 +4150,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4149,7 +4150,7 @@ export default class ListOfCreditFacilities extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.setState({totalOutStand: totalLoan}, () => { onClick={() => this.setState({totalOutStand: totalLoan, saveTambahan: false}, () => {
this.handleCalculate() this.handleCalculate()
})} })}
> >
...@@ -4161,7 +4162,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4161,7 +4162,7 @@ export default class ListOfCreditFacilities extends Component {
className="button" className="button"
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4187,7 +4188,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4187,7 +4188,7 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? 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