Merge branch 'GGMAC' into 'master'

update dasbor fin + rapihin save pl cf

See merge request !1220

src/container/BudgetTahunan.js

@@ -671,7 +671,7 @@ export default class BudgetTahunan extends Component {
                         }
                     }
                 })
-                // console.log(dataTable)
+                console.log(dataTable)
                 this.setState({ dbCF: dataTable }, () => {
                     this.olahDataCashFlow(this.state.dbCF, type)    
                 })
@@ -929,7 +929,7 @@ export default class BudgetTahunan extends Component {
             }
         })
 
-        total = R.equals(total, NaN) ? "0.0" : total
+        total = R.equals(total, NaN) ? "0.0" : Number(total).toFixed(1)
         return total
     }
 
@@ -1089,6 +1089,7 @@ export default class BudgetTahunan extends Component {
         console.log(this.state.dbCF)
         console.log(JSON.stringify(payload))
         api.create().createReportCF(payload).then((res) => {
+            this.setState({loading: false})
             console.log(res)
             // if (response.data) {
             //     if (response.data.status === "success") {
@@ -1220,7 +1221,7 @@ export default class BudgetTahunan extends Component {
                             this.olahDataPL(this.state.dbPL, type)    
                         })
                     } else {
-                        this.setState({ dbPL: [], previewTable: false, loading: false, previewDownload: false })
+                        this.setState({ dbPL: [], previewTable: false, previewDownload: false })
                     }