Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1194

src/container/BudgetTahunan.js

@@ -534,10 +534,10 @@ export default class BudgetTahunan extends Component {
                         // // console.log(this.state.btnApprove)
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
-                        if (type != undefined) {
+                        // if (type != undefined) {
                             this.getCashFlow(type)
                             this.getPL(type)
-                        }
+                        // }
                         // this.getFR(type)
                         api.create().checkApprover().then(response => {
                             // // console.log(this.state.btncreate);
@@ -1587,6 +1587,7 @@ export default class BudgetTahunan extends Component {
         console.log(JSON.stringify(payload))
         api.create().createReportPLMB(payload).then((res) => {
             console.log(res)
+            this.setState({loading: false})
             // if (response.data) {
             //     if (response.data.status === "success") {
             //         this.props.saveToMonthlyReport()

src/container/MonthlyReport.js

@@ -1808,6 +1808,7 @@ export default class MonthlyReport extends Component {
         }
         api.create().createReportPLMR(payload).then((res) => {
             console.log(res)
+            this.setState({loading: false})
             // if (response.data) {
             //     if (response.data.status === "success") {
             //         this.props.saveToMonthlyReport()