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

Update OLPA RO

See merge request !1836

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -148,7 +148,8 @@ export default class BalanceSheetOLPA extends Component {
             "revision": this.props.revision,
             "get_for": this.state.get_for,
             "periode": this.props.periode,
-            "company_id": this.props.company.company_id
+            "company_id": this.props.company.company_id,
+            "currency_id": this.props.defaultCurrency.id
         }
         api.create().getLastestUpdateOLPA(payload).then(response => {
             // console.log(response);

src/container/OutlookPA/CorporateAnnualTargetOLPA.js

@@ -708,6 +708,7 @@ export default class CorporateAnnualTargetRO extends Component {
             "company_id": this.props.company.company_id,
             // "rolling_outlook_id": this.props.rollingOutlookID,
             "outlook_pa_id": this.props.outlook_pa_id,
+            "currency_id": this.props.defaultCurrency.id,
             "quartal": 'q1'
         }
         api.create().getLastestUpdateOLPA(payload).then(response => {

src/container/OutlookPA/OutlookPA.js

@@ -1591,6 +1591,7 @@ export default class OutlookPA extends Component {
                 let datas = data.findIndex((val) => val[4] == items)
                 let report = data[datas]
                 if (items === 38) {
+                    try {
                         let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/outlook_pa/export_outlook_pa?outlook_pa_id=${outlook_pa_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(
                             `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/outlook_pa/export_outlook_pa?outlook_pa_id=${outlook_pa_id === null ? "" : outlook_pa_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}`
@@ -1599,7 +1600,12 @@ export default class OutlookPA extends Component {
                         if (res.status === 200) {
                             result = [...result, res];
                         }
+                    } catch (error) {
+                        alert(error)
+                    }
+
                 } else {
+                    try {
                         let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${outlook_pa_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(
                             `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${outlook_pa_id === null ? "" : outlook_pa_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}`
@@ -1608,6 +1614,10 @@ export default class OutlookPA extends Component {
                         if (res.status === 200) {
                             result = [...result, res];
                         }
+                    } catch (error) {
+                        alert(error)
+                    }
+
                 }
             }