Commit ce7627a0 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni' into 'master'

komen cashflow

See merge request !595
parents a6412ce7 515ecd0b
...@@ -441,7 +441,7 @@ export default class BudgetTahunan extends Component { ...@@ -441,7 +441,7 @@ export default class BudgetTahunan extends Component {
api.create().approvalSubmission(body).then((res) => { api.create().approvalSubmission(body).then((res) => {
// console.log(res) // console.log(res)
// this.setState({ loading: false }, () => { // this.setState({ loading: false }, () => {
this.getSubmission() this.getSubmission()
// }) // })
if (type == 'revision') { if (type == 'revision') {
api.create().createPeriodeRevision(payload).then((res)) api.create().createPeriodeRevision(payload).then((res))
...@@ -625,12 +625,12 @@ export default class BudgetTahunan extends Component { ...@@ -625,12 +625,12 @@ export default class BudgetTahunan extends Component {
let array = [] let array = []
let canSubmit = true let canSubmit = true
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
if (item[1] !== 'Cash Flow') { // if (item[1] !== 'Cash Flow') {
if (item[3] !== "submitted" && item[3] !== 'approved') { if (item[3] !== "submitted" && item[3] !== 'approved') {
canSubmit = false canSubmit = false
array.push(item[3]) array.push(item[3])
}
} }
// }
// if (item[3].includes("not-yet") || item[3].includes("draft")) { // if (item[3].includes("not-yet") || item[3].includes("draft")) {
// array.push(item[3]) // array.push(item[3])
// } else { // } else {
......
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