Merge branch 'rifka' into 'master'

save olpa cat & loading ro tp

See merge request !1461

src/api/index.js

@@ -366,8 +366,9 @@ const create = (type = "") => {
   const createDBPLOLPA = (body) => api.post('transaction/db_profit_loss/outlook_pa/create_outlook_report', body)
   const getHierarkiDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/get_report_hierarki', body)
   const createDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/create_rolling_outlook', body)
-  const getDetailReportOLPACAT = (body) => api.post('transaction/cat/outlook_pa/get_report_hierarki', body)
-  const createCATOLPA = (body) => api.post('transaction/cat/outlook_pa/create_outlook_pa', body)
+  // const getDetailReportOLPACAT = (body) => api.post('transaction/cat/outlook_pa/get_report_hierarki', body)
+  const getDetailReportOLPACAT = (body) => api.post('transaction/outlook_pa/get_report_hierarki', body)
+  const createCATOLPA = (body) => api.post('transaction/outlook_pa/create_outlook_pa', body)
 
   // Monthly
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)

src/container/RollingOutlook/TaxPlanningRO.js

@@ -6205,7 +6205,7 @@ export default class TaxPlanning extends Component {
                                                     this.setState({ alert: true, messageAlert: 'Data incomplete !', tipeAlert: 'error' })
                                                     :
                                                     this.state.handleTekTekTek == 1 ? null :
-                                                        this.setState({ handleTekTekTek: 1 }, () => {
+                                                        this.setState({ handleTekTekTek: 1, loading: true }, () => {
                                                             this.backToRollingOutlook('submitted')
                                                         })}
                                             style={{