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

fixsying isyuu

See merge request !1703

src/assets/sass/app.css

-.main-color{
+/* .main-color{
   background-color: #273b80 !important;
+} */
+
+.main-color{
+  background-color: #1474CA !important;
 }
 
 .sub-color{

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2452,14 +2452,30 @@ export default class BudgetTahunan extends Component {
             selectReport.map(async (items) => {
                 let datas = data.findIndex((val) => val[4] == items)
                 let report = data[datas]
-                let url = `${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}`
-                let res = await fetch(
-                    `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/export_master_budget?submission_id=${submissionID === null ? "" : submissionID}&&report_id=${report[4]}&&company_id=${company.company_id}&&year=${periode.periode}&&revision=${report[2]}&&download_file_report_id=${downloadedFileReportId}`
-                )
-                console.log(res);
-                if (res.status === 200) {
-                    this.setState({ arrayReport: [...this.state.arrayReport, items] })
+                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}`
+                    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}`
+                    let res = await fetch(
+                        this.props.submissionID == null ? resNull : resReal
+                    )
+
+                    console.log(res);
+                    if (res.status === 200) {
+                        this.setState({ arrayReport: [...this.state.arrayReport, items] })
+                    }
+                } 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}`
+                    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}`
+                    let res = await fetch(
+                        this.props.submissionID == null ? resNull : resReal
+                    )
+
+                    console.log(res);
+                    if (res.status === 200) {
+                        this.setState({ arrayReport: [...this.state.arrayReport, items] })
+                    }
                 }
+
                 // if (items === 1) {
                 //     let datas = data.findIndex((val) => val[4] == items)
                 //     let report = data[datas]

src/container/SummaryTriputra/TableSummaryTriputra.js

@@ -2444,7 +2444,7 @@ export default class TableSummaryTriputra extends Component {
                                                 <span>{"Debt to EBITDA"}</span>
                                             </div>
                                             <div className="column-4" style={{ borderRight: '1px #fff solid', justifyContent: 'center', display: 'flex', alignItems: 'center', backgroundColor: '#07a7d0', height: 40 }}>
-                                                <span>{"to Interest"}</span>
+                                                <span>{"EBITDA to Interest"}</span>
                                             </div>
                                         </div>
                                         <div className="column-2 grid grid-4x" style={{ justifyContent: 'center', display: 'flex', alignItems: 'center', backgroundColor: '#07a7d0' }}>