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

alert

See merge request !1801

src/container/BudgetTahunan/BudgetTahunan.js

@@ -313,7 +313,7 @@ export default class BudgetTahunan extends Component {
             "currency_id": this.state.defaultCurrency.id
         }
         api.create().getReportTypeBody(payload).then(response => {
-            // console.log(response);
+            console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     let dataTable = response.data.data.map((item, index) => {
@@ -420,8 +420,6 @@ export default class BudgetTahunan extends Component {
                             defaultCurrencyID: response.data.data.default_currency,
                             currency: datas,
                             defaultCurrency: index == -1 ? null : datas[index]
-                        }, () => {
-                            this.getReport()
                         })
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {

src/container/BudgetTahunan/ProfitLoss.js

@@ -365,7 +365,7 @@ export default class ProfitLoss extends Component {
             currency_id: this.state.defaultCurrencyUpload?.id
         }
         api.create().checkUploadMB(payload).then(response => {
-            console.log(JSON.stringify(this.state.payload));
+            // console.log(JSON.stringify(this.state.payload));
             console.log(response)
             if (response.data) {
                 if (response.data.status === 'success') {
@@ -459,7 +459,7 @@ export default class ProfitLoss extends Component {
         // console.log(this.state.dataTable);
         // console.log(JSON.stringify(body));
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
-            // console.log(response);
+            console.log(response);
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -3277,7 +3277,7 @@ export default class ProfitLoss extends Component {
                                             marginRight: 20,
                                             borderRadius: 9
                                         }}
-                                        onClick={() => this.setState({ popupDownload: false })}
+                                        onClick={() => this.setState({ visibleAlertSave: 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>