Skip to content

T
Tia-dev
Commit 9d4d0578 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri' into 'ENV-DEV' 

Update banyak

See merge request !1894
parents f8935662 cf63463e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 106 deletions
src/api/index.js
View file @ 9d4d0578
......@@ -343,6 +343,7 @@ const create = (type = "") => {
//CASH FLOW
const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body)
const createReportCF = (body) => api.post('transaction/cash_flow/master_budget/create_submission_report', body)
const createReportCFSimulasi = (body) => api.post('transaction/cash_flow/master_budget/create_submission_report/other_currency', body)
//OUTLOOK PA
const getOutlookPAID = (body) => api.post('transaction/outlook_pa/get_outlook_pa_id', body)
......@@ -759,6 +760,7 @@ const create = (type = "") => {
getReportCFSumaMB,
getReportCFSumaMR,
createReportCF,
createReportCFSimulasi,
getReportCFSuma,
getReportPLSuma,
getReportPLSummary,
......
src/container/BudgetTahunan/BudgetTahunan.js
View file @ 9d4d0578
......@@ -1320,37 +1320,57 @@ export default class BudgetTahunan extends Component {
})
}
createCashFlow(payload) {
api.create().createReportCF(payload).then((res) => {
console.log(res)
// this.getSubmission()
if (res.data) {
if (res.data.status === "success") {
this.setState({ visibleCF: false, visibleBudgetTahunan: true })
this.getSubmission()
} else {
if (res.data.message == "Please Set Up Rate Currency First") {
this.setState({ visibleAlertSave: true })
createCashFlow(payload, trigger) {
console.log(trigger);
if (trigger === "simulasi") {
api.create().createReportCFSimulasi(payload).then((res) => {
console.log(res)
// this.getSubmission()
if (res.data) {
if (res.data.status === "success") {
this.setState({ visibleCF: false, visibleBudgetTahunan: true })
this.getSubmission()
} else {
this.setState({ alert: true, messageAlert: res.data.message, tipeAlert: 'warning', loading: false })
if (res.data.message == "Please Set Up Rate Currency First") {
this.setState({ visibleAlertSave: true })
} else {
this.setState({ alert: true, messageAlert: res.data.message, tipeAlert: 'warning', loading: false })
}
}
}
}
// if (response.data) {
// if (response.data.status === "success") {
// this.props.saveToMonthlyReport()
// } else {
// this.setState({ loading: false }, () => {
// this.props.saveToMonthlyReport()
// })
// }
// } else {
// this.setState({ loading: false }, () => {
// // this.getSubmission()
// document.body.style.overflow = 'unset';
// })
// }
})
})
} else {
api.create().createReportCF(payload).then((res) => {
console.log(res)
// this.getSubmission()
if (res.data) {
if (res.data.status === "success") {
this.setState({ visibleCF: false, visibleBudgetTahunan: true })
this.getSubmission()
} else {
if (res.data.message == "Please Set Up Rate Currency First") {
this.setState({ visibleAlertSave: true })
} else {
this.setState({ alert: true, messageAlert: res.data.message, tipeAlert: 'warning', loading: false })
}
}
}
// if (response.data) {
// if (response.data.status === "success") {
// this.props.saveToMonthlyReport()
// } else {
// this.setState({ loading: false }, () => {
// this.props.saveToMonthlyReport()
// })
// }
// } else {
// this.setState({ loading: false }, () => {
// // this.getSubmission()
// document.body.style.overflow = 'unset';
// })
// }
})
}
}
getPL(type, trigger) {
......
src/container/BudgetTahunan/CashFlow.js
View file @ 9d4d0578
......@@ -336,7 +336,7 @@ export default class CashFlow extends Component {
this.setState({ alert: false })
}
olahDataCashFlow(dataTable2) {
olahDataCashFlow(dataTable2, trigger) {
console.log(dataTable2)
let listCF = []
dataTable2.map((item, index) => {
......@@ -373,10 +373,10 @@ export default class CashFlow extends Component {
})
console.log(listCF)
this.createCashFlow(listCF)
this.createCashFlow(listCF, trigger)
}
createCashFlow(dbcf) {
createCashFlow(dbcf, trigger) {
let payload = {
"submission_id": this.props.submissionID,
"company_id": this.props.company.company_id,
......@@ -388,7 +388,7 @@ export default class CashFlow extends Component {
}
console.log(dbcf)
console.log(JSON.stringify(payload))
this.props.createCashFlow(payload)
this.props.createCashFlow(payload, trigger)
// this.props.onClickClose()
}
......@@ -3339,9 +3339,32 @@ export default class CashFlow extends Component {
</div>
</button>
</div>
{this.props.isApprover === true || dataTable2.length == 0 ? null :
(!this.props.truelyApprover) && (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button
type="button"
// disabled={this.state.buttonError}
onClick={() =>
// this.state.buttonError ?
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
// :
this.state.handleDoubleClick == 1 ? null :
this.setState({ handleDoubleClick: 1 }, () => {
this.olahDataCashFlow(dataTable2, "simulasi")
})}
style={{
backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer',
borderColor: 'transparent',
outline: 'none',
marginRight: 15
}}
>
<div style={{ backgroundColor: '#cd5c5c', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save Data Simulasi</Typography>
</div>
</button>
{this.props.isApprover === true || dataTable2.length == 0 ? null :
(!this.props.truelyApprover) && (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
<button
type="button"
// disabled={this.state.buttonError}
......@@ -3364,8 +3387,8 @@ export default class CashFlow extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
</div>
: null}
: null}
</div>
</div>
</div>
</Paper>
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 9d4d0578
This diff is collapsed.
src/container/MonthlyReport/CashFlowMR.js
View file @ 9d4d0578
......@@ -214,7 +214,7 @@ export default class CashFlowMR extends Component {
}
}
payloadCF(dataTable2) {
payloadCF(dataTable2, trigger) {
let listCF = []
console.log(dataTable2)
dataTable2.map((item, index) => {
......@@ -232,10 +232,10 @@ export default class CashFlowMR extends Component {
// }
})
this.createCashFlow(listCF)
this.createCashFlow(listCF, trigger)
}
createCashFlow(listCF) {
createCashFlow(listCF, trigger) {
let payload = {
"monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id,
......@@ -246,7 +246,7 @@ export default class CashFlowMR extends Component {
"currency_id": this.props.defaultCurrency.id,
"cash_flow": listCF
}
this.props.createCashFlow(payload)
this.props.createCashFlow(payload, trigger)
}
render() {
......@@ -765,8 +765,30 @@ export default class CashFlowMR extends Component {
</div>
</button>
</div>
{this.state.viewOnly &&
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button
type="button"
// disabled={this.state.buttonError}
onClick={() =>
// this.state.buttonError ?
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
// :
this.state.handleDoubleClick == 1 ? null :
this.setState({ handleDoubleClick: 1 }, () => {
this.payloadCF(dataTable2, "simulasi")
})}
style={{
backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer',
borderColor: 'transparent',
outline: 'none',
}}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
{this.state.viewOnly &&
<button
type="button"
// disabled={this.state.buttonError}
......@@ -789,8 +811,8 @@ export default class CashFlowMR extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
</div>
}
}
</div>
</div>
</div>
</Paper>
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 9d4d0578
......@@ -1529,12 +1529,16 @@ export default class MonthlyReport extends Component {
})
}
createCashFlow(payload) {
createCashFlow(payload, trigger) {
console.log(JSON.stringify(payload))
api.create().createMonthlyReportCF(payload).then((res) => {
this.saveToMonthlyReport()
console.log(res)
})
if (trigger === "simulasi") {
} else {
api.create().createMonthlyReportCF(payload).then((res) => {
this.saveToMonthlyReport()
console.log(res)
})
}
}
getPL(type, trigger) {
......
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