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

src/api/index.js

@@ -257,10 +257,12 @@ const create = (type = "") => {
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
   const getMonthlyOI = (body) => api.post('transaction/monthly_report_oi/get_operating_indicator_id', body)
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report/get_monthly_report_id', body)
-  const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
+  // const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
+  const getHierarkiMontlyReportBS = (body) => api.post('transaction/balance_sheet/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
   const getLastestUpdateMR = (body) => api.post('/transaction/monthly_report/get_latest_update', body)
-  const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
+  // 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/monthly_report_locf/get_report_hierarki', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/get_report_hierarki', body)
   const getHierarkiMontlyReportCF = (body) => api.post('transaction/monthly_report_cf/get_report_hierarki', body)
@@ -272,36 +274,49 @@ const create = (type = "") => {
   const getMontlyReportAtt = (body) => api.post('transaction/monthly_report/get_report_attachment', body)
   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 createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body)
+  const createMonthlyReportBS = (body) => api.post('transaction/balance_sheet/monthly_report/create_monthly_report', body)
   const createMonthlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/create_monthly_report', body)
-  const createMonthlyReportTP = (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 createMonthlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/create_monthly_report', body)
   const createMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/create_monthly_report', body)
   const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body)
   const createMonthlyReportCAT = (body) => api.post('transaction/monthly_report/cat/create_monthly_report', body)
-  const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
+  // const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
+  const checkUploadMonthlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
-  const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  // const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  const checkUploadMonthlyReportBS = (body) => api.post('transaction/balance_sheet/monthly_report/check_import', body)
   const checkUploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/check_import', body)
   const checkUploadMonthlyReportCAT = (body) => api.post('transaction/monthly_report/cat/check_import', body)
-  const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
+  // const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
+  const uploadMonthlyReportBS = (body) => api.post('transaction/balance_sheet/monthly_report/import_monthly_report', body)
   const uploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/import_monthly_report', body)
-  const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/import_monthly_report', body)
+  // const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/import_monthly_report', body)
+  const uploadMonthlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/import_monthly_report', body)
   const uploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/import_monthly_report', body)
   const uploadMonthlyReportCAT = (body) => api.post('transaction/monthly_report/cat/import_monthly_report', body)
-  const validateSubmitReportBS = (body) => api.post('transaction/monthly_report_bs/validate_save', body)
+  // const validateSubmitReportBS = (body) => api.post('transaction/monthly_report_bs/validate_save', body)
+  const validateSubmitReportBS = (body) => api.post('transaction/balance_sheet/monthly_report/validate_save', body)
   const validateSubmitReportMR = (body) => api.post('transaction/monthly_report/validate_save', body)
-  const validateSubmitReportMRTP = (body) => api.post('transaction/monthly_report_tp/validate_save', body)
+  // 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/monthly_report_locf/get_per_bs', body)
   const checkUploadMonthlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/check_import', body)
   const uploadMonthlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/import_monthly_report', body)
   const validateSubmitReportOI = (body) => api.post('transaction/monthly_report_oi/validate_save', 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)
-  const checkUploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/check_import', body)
-  const uploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/import_monthly_report', body)
-  const validateSubmitReportPL = (body) => api.post('transaction/monthly_report_pl/validate_save', body)
+  // 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)
+  // const checkUploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/check_import', body)
+  // const uploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/import_monthly_report', body)
+  // const validateSubmitReportPL = (body) => api.post('transaction/monthly_report_pl/validate_save', body)
+  const getHierarkiMontlyReportPL = (body) => api.post('transaction/profit_loss/monthly_report/get_report_hierarki', body)
+  const createMonthlyReportPL = (body) => api.post('transaction/profit_loss/monthly_report/create_monthly_report', body)
+  const checkUploadMonthlyReportPL = (body) => api.post('transaction/profit_loss/monthly_report/check_import', body)
+  const uploadMonthlyReportPL = (body) => api.post('transaction/profit_loss/monthly_report/import_monthly_report', body)
+  const validateSubmitReportPL = (body) => api.post('transaction/profit_loss/monthly_report/validate_save', body)
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
 

src/container/MonthlyReport/BalanceSheetMR.js

@@ -254,7 +254,7 @@ export default class BalanceSheetMR extends Component {
 
     downloadTemplate = async () => {
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_bs/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
         )
         res = await res.blob()
         // console.log(res)
@@ -268,10 +268,10 @@ export default class BalanceSheetMR extends Component {
     }
 
     async downloadAllData() {
-        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_bs/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         console.log(url);
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_bs/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         )
         res = await res.blob()
         this.setState({ loading: false })

src/container/MonthlyReport/ProfitLossMR.js

@@ -318,7 +318,7 @@ export default class ProfitLossMR extends Component {
 
     downloadTemplate = async () => {
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_pl/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/profit_loss/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
         )
         res = await res.blob()
         // console.log(res)
@@ -332,10 +332,10 @@ export default class ProfitLossMR extends Component {
     }
 
     async downloadAllData() {
-        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_pl/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/profit_loss/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         console.log(url);
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_pl/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/profit_loss/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         )
         res = await res.blob()
         this.setState({ loading: false })

src/container/MonthlyReport/TaxPlanningMR.js

@@ -496,7 +496,7 @@ export default class TaxPlanningMR extends Component {
 
     downloadTemplate = async () => {
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_tp/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/tax_planning/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
         )
         res = await res.blob()
         // console.log(res)
@@ -510,8 +510,8 @@ export default class TaxPlanningMR extends Component {
     }
 
     async downloadAllData() {
-        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
-        let urls = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/tax_planning/monthly_report/export_monthly_report?monthly_report_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        let urls = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/tax_planning/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         // console.log(url);
         console.log(urls);
         let res = await fetch(

src/container/OprIndicator/OperatingIndicator.js

@@ -111,6 +111,7 @@ export default class OperatingIndicator extends Component {
             "periode": this.state.periode.periode,
             "report_type": "operating indicator",
         }
+        console.log(payload);
         api.create().getAllOperatingInd(payload).then(response => {
             console.log(response);
             if (response.data) {
@@ -312,6 +313,18 @@ export default class OperatingIndicator extends Component {
                 })
             } else if (String(item[1]).toLocaleLowerCase().includes("monthly report")) {
                 console.log(item);
+                let month = String(item[1]).toLocaleLowerCase().includes('jan') ? 1 : 
+                            String(item[1]).toLocaleLowerCase().includes('feb') ? 2 : 
+                            String(item[1]).toLocaleLowerCase().includes('mar') ? 3 : 
+                            String(item[1]).toLocaleLowerCase().includes('apr') ? 4 : 
+                            String(item[1]).toLocaleLowerCase().includes('may') ? 5 : 
+                            String(item[1]).toLocaleLowerCase().includes('jun') ? 6 : 
+                            String(item[1]).toLocaleLowerCase().includes('jul') ? 7 : 
+                            String(item[1]).toLocaleLowerCase().includes('aug') ? 8 : 
+                            String(item[1]).toLocaleLowerCase().includes('sep') ? 9 : 
+                            String(item[1]).toLocaleLowerCase().includes('oct') ? 10 : 
+                            String(item[1]).toLocaleLowerCase().includes('nov') ? 11 :
+                            String(item[1]).toLocaleLowerCase().includes('dec') ? 12 : null
                 this.setState({
                     statusDetail: String(item[2]).toLocaleLowerCase(),
                     dataDetail: { ...this.state.dataReport[index], periode: this.state.periode.periode, operatingIndID: this.state.operatingIndID, company: this.state.company },
@@ -319,7 +332,7 @@ export default class OperatingIndicator extends Component {
                     visibleDetailOpt: false,
                     visibleDetailMonthly: true,
                     visibleDetailRolling: false,
-                    months: id === 22 ? 1 : 23 ? 2 : 24 ? 3 : 25 ? 4 : 27 ? 5 : 28 ? 6 : 29 ? 7 : 31 ? 8 : 32 ? 9 : 33 ? 10 : 35 ? 11 : 36 ? 12 : 0
+                    months: month
                     
                 })