Merge branch 'dev/riri' into 'ENV-DEV'

LOV

See merge request !2155

src/api/index.js

@@ -227,6 +227,7 @@ const create = (type = "") => {
   const createPeriodeRevision = (body) => api.post('transaction/master_budget/create_periode_revision', body)
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getIdDeleteFromExcelLOCF = (body) => api.post('transaction/locf/monthly_report/delete_from_excel', body)
+  const getIdDeleteFromExcelLOV = (body) => api.post('transaction/lov/monthly_report/delete_from_excel', body)
   const getDashboard = (body) => api.get('transaction/get_dashboard')
   const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
   const getDashboardUser = () => api.get('transaction/get_dashboard_sub_co')
@@ -392,6 +393,7 @@ const create = (type = "") => {
   // const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
   const getHierarkiMontlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/get_report_hierarki', body)
+  const getHierarkiMontlyReportInvesment = (body) => api.post('transaction/lov/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/fam/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportCF = (body) => api.post('transaction/cash_flow/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportCAT = (body) => api.post('/transaction/cat/monthly_report/get_report_hierarki', body)
@@ -431,7 +433,9 @@ const create = (type = "") => {
   // const validateSubmitReportMRTP = (body) => api.post('transaction/monthly_report_tp/validate_save', body)
   const validateSubmitReportMRTP = (body) => api.post('transaction/tax_planning/monthly_report/validate_save', body)
   const getPerBSiMontlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/get_per_bs', body)
+  const getPerBSiMontlyReportLOV = (body) => api.post('transaction/lov/monthly_report/get_per_bs', body)
   const checkUploadMonthlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/check_import', body)
+  const checkUploadMonthlyReportLOV = (body) => api.post('transaction/lov/monthly_report/check_import', body)
   const uploadMonthlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/import_monthly_report', body)
   const validateSubmitReportOI = (body) => api.post('transaction/operating_indicator/monthly_report/validate_save', body)
   const validateSubmitReportFAM = (body) => api.post('transaction/fam/monthly_report/validate_save', body)
@@ -545,6 +549,9 @@ const create = (type = "") => {
   const uploadSimulasiMROI = (body) => api.post('transaction/operating_indicator/monthly_report/import_monthly_report/other_currency_existing', body)
   const uploadSimulasiROOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/import_rolling_outlook/other_currency_existing', body)
 
+  // Investment
+  const getTypeOfInvestment = () => api.get('setting_type/get_all_setting_type_by_investment')
+
   // Superadmin Approve
   const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`)
   const getIdToken = (userId) => api.get(`transaction/get_token/${userId}`)
@@ -746,6 +753,7 @@ const create = (type = "") => {
     getDetailHierarkiCF,
     getHierarkiMontlyReportPL,
     getHierarkiMontlyReportLOCF,
+    getHierarkiMontlyReportInvesment,
     getHierarkiMontlyReportFAM,
     getHierarkiMontlyReportCAT,
     checkUploadMonthlyReportTP,
@@ -766,13 +774,16 @@ const create = (type = "") => {
     validateSubmitReportBS,
     validateSubmitReportPL,
     getPerBSiMontlyReportLOCF,
+    getPerBSiMontlyReportLOV,
     checkUploadMonthlyReportLOCF,
+    checkUploadMonthlyReportLOV,
     uploadMonthlyReportLOCF,
     validateSubmitReportOI,
     getMonthlyOI,
     getParameterByGroupName,
     getSubmitMonthlyReport,
     getIdDeleteFromExcelLOCF,
+    getIdDeleteFromExcelLOV,
     deleteAllItemReportLOCF,
     submitMonthlyReport,
     approvalMonthly,
@@ -942,6 +953,7 @@ const create = (type = "") => {
     uploadSimulasiOperatingInd,
     uploadSimulasiMROI,
     uploadSimulasiROOI,
+    getTypeOfInvestment
 
   }
 }

src/container/MonthlyReport/MonthlyReport.js

@@ -301,7 +301,7 @@ export default class MonthlyReport extends Component {
                     })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }