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

update issue CAT

See merge request !1971

src/api/index.js

@@ -543,10 +543,6 @@ 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)
 
-  // Delete Duplicate CAT
-  const deleteDuplicateSubmitCAT = (body) => api.post('transaction/master_budget/delete_duplicate_submit_item_report', body)
-  const deleteDuplicateImportCAT = (body) => api.post('transaction/master_budget/delete_duplicate_import_item_report', body)
-
   // Superadmin Approve
   const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`)
   const getIdToken = (userId) => api.get(`transaction/get_token/${userId}`)
@@ -942,8 +938,6 @@ const create = (type = "") => {
     uploadSimulasiOperatingInd,
     uploadSimulasiMROI,
     uploadSimulasiROOI,
-    deleteDuplicateSubmitCAT,
-    deleteDuplicateImportCAT
 
   }
 }

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2346,29 +2346,18 @@ export default class BudgetTahunan extends Component {
                     if (response.data.status === 'success') {
                         if (type === "PL" || type === "DraftPL") {
                             this.setState({ visiblePL: false, visibleBudgetTahunan: true, loading: false })
-                            this.getSubmission(type)
                         } else if (type === "TP" || type === "DraftTP") {
                             this.setState({ visibleTP: false, visibleBudgetTahunan: true, loading: false })
-                            this.getSubmission(type)
                         } else if (type === "BS" || type === "DraftBS") {
                             this.setState({ visibleBS: false, visibleBudgetTahunan: true, loading: false })
-                            this.getSubmission(type)
                         } else if (type === "FAM" || type === "DraftFAM") {
                             this.setState({ visibleFAM: false, visibleBudgetTahunan: true, loading: false })
-                            this.getSubmission(type)
                         } else if (type === "CAT" || type === "DraftCAT") {
-                            api.create().deleteDuplicateSubmitCAT(data).then((res) => {
-                                console.log(res)
-                                if (res.data.status === "success") {
-                                    this.setState({ loading: false, visibleCF: false, visibleBudgetTahunan: true })
-                                    this.getSubmission(type)
-                                }
-                            })
+                            this.setState({ visibleCF: false, visibleBudgetTahunan: true, loading: false })
                         } else {
                             this.setState({ visibleBudgetTahunan: true, visiblePL: false, visibleTP: false, visibleBS: false, visibleFAM: false, visibleCAT: false, loading: false })
-                            this.getSubmission(type)
                         }
-                        // this.getSubmission(type)
+                        this.getSubmission(type)
                     } else {
                         console.log(response.data);
                         if (response.data.message == "Please Set Up Rate Currency First") {

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -662,18 +662,13 @@ export default class CorporateAnnualTarget extends Component {
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
-                        api.create().deleteDuplicateImportCAT(body).then((res) => {
-                            console.log(res)
-                            if (response.data.status === "success") {
-                                if (type == 'submitted') {
-                                    this.props.getReport(body, 'CAT')
-                                } else {
-                                    this.props.getReport(body, 'DraftCAT')
-                                }
-                                this.setState({ loading: false })
-                                this.props.onClickClose()
-                            }
-                        })
+                        if (type == 'submitted') {
+                            this.props.getReport(body, 'CAT')
+                        } else {
+                            this.props.getReport(body, 'DraftCAT')
+                        }
+                        this.setState({ loading: false })
+                        this.props.onClickClose()
                         // this.props.getReport()
                     } else {
                         if (response.data?.message == "Please Set Up Rate Currency First") {