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

Fixing Issue Cron

See merge request !1828

src/api/index.js

@@ -445,13 +445,13 @@ const create = (type = "") => {
   const getHierarkiCronJobMRRatio = () => api.get('/transaction/report/get_hierarki_monthly_report/ratio')
 
   // Ratio X LOCF 
-  const getRatioLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}`)
-  const triggerRatioFromLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report_company/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}`)
+  const getRatioLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}/${body.currency_id}`)
+  const triggerRatioFromLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report_company/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}//${body.currency_id}`)
 
-  const triggerRatioMB = (body) => api.get(`/transaction/cronjob/create_master_budget_company/${body.report}/${body.submissionId}/${body.companyId}/${body.periode}`)
-  const triggerRatioRO = (body) => api.get(`/transaction/cronjob/create_rolling_outlook_company/${body.report}/${body.rollingOutlookId}/${body.companyId}/${body.quartal}/${body.periode}`)
-  const triggerRatioOLPA = (body) => api.get(`/transaction/cronjob/create_outlook_pa_company/${body.report}/${body.outlookPaId}/${body.companyId}/${body.periode}`)
-  const triggerHistoricalRatio = (body) => api.get(`/transaction/cronjob/create_historical_company/${body.report}/${body.companyId}/${body.periode}`)
+  const triggerRatioMB = (body) => api.get(`/transaction/cronjob/create_master_budget_company/${body.report}/${body.submissionId}/${body.companyId}/${body.periode}//${body.currency_id}`)
+  const triggerRatioRO = (body) => api.get(`/transaction/cronjob/create_rolling_outlook_company/${body.report}/${body.rollingOutlookId}/${body.companyId}/${body.quartal}/${body.periode}//${body.currency_id}`)
+  const triggerRatioOLPA = (body) => api.get(`/transaction/cronjob/create_outlook_pa_company/${body.report}/${body.outlookPaId}/${body.companyId}/${body.periode}//${body.currency_id}`)
+  const triggerHistoricalRatio = (body) => api.get(`/transaction/cronjob/create_historical_company/${body.report}/${body.companyId}/${body.periode}//${body.currency_id}`)
 
   // MonthlyPL
   // const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)

src/container/BudgetTahunan/BalanceSheet.js

@@ -483,7 +483,8 @@ export default class BalanceSheet extends Component {
                             "report": 'ratio',
                             "submissionId": this.props.submissionID,
                             "periode": this.props.periode,
-                            "companyId": this.props.company.company_id
+                            "companyId": this.props.company.company_id,
+                            "currency_id": this.props.defaultCurrency.id,
                         }
                         api.create().triggerRatioMB(bodyRatioBs).then((res) => {
                             console.log(res)

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -500,7 +500,7 @@ export default class BalanceSheetOLPA extends Component {
             company_id: this.props.company.company_id,
             periode: this.props.periode,
             report_id: this.props.report_id,
-            currency_id: this.state.defaultCurrencyUpload?.id,
+            currency_id: this.props.defaultCurrency.id,
             balance_sheet: data,
             status: type
         }
@@ -516,7 +516,9 @@ export default class BalanceSheetOLPA extends Component {
                             "report": 'ratio',
                             "outlookPaId": this.props.outlook_pa_id,
                             "companyId": this.props.company.company_id,
-                            "periode": this.props.periode
+                            "periode": this.props.periode,
+                            "currency_id": this.props.defaultCurrency.id,
+
                         }
                         api.create().triggerRatioOLPA(bodyRatioOLPA).then((res) => {
                             console.log(res)

src/container/RollingOutlook/RollingOutlook.js

@@ -1729,9 +1729,9 @@ export default class RollingOutlook extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        tableMeta.rowData[5] == true ?
+                                        // tableMeta.rowData[5] == true ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                            : null
+                                            // : null
                                     }
                                 >
                                     {/* {this.state.isApprover == true ?