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

Update Simulasi Upload

See merge request !1864

src/api/index.js

@@ -209,6 +209,7 @@ const create = (type = "") => {
   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 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 validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body)
   const countingFormula = (body) => api.post('transaction/counting_formula', body)
@@ -872,7 +873,8 @@ const create = (type = "") => {
     createDownloadFile,
     getListDownload,
     downloadZipReport,
-    sendEmail
+    sendEmail,
+    checkUploadMBSimulasi
   }
 }
 

src/assets/Images.js

@@ -57,6 +57,7 @@ const Images = {
     dotOpen: require('./dot-open.svg'),
     zip: require('./zip.png'),
     warning: require('./warning.png'),
+    simulasiUpload: require('./upload-simulasi.png'),
 }
 
 export default Images
\ No newline at end of file

src/container/BudgetTahunan/ProfitLoss.js

@@ -3304,7 +3304,7 @@ export default class ProfitLoss extends Component {
                                             marginRight: 20,
                                             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' }}>
                                             <Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography>

src/container/MasterData/Parameter/CreateParameter.js

@@ -822,7 +822,7 @@ export default class CreateParameter extends Component {
                                 <TextField
                                     style={{ width: '100%' }}
                                     id="value"
-                                    label="Value"
+                                    label= {this.state.enableReportName ? "Value IDR mn" : "Value"}
                                     value={this.state.tempData === null ? '' : this.state.tempData.value}
                                     inputProps={{
                                         min: 0,
@@ -1259,7 +1259,7 @@ export default class CreateParameter extends Component {
                                 <TextField
                                     style={{ width: '100%' }}
                                     id="value"
-                                    label="Value"
+                                    label= {this.state.enableReportName ? "Value IDR mn" : "Value"}
                                     value={this.state.value}
                                     inputProps={{
                                         min: 0,