Merge branch 'GGMAC' into 'master'

apdet

See merge request !1310

src/api/index.js

@@ -241,7 +241,7 @@ const create = (type = "") => {
   const getLastestUpdateMROI = (body) => api.post('transaction/operating_indicator/monthly_report/get_latest_update', body)
 
   // Rolling Outlook
-  const getRollingOutlookID = (body) => api.post('transaction/rolling_outlook/get_monthly_report_id', body)
+  const getRollingOutlookID = (body) => api.post('transaction/rolling_outlook/get_rolling_outlook_id', body)
   const getRollingOutlookAttachment = (body) => api.post('transaction/rolling_outlook/get_report_attachment', body)
   const uploadRollingOutlookAttachment = (body) => api.post('transaction/rolling_outlook/upload_attachment', body)
   const deleteRollingOutlookAttachment = (body) => api.post(`transaction/rolling_outlook/delete_attachment/${body}`)
@@ -260,8 +260,8 @@ const create = (type = "") => {
   const createRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/create_rolling_outlook', body)
   const checkImportRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/check_import', body)
   const importRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/import_rolling_outlook', body)
-  const getRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/get_report_hierarki', body)
-  const createRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/create_rolling_outlook', body)
+  const getRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/get_report_hierarki', body)
+  const createRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/store_ro_tax_planning', body)
   const getRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/get_report_hierarki', body)
   const getSubmitRollingOutlook = (body) => api.post('transaction/rolling_outlook/get_latest_periode_submit', body)
   const getRollingOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/get_operating_indicator_id', body)
@@ -270,8 +270,7 @@ const create = (type = "") => {
   const getLastestUpdateROOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/get_latest_update', body)
   const checkUploadRollingOutlookOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/check_import', body)
   const uploadRollingOutlookOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/import_rolling_outlook', body)
-  
-
+  const submitRollingOutlook = (body) => api.post('transaction/rolling_outlook/submit_rolling_outlook', body)
 
   //REPORT NEW
   const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
@@ -756,7 +755,8 @@ const create = (type = "") => {
     createRollingOI,
     getLastestUpdateROOI,
     checkUploadRollingOutlookOI,
-    uploadRollingOutlookOI
+    uploadRollingOutlookOI,
+    submitRollingOutlook
   }
 }
 

src/container/RollingOutlook.js

@@ -660,7 +660,7 @@ export default class RollingOutlook extends Component {
             let body = {
                 rolling_outlook_id: this.state.rollingOutlookID
             }
-            api.create().submitMasterBudget(body).then(response => {
+            api.create().submitRollingOutlook(body).then(response => {
                 console.log(response);
                 if (response.data) {
                     if (response.data.status === "Success") {