Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/api/index.js

@@ -265,11 +265,14 @@ const create = (type = "") => {
   const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body)
   const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`)
   const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body)
-  const createTaxPlanningMR = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
+  const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/get_report_hierarki', body)
+  const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
+
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
+  const createMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/create_monthly_report', body)
 
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
@@ -402,6 +405,8 @@ const create = (type = "") => {
     deleteDocument,
     createSubmitReport,
     createMonthlyReportBS,
+    createMonthlyReportTP,
+    createMonthlyReportPL,
     getSubmission,
     checkUploadMB,
     getAllOperatingInd,
@@ -434,7 +439,6 @@ const create = (type = "") => {
     uploadAttachmentMonthly,
     getMontlyReportAtt,
     deleteAttachmentMonthly,
-    createTaxPlanningMR,
     getSubmitMasterBudget,
     createPeriodeRevision,
     getLastestUpdateOI,
@@ -471,7 +475,8 @@ const create = (type = "") => {
     getDetailHierarkiCF,
     getHierarkiMontlyReportPL,
     getHierarkiMontlyReportLOCF,
-    getHierarkiMontlyReportFAM
+    getHierarkiMontlyReportFAM,
+    checkUploadMonthlyReportTP
   }
 }
 

src/container/MonthlyReport.js

@@ -480,6 +480,8 @@ export default class MonthlyReport extends Component {
             visibleTP: false,
             visibleLOCF: false,
             visibleOI: false,
+        }, ()=> {
+            this.getMonthlyReportID()
         })
     }
 
@@ -1083,9 +1085,9 @@ export default class MonthlyReport extends Component {
                         periode={this.state.periode.periode}
                         monthlyReportId={this.state.monthlyReportId}
                         month={this.state.month}
-                        // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
-                        // getReport={this.getCompanyActive.bind(this)}
+                        saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
+                        // getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
                 {this.state.visibleFAM && (