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

Remark 2

See merge request !2205

src/api/index.js

@@ -175,6 +175,7 @@ const create = (type = "") => {
   const createAllItemReport = (body) => api.post('item_report/create_all_item_report', body)
   const deleteAllItemReport = (body) => api.post('/item_report/delete_all_item_report', body)
   const deleteAllItemReportLOCF = (body) => api.post('/item_report/delete_all_item_report_locf', body)
+  const getAllSettingBusinessBank = (body) => api.post('setting/get_all_setting_by_group_name', body)
 
   //PARAMETER
   const getAllParameter = () => api.get('/setting/get_all_setting')
@@ -693,6 +694,7 @@ const create = (type = "") => {
     createOpetaingInd,
     uploadMasterBudget,
     getAllSettingByType,
+    getAllSettingBusinessBank,
     getOpetratingIndID,
     createAllItemReport,
     deleteAllItemReport,

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2522,7 +2522,7 @@ export default class BudgetTahunan extends Component {
             "month": "",
             "quartal": "",
             "type_report_name": "Master Budget",
-            "currency_id" : defaultCurrency.id
+            "currency_id": defaultCurrency.id
         }
         // console.log(payload);
         api.create().createDownloadFile(payload).then((response) => {
@@ -2570,34 +2570,43 @@ export default class BudgetTahunan extends Component {
                 let datas = data.findIndex((val) => val[4] == items)
                 let report = data[datas]
                 if (items === 6) {
-                    let resReal = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/master_budget/export_master_budget?submission_id=${submissionID}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&report_id=${report[4]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
-                    let resNull = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/master_budget/export_master_budget?submission_id=&&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&report_id=${report[4]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
+                    try {
+                        let resReal = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/master_budget/export_master_budget?submission_id=${submissionID}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&report_id=${report[4]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
+                        let resNull = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/master_budget/export_master_budget?submission_id=&&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&report_id=${report[4]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
 
-                    let res = await fetch(
-                        submissionID == null ? resNull : resReal
-                    )
-                    if (res.size > 0) {
-                        let url = window.URL.createObjectURL(res);
-                        let a = document.createElement('a');
-                        a.href = url;
-                    }
-                    if (res.status === 200) {
-                        result = [...result, res];
+                        let res = await fetch(
+                            submissionID == null ? resNull : resReal
+                        )
+                        if (res.size > 0) {
+                            let url = window.URL.createObjectURL(res);
+                            let a = document.createElement('a');
+                            a.href = url;
+                        }
+                        if (res.status === 200) {
+                            result = [...result, res];
+                        }
+                    } catch (error) {
+                        alert(error)
                     }
+
                 } else {
-                    let resReal = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/export_master_budget?submission_id=${submissionID}&report_id=${report[4]}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
-                    let resNull = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/export_master_budget?submission_id=&report_id=${report[4]}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
+                    try {
+                        let resReal = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/export_master_budget?submission_id=${submissionID}&report_id=${report[4]}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
+                        let resNull = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/export_master_budget?submission_id=&report_id=${report[4]}&company_id=${company.company_id}&year=${periode.periode}&revision=${report[2]}&download_file_report_id=${downloadedFileReportId}&currency_id=${defaultCurrency.id}`
 
-                    let res = await fetch(
-                        submissionID == null ? resNull : resReal
-                    )
-                    if (res.size > 0) {
-                        let url = window.URL.createObjectURL(res);
-                        let a = document.createElement('a');
-                        a.href = url;
-                    }
-                    if (res.status === 200) {
-                        result = [...result, res];
+                        let res = await fetch(
+                            submissionID == null ? resNull : resReal
+                        )
+                        if (res.size > 0) {
+                            let url = window.URL.createObjectURL(res);
+                            let a = document.createElement('a');
+                            a.href = url;
+                        }
+                        if (res.status === 200) {
+                            result = [...result, res];
+                        }
+                    } catch (error) {
+                        alert(error)
                     }
                 }
             }