Merge branch 'ENV-STAGING' into 'BACKUP-STAGING'

Env staging

See merge request !1945

src/api/index.js

@@ -521,14 +521,14 @@ const create = (type = "") => {
   const uploadSimulasiMRCAT = (body) => api.post('transaction/cat/monthly_report/import_monthly_report/other_currency_existing', body)
   const uploadSimulasiMRCF = (body) => api.post('transaction/cash_flow/monthly_report/create_monthly_report/other_currency', body)
   const createSimulasiReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/create_monthly_report/other_currency_existing', body)
-  const triggerHistoricalRatioSimulasi = (body) => api.get(`/transaction/cronjob/create_historical_company/other_currency/${body.report}/${body.companyId}/${body.periode}/${body.currency_id}`)
+  const triggerHistoricalRatioSimulasi = (body) => api.get(`/transaction/cronjob/create_historical_company/other_currency/${body.companyId}/${body.periode}/${body.currency_id}`) 
   const triggerRatioFromLOCFSimulasi = (body) => api.get(`/transaction/cronjob/create_monthly_report_company/other_currency/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}/${body.currency_id}`)
   // RO
   const uploadSimulasiROPL = (body) => api.post('transaction/profit_loss/rolling_outlook/import_rolling_outlook/other_currency_existing', body)
   const uploadSimulasiROTP = (body) => api.post('transaction/tax_planning/rolling_outlook/import_rolling_outlook/other_currency_existing', body)
   const uploadSimulasiROBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/import_rolling_outlook/other_currency_existing', body)
   const uploadSimulasiROCAT = (body) => api.post('transaction/cat/rolling_outlook/import_rolling_outlook/other_currency_existing', body)
-  const createRollingOutlookCFSimulasi = (body) => api.post('transaction/cash_flow/rolling_outlook/create_rolling_outlook/other_currency_existing', body)
+  const createRollingOutlookCFSimulasi = (body) => api.post('transaction/cash_flow/rolling_outlook/create_rolling_outlook/other_currency', body)
   const createDBPLROSimulasi = (body) => api.post('transaction/db_profit_loss/rolling_outlook/create_rolling_outlook/other_currency_existing', body)
   const triggerRatioROSimulasi = (body) => api.get(`/transaction/cronjob/create_rolling_outlook_company/other_currency/${body.report}/${body.rollingOutlookId}/${body.companyId}/${body.quartal}/${body.periode}/${body.currency_id}`)
   // OLPA

src/container/MonthlyReport/CashFlowMR.js

@@ -609,7 +609,8 @@ export default class CashFlowMR extends Component {
                                             type="text"
                                             placeholder=""
                                             disabled={true}
-                                            value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                            // value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                            value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                         />
                                     </span>
                                     :
@@ -639,7 +640,8 @@ export default class CashFlowMR extends Component {
                                                 type="text"
                                                 placeholder=""
                                                 disabled={true}
-                                                value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                // value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                             /> :
                                             <LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
                                                 <NumberFormat
@@ -656,7 +658,8 @@ export default class CashFlowMR extends Component {
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
-                                                    value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                    // value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                    value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                                 />
                                             </LightTooltip>
                                         : null}

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -1220,7 +1220,6 @@ export default class OperatingIndicatorMR extends Component {
                                                                             fixedDecimalScale={1}
                                                                             disabled={!this.props.permission.create || !this.props.permission.edit || this.state.get_for == 'view'}
                                                                             value={Number(tableMeta.rowData[10]).toFixed(1)}
-                                                                            decimalScale={1}
                                                                             onBlur={(event) => {
                                                                                 handleChange(event.target.value, tableMeta)
                                                                             }}
@@ -1243,7 +1242,6 @@ export default class OperatingIndicatorMR extends Component {
                                                                                 disabled={true}
                                                                                 decimalScale={1}
                                                                                 value={Number(handleFormula(val, tableMeta, 2)).toFixed(1)}
-                                                                                decimalScale={1}
                                                                             />
                                                                         }
                                                                     />

src/container/MonthlyReport/ProfitLossMR.js

@@ -1407,7 +1407,6 @@ export default class ProfitLossMR extends Component {
                                                         disabled={true}
                                                         decimalScale={1}
                                                         value={Number(tableMeta.rowData[10]).toFixed(1)}
-                                                        decimalScale={1}
                                                     />
                                                     :
                                                     tableMeta.rowData[0] === 3 ?
@@ -1876,7 +1875,7 @@ export default class ProfitLossMR extends Component {
                                                                     control={
                                                                         <NumberFormat
                                                                             thousandSeparator={true}
-                                                                            style={{ color: 'red', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                                            // style={{ color: 'red', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                             type="text"
                                                                             placeholder=""
                                                                             style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}

src/container/RollingOutlook/RollingOutlook.js

@@ -663,7 +663,7 @@ export default class RollingOutlook extends Component {
                                 "quartal": this.state.quarter.value,
                                 "currency_id": this.state.defaultCurrency.id
                             }
-                            if (trigger === "simulasiPL") {
+                            if (trigger === "simulasiBS") {
                                 api.create().triggerRatioROSimulasi(bodyRatioBs).then((res) => {
                                     console.log(res)
                                     this.setState({ loading: false })