Skip to content

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

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

Update banyak

See merge request !1895
parents 469489ce 9d4d0578
Expand all Show whitespace changes
Inline Side-by-side
Showing with 177 additions and 106 deletions
src/api/index.js
View file @ e39e1dea
...@@ -343,6 +343,7 @@ const create = (type = "") => { ...@@ -343,6 +343,7 @@ const create = (type = "") => {
//CASH FLOW //CASH FLOW
const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body) 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 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 //OUTLOOK PA
const getOutlookPAID = (body) => api.post('transaction/outlook_pa/get_outlook_pa_id', body) const getOutlookPAID = (body) => api.post('transaction/outlook_pa/get_outlook_pa_id', body)
...@@ -759,6 +760,7 @@ const create = (type = "") => { ...@@ -759,6 +760,7 @@ const create = (type = "") => {
getReportCFSumaMB, getReportCFSumaMB,
getReportCFSumaMR, getReportCFSumaMR,
createReportCF, createReportCF,
createReportCFSimulasi,
getReportCFSuma, getReportCFSuma,
getReportPLSuma, getReportPLSuma,
getReportPLSummary, getReportPLSummary,
......
src/container/BudgetTahunan/BudgetTahunan.js
View file @ e39e1dea
...@@ -1320,7 +1320,26 @@ export default class BudgetTahunan extends Component { ...@@ -1320,7 +1320,26 @@ export default class BudgetTahunan extends Component {
}) })
} }
createCashFlow(payload) { 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 {
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 })
}
}
}
})
} else {
api.create().createReportCF(payload).then((res) => { api.create().createReportCF(payload).then((res) => {
console.log(res) console.log(res)
// this.getSubmission() // this.getSubmission()
...@@ -1352,6 +1371,7 @@ export default class BudgetTahunan extends Component { ...@@ -1352,6 +1371,7 @@ export default class BudgetTahunan extends Component {
// } // }
}) })
} }
}
getPL(type, trigger) { getPL(type, trigger) {
let PLID = null let PLID = null
......
src/container/BudgetTahunan/CashFlow.js
View file @ e39e1dea
...@@ -336,7 +336,7 @@ export default class CashFlow extends Component { ...@@ -336,7 +336,7 @@ export default class CashFlow extends Component {
this.setState({ alert: false }) this.setState({ alert: false })
} }
olahDataCashFlow(dataTable2) { olahDataCashFlow(dataTable2, trigger) {
console.log(dataTable2) console.log(dataTable2)
let listCF = [] let listCF = []
dataTable2.map((item, index) => { dataTable2.map((item, index) => {
...@@ -373,10 +373,10 @@ export default class CashFlow extends Component { ...@@ -373,10 +373,10 @@ export default class CashFlow extends Component {
}) })
console.log(listCF) console.log(listCF)
this.createCashFlow(listCF) this.createCashFlow(listCF, trigger)
} }
createCashFlow(dbcf) { createCashFlow(dbcf, trigger) {
let payload = { let payload = {
"submission_id": this.props.submissionID, "submission_id": this.props.submissionID,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -388,7 +388,7 @@ export default class CashFlow extends Component { ...@@ -388,7 +388,7 @@ export default class CashFlow extends Component {
} }
console.log(dbcf) console.log(dbcf)
console.log(JSON.stringify(payload)) console.log(JSON.stringify(payload))
this.props.createCashFlow(payload) this.props.createCashFlow(payload, trigger)
// this.props.onClickClose() // this.props.onClickClose()
} }
...@@ -3339,9 +3339,32 @@ export default class CashFlow extends Component { ...@@ -3339,9 +3339,32 @@ export default class CashFlow extends Component {
</div> </div>
</button> </button>
</div> </div>
<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.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') ? (!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%' }}>
<button <button
type="button" type="button"
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
...@@ -3364,10 +3387,10 @@ export default class CashFlow extends Component { ...@@ -3364,10 +3387,10 @@ export default class CashFlow extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div> </div>
</button> </button>
</div>
: null} : null}
</div> </div>
</div> </div>
</div>
</Paper> </Paper>
</div> </div>
</div> </div>
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ e39e1dea
This diff is collapsed.
src/container/MonthlyReport/CashFlowMR.js
View file @ e39e1dea
...@@ -214,7 +214,7 @@ export default class CashFlowMR extends Component { ...@@ -214,7 +214,7 @@ export default class CashFlowMR extends Component {
} }
} }
payloadCF(dataTable2) { payloadCF(dataTable2, trigger) {
let listCF = [] let listCF = []
console.log(dataTable2) console.log(dataTable2)
dataTable2.map((item, index) => { dataTable2.map((item, index) => {
...@@ -232,10 +232,10 @@ export default class CashFlowMR extends Component { ...@@ -232,10 +232,10 @@ export default class CashFlowMR extends Component {
// } // }
}) })
this.createCashFlow(listCF) this.createCashFlow(listCF, trigger)
} }
createCashFlow(listCF) { createCashFlow(listCF, trigger) {
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -246,7 +246,7 @@ export default class CashFlowMR extends Component { ...@@ -246,7 +246,7 @@ export default class CashFlowMR extends Component {
"currency_id": this.props.defaultCurrency.id, "currency_id": this.props.defaultCurrency.id,
"cash_flow": listCF "cash_flow": listCF
} }
this.props.createCashFlow(payload) this.props.createCashFlow(payload, trigger)
} }
render() { render() {
...@@ -765,7 +765,6 @@ export default class CashFlowMR extends Component { ...@@ -765,7 +765,6 @@ export default class CashFlowMR extends Component {
</div> </div>
</button> </button>
</div> </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 <button
type="button" type="button"
...@@ -776,7 +775,7 @@ export default class CashFlowMR extends Component { ...@@ -776,7 +775,7 @@ export default class CashFlowMR extends Component {
// : // :
this.state.handleDoubleClick == 1 ? null : this.state.handleDoubleClick == 1 ? null :
this.setState({ handleDoubleClick: 1 }, () => { this.setState({ handleDoubleClick: 1 }, () => {
this.payloadCF(dataTable2) this.payloadCF(dataTable2, "simulasi")
})} })}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -789,10 +788,33 @@ export default class CashFlowMR extends Component { ...@@ -789,10 +788,33 @@ export default class CashFlowMR extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div> </div>
</button> </button>
{this.state.viewOnly &&
<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)
})}
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> </div>
</button>
} }
</div> </div>
</div> </div>
</div>
</Paper> </Paper>
</div> </div>
</div> </div>
......
src/container/MonthlyReport/MonthlyReport.js
View file @ e39e1dea
...@@ -1529,13 +1529,17 @@ export default class MonthlyReport extends Component { ...@@ -1529,13 +1529,17 @@ export default class MonthlyReport extends Component {
}) })
} }
createCashFlow(payload) { createCashFlow(payload, trigger) {
console.log(JSON.stringify(payload)) console.log(JSON.stringify(payload))
if (trigger === "simulasi") {
} else {
api.create().createMonthlyReportCF(payload).then((res) => { api.create().createMonthlyReportCF(payload).then((res) => {
this.saveToMonthlyReport() this.saveToMonthlyReport()
console.log(res) console.log(res)
}) })
} }
}
getPL(type, trigger) { getPL(type, trigger) {
let PLID = null let PLID = 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