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

download repot

See merge request !1724

src/api/index.js

@@ -866,7 +866,8 @@ const create = (type = "") => {
     createZipReport,
     createDownloadFile,
     getListDownload,
-    downloadZipReport
+    downloadZipReport,
+    sendEmail
   }
 }
 

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2407,6 +2407,8 @@ export default class BudgetTahunan extends Component {
             "company_id": company.company_id,
             "year": periode.periode,
             "report_id": selectReport,
+            "month": "",
+            "quartal": "",
             "type_report_name": "Master Budget"
         }
         console.log(payload);

src/container/BudgetTahunan/CashFlow.js

@@ -714,11 +714,11 @@ export default class CashFlow extends Component {
             // }
 
             if (tableMeta.rowData[5] == "Cash at the end of the period" && column == 7) {
-                console.log(splitFormula)
-                console.log(baru)
-                console.log(anjay)
-                console.log(anjay2)
-                console.log(total)
+                // console.log(splitFormula)
+                // console.log(baru)
+                // console.log(anjay)
+                // console.log(anjay2)
+                // console.log(total)
                 // let testttt = dataTable2[tableMeta.rowIndex - 1][8].value
                 // console.log(testttt)
                 // total = testttt 

src/container/MonthlyReport/MonthlyReport.js

@@ -2225,6 +2225,8 @@ export default class MonthlyReport extends Component {
             "company_id": company.company_id,
             "year": periode.periode,
             "report_id": selectReport,
+            "month": month ? String(month.month_id).toString() : "",
+            "quartal": "",
             "type_report_name": "Monthly Report"
         }
         console.log(payload);

src/container/OperatingIndicator/OperatingIndicator.js

@@ -537,6 +537,8 @@ export default class OperatingIndicator extends Component {
             "company_id": company.company_id,
             "year": periode.periode,
             "report_id": selectReport,
+            "month": "",
+            "quartal": "",
             "type_report_name": "Operating Indicator"
         }
         console.log(payload);
@@ -602,6 +604,7 @@ export default class OperatingIndicator extends Component {
 
                 if (String(report[1]).toLocaleLowerCase().includes('master budget')) {
                     let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/operating_indicator/master_budget/export_master_budget?operating_indicator_id=${operatingIndID == null ? "" : operatingIndID}&&report_id=${report[3]}&&company_id=${company.company_id}&&year=${periode.periode}&&download_file_report_id=${downloadedFileReportId}`
+                    console.log(url);
                     let res = await fetch(
                         `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/operating_indicator/master_budget/export_master_budget?operating_indicator_id=${operatingIndID == null ? "" : operatingIndID}&&report_id=${report[3]}&&company_id=${company.company_id}&&year=${periode.periode}&&download_file_report_id=${downloadedFileReportId}`
                     )

src/container/OutlookPA/OutlookPA.js

@@ -1453,6 +1453,8 @@ export default class OutlookPA extends Component {
             "company_id": company.company_id,
             "year": periode.periode,
             "report_id": selectReport,
+            "month": "",
+            "quartal": "",
             "type_report_name": "Outlook PA"
         }
         console.log(payload);

src/container/RollingOutlook/RollingOutlook.js

@@ -1487,11 +1487,13 @@ export default class RollingOutlook extends Component {
     }
 
     handleDownloadReport(tableMeta) {
-        let { selectReport, company, periode, month } = this.state
+        let { selectReport, company, periode, quarter } = this.state
         let payload = {
             "company_id": company.company_id,
             "year": periode.periode,
             "report_id": selectReport,
+            "month": "",
+            "quartal": quarter ? quarter.value : "",
             "type_report_name": "Rolling Outlook"
         }
         console.log(payload);