Merge branch 'GGMAC' into 'master'

update ro pl & mr cf

See merge request !1253

src/container/BudgetTahunan/CashFlow.js

@@ -336,7 +336,7 @@ export default class CashFlow extends Component {
     olahDataCashFlow(dataTable2) {
         console.log(dataTable2)
         let listCF = []
-        dataTable2.map((item,index) => {
+        dataTable2.map((item, index) => {
             listCF.push(
                 {
                     "item_report_id": item[1],
@@ -377,7 +377,7 @@ export default class CashFlow extends Component {
         let payload = {
             "submission_id": this.props.submissionID,
             "company_id": this.props.company.company_id,
-            "periode": this.props.periode.periode,
+            "periode": this.props.periode,
             "report_id": 6,
             "status": "submitted",
             "cash_flow": dbcf
@@ -3197,31 +3197,31 @@ export default class CashFlow extends Component {
                                 </div>
                                 {this.props.isApprover === true || dataTable2.length == 0 ? null :
                                     (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
-                                    <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.olahDataCashFlow(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 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.olahDataCashFlow(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>
-                                    </button>
-                                </div> 
-                                : null}
+                                        : null}
                             </div>
                         </div>
                     </Paper>