update130723

src/container/Reports/SubHolding.js

@@ -4118,10 +4118,10 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 4) {
-            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
+            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&currency_id=${this.state.defaultCurrency.id}`
             console.log(url);
             let res = await fetch(
-                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_ratio/export_report?submission_id=${this.state.FRID === null ? "" : this.state.FRID}&&report_id=29&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&currency_id=${this.state.defaultCurrency.id}`
             )
             res = await res.blob()
             this.setState({ loading: false })
@@ -4161,10 +4161,10 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 6) {
-            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1&&currency_id=${this.state.defaultCurrency.id}`
             console.log(url);
             let res = await fetch(
-                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1&&currency_id=${this.state.defaultCurrency.id}`
             )
             res = await res.blob()
             this.setState({ loading: false })

src/container/RollingOutlook/CashFlowRO.js

@@ -286,7 +286,7 @@ export default class CashFlow extends Component {
         this.setState({ alert: false })
     }
 
-    olahDataCashFlow(dataTable2) {
+    olahDataCashFlow(dataTable2, trigger) {
         console.log(dataTable2)
         let listCF = []
         dataTable2.map((item, index) => {
@@ -339,10 +339,10 @@ export default class CashFlow extends Component {
         })
 
         console.log(listCF)
-        this.createCashFlow(listCF)
+        this.createCashFlow(listCF, trigger)
     }
 
-    createCashFlow(dbcf) {
+    createCashFlow(dbcf, trigger) {
         let payload = {
             "rolling_outlook_id": this.props.rollingOutlookID,
             "company_id": this.props.company.company_id,
@@ -355,41 +355,45 @@ export default class CashFlow extends Component {
         }
         console.log(dbcf)
         console.log(JSON.stringify(payload))
-        api.create().createRollingOutlookCF(payload).then(response => {
-            console.log(payload);
-            console.log(response);
-            // console.log(JSON.stringify(payload))
-            if (response.data) {
-                if (response.data.status === "success") {
-                    this.props.onClickClose()
-                    this.props.refresh()
-                } else {
-                    if (response.data?.message == "Please Set Up Rate Currency First") {
-                        this.setState({ visibleAlertSave: true, loading: false })
+        if (trigger === "simulasi") {
+
+        } else {
+            api.create().createRollingOutlookCF(payload).then(response => {
+                console.log(payload);
+                console.log(response);
+                // console.log(JSON.stringify(payload))
+                if (response.data) {
+                    if (response.data.status === "success") {
+                        this.props.onClickClose()
+                        this.props.refresh()
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleDoubleClick: 0 }, () => {
-                            document.body.style.overflow = 'unset';
-                            if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
-                                setTimeout(() => {
-                                    localStorage.removeItem(Constant.TOKEN)
-                                    window.location.reload();
-                                }, 1000);
-                            }
-                            this.props.onClickClose()
-                            this.props.refresh()
-                        })
+                        if (response.data?.message == "Please Set Up Rate Currency First") {
+                            this.setState({ visibleAlertSave: true, loading: false })
+                        } else {
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleDoubleClick: 0 }, () => {
+                                document.body.style.overflow = 'unset';
+                                if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
+                                    setTimeout(() => {
+                                        localStorage.removeItem(Constant.TOKEN)
+                                        window.location.reload();
+                                    }, 1000);
+                                }
+                                this.props.onClickClose()
+                                this.props.refresh()
+                            })
+                        }
                     }
+                    // else {
+                    //     this.setState({ loading: false, handleDoubleClick: 0 }, () => {
+                    //         this.props.onClickClose()
+                    //         this.props.refresh()
+                    //     })
+                    // }
+                } else {
+                    this.setState({ loading: false, handleDoubleClick: 0 })
                 }
-                // else {
-                //     this.setState({ loading: false, handleDoubleClick: 0 }, () => {
-                //         this.props.onClickClose()
-                //         this.props.refresh()
-                //     })
-                // }
-            } else {
-                this.setState({ loading: false, handleDoubleClick: 0 })
-            }
-        })
+            })
+        }
         this.props.onClickClose()
         this.props.refresh()
     }
@@ -2228,7 +2232,7 @@ export default class CashFlow extends Component {
                                                 //     :
                                                 this.state.handleDoubleClick == 1 ? null :
                                                     this.setState({ handleDoubleClick: 1 }, () => {
-                                                        this.olahDataCashFlow(dataTable2)
+                                                        this.olahDataCashFlow(dataTable2, "simulasi")
                                                     })}
                                             style={{
                                                 backgroundColor: 'transparent',