Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/container/Laporan/SubHolding.js

@@ -3062,10 +3062,17 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 8) {
+<<<<<<< HEAD
             let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
             console.log(url);
             let res = await fetch(
                 `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&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_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+            console.log(url);
+            let res = await fetch(
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+>>>>>>> 4752199b2929e79f17c72bc4f983e9058f435870
             )
             res = await res.blob()
             this.setState({ loading: false })

src/container/MonthlyReport.js

@@ -625,10 +625,8 @@ export default class MonthlyReport extends Component {
                         // // console.log(this.state.lastStatus);
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
-                        // this.getCashFlow(type)
                         // this.getPL(type)
                         if (type != undefined) {
-                            // this.getCashFlow(type)
                             this.getPL(type)
                         } else {
                             this.setState({ loading: false })
@@ -722,6 +720,7 @@ export default class MonthlyReport extends Component {
             visibleBS: false,
             visiblePL: false,
             visibleCAT: false,
+            visibleCF: false,
             visibleFAM: false,
             visibleTP: false,
             visibleLOCF: false,

src/container/MonthlyReport/CashFlowMR.js

@@ -63,19 +63,19 @@ export default class CashFlowMR extends Component {
         } else {
             checkApprover = false
         }
-        
+
         if (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') {
             checkLastStatus = true
         } else {
             checkLastStatus = false
-        } 
-        
+        }
+
         if (this.props.prevRevision) {
             checkPrevRev = true
         } else {
             checkPrevRev = false
         }
-        
+
         if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'drat' || this.props.status === 'submitted') {
             checkStatus = true
         } else {
@@ -85,7 +85,7 @@ export default class CashFlowMR extends Component {
         // console.log(checkLastStatus)
         // console.log(checkApprover)
         // console.log(checkPrevRev)
-        this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
+        this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
     }
 
     componentDidMount() {
@@ -214,10 +214,10 @@ export default class CashFlowMR extends Component {
         dataTable2.map((item, index) => {
             // if (item[6].value == "" || item[6].value == 0 || item[6].value == "0.0") {
             //     item[6].value = this.handleValueFormula(item, index)
-                listCF.push({
-                    "item_report_id": item[1],
-                    "actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1)
-                })
+            listCF.push({
+                "item_report_id": item[1],
+                "actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1)
+            })
             // } else {
             //     listCF.push({
             //         "item_report_id": item[1],
@@ -717,30 +717,32 @@ export default class CashFlowMR extends Component {
                                         </div>
                                     </button>
                                 </div>
-                                {this.state.viewOnly && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
-                                    <button
-                                        type="button"
-                                        // disabled={this.state.buttonError}
-                                        onClick={() =>
-                                            // this.state.buttonError ?
-                                            //     this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
-                                            //     :
-                                            this.state.handleTekTekTek == 1 ? null :
-                                                this.setState({ handleTekTekTek: 1 }, () => {
-                                                    this.payloadCF(dataTable2)
-                                                })}
-                                        style={{
-                                            backgroundColor: 'transparent',
-                                            cursor: this.state.buttonError === true ? 'default' : 'pointer',
-                                            borderColor: 'transparent',
-                                            outline: 'none',
-                                        }}
-                                    >
-                                        <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                            <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
-                                        </div>
-                                    </button>
-                                </div>}
+                                {this.state.viewOnly &&
+                                    <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                        <button
+                                            type="button"
+                                            // disabled={this.state.buttonError}
+                                            onClick={() =>
+                                                // this.state.buttonError ?
+                                                //     this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
+                                                //     :
+                                                this.state.handleTekTekTek == 1 ? null :
+                                                    this.setState({ handleTekTekTek: 1 }, () => {
+                                                        this.payloadCF(dataTable2)
+                                                    })}
+                                            style={{
+                                                backgroundColor: 'transparent',
+                                                cursor: this.state.buttonError === true ? 'default' : 'pointer',
+                                                borderColor: 'transparent',
+                                                outline: 'none',
+                                            }}
+                                        >
+                                            <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
+                                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
+                                            </div>
+                                        </button>
+                                    </div>
+                                }
                             </div>
                         </div>
                     </Paper>