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

src/api/index.js

@@ -275,6 +275,7 @@ const create = (type = "") => {
   const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/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 checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
   const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
@@ -285,7 +286,9 @@ const create = (type = "") => {
   const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/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 validateSubmitReportMR = (body) => api.post('transaction/monthly_report_bs/validate_save', body)
+  const validateSubmitReportBS = (body) => api.post('transaction/monthly_report_bs/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)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -428,6 +431,7 @@ const create = (type = "") => {
     createMonthlyReportPL,
     createMonthlyReportFAM,
     createMonthlyReportOI,
+    createMonthlyReportCAT,
     checkUploadMonthlyReportPL,
     getSubmission,
     checkUploadMB,
@@ -514,7 +518,9 @@ const create = (type = "") => {
     uploadMonthlyReportOI,
     uploadMonthlyReportCAT,
     getHierarkiMontlyReportCF,
-    validateSubmitReportMR
+    validateSubmitReportMR,
+    validateSubmitReportMRTP,
+    validateSubmitReportBS
   }
 }
 

src/container/MonthlyReport/BalanceSheetMR.js

@@ -496,7 +496,7 @@ export default class BalanceSheetMR extends Component {
             "balance_sheet": data
         }
         console.log(JSON.stringify(payload));
-        api.create().validateSubmitReportMR(payload).then((response) => {
+        api.create().validateSubmitReportBS(payload).then((response) => {
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -1454,25 +1454,22 @@ export default class FixedAssetsMovementMR extends Component {
                                 <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Monthly Report - Fixed Assets Movement</Typography>
                             </div>
                             <div style={{ padding: 20 }}>
-                                <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-                                    <div>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
-                                    </div>
-
-                                    <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                        {!this.state.loading && (
-                                            <MuiThemeProvider theme={getMuiTheme()}>
-                                                <MUIDataTable
-                                                    data={dataTable2}
-                                                    columns={columns}
-                                                    options={options}
-                                                />
-                                            </MuiThemeProvider>
-                                        )}
-                                    </div>
-                               </div>
+                                <div>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
+                                </div>
+                                <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
+                                    {!this.state.loading && (
+                                        <MuiThemeProvider theme={getMuiTheme()}>
+                                            <MUIDataTable
+                                                data={dataTable2}
+                                                columns={columns}
+                                                options={options}
+                                            />
+                                        </MuiThemeProvider>
+                                    )}
+                                </div>
                                 <div className="grid grid-2x" style={{ marginTop: 20 }}>
                                     <div className="col-1">
                                         <button