Commit cfe47d0a authored by Riri Novita's avatar Riri Novita

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

Update Simulasi Upload

See merge request !1863
parents 9a34c80b 3f5f34c6
...@@ -209,6 +209,7 @@ const create = (type = "") => { ...@@ -209,6 +209,7 @@ const create = (type = "") => {
const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body) const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)
const getSubmission = (body) => api.post('transaction/master_budget/get_submission_id', body) const getSubmission = (body) => api.post('transaction/master_budget/get_submission_id', body)
const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body) const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
const checkUploadMBSimulasi = (body) => api.post('transaction/master_budget/import_master_budget/other_currency_existing', body)
const uploadMasterBudget = (body) => api.post('transaction/master_budget/import_master_budget', body) const uploadMasterBudget = (body) => api.post('transaction/master_budget/import_master_budget', body)
const validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body) const validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body)
const countingFormula = (body) => api.post('transaction/counting_formula', body) const countingFormula = (body) => api.post('transaction/counting_formula', body)
...@@ -872,7 +873,8 @@ const create = (type = "") => { ...@@ -872,7 +873,8 @@ const create = (type = "") => {
createDownloadFile, createDownloadFile,
getListDownload, getListDownload,
downloadZipReport, downloadZipReport,
sendEmail sendEmail,
checkUploadMBSimulasi
} }
} }
......
...@@ -57,6 +57,7 @@ const Images = { ...@@ -57,6 +57,7 @@ const Images = {
dotOpen: require('./dot-open.svg'), dotOpen: require('./dot-open.svg'),
zip: require('./zip.png'), zip: require('./zip.png'),
warning: require('./warning.png'), warning: require('./warning.png'),
simulasiUpload: require('./upload-simulasi.png'),
} }
export default Images export default Images
\ No newline at end of file
...@@ -3304,7 +3304,7 @@ export default class ProfitLoss extends Component { ...@@ -3304,7 +3304,7 @@ export default class ProfitLoss extends Component {
marginRight: 20, marginRight: 20,
borderRadius: 9 borderRadius: 9
}} }}
onClick={() => this.setState({ visibleAlertSave: false, handleDoubleClick: 0 })} onClick={() => this.setState({ visibleAlertSave: false, handleDoubleClick: 0, loading: false })}
> >
<div style={{ backgroundColor: '#fff', width: 105, height: 30, borderRadius: 9, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #3549609e' }}> <div style={{ backgroundColor: '#fff', width: 105, height: 30, borderRadius: 9, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #3549609e' }}>
<Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography> <Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography>
......
...@@ -822,7 +822,7 @@ export default class CreateParameter extends Component { ...@@ -822,7 +822,7 @@ export default class CreateParameter extends Component {
<TextField <TextField
style={{ width: '100%' }} style={{ width: '100%' }}
id="value" id="value"
label="Value" label= {this.state.enableReportName ? "Value IDR mn" : "Value"}
value={this.state.tempData === null ? '' : this.state.tempData.value} value={this.state.tempData === null ? '' : this.state.tempData.value}
inputProps={{ inputProps={{
min: 0, min: 0,
...@@ -1259,7 +1259,7 @@ export default class CreateParameter extends Component { ...@@ -1259,7 +1259,7 @@ export default class CreateParameter extends Component {
<TextField <TextField
style={{ width: '100%' }} style={{ width: '100%' }}
id="value" id="value"
label="Value" label= {this.state.enableReportName ? "Value IDR mn" : "Value"}
value={this.state.value} value={this.state.value}
inputProps={{ inputProps={{
min: 0, min: 0,
......
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