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

src/api/index.js

@@ -191,6 +191,7 @@ const create = (type = "") => {
   const getPeriodeTransaction = () => api.get('transaction/get_periode')
   const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`)
   const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
+  const getLastestUpdateMB = (body) => api.post('/transaction/master_budget/get_latest_update', body)
   const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)
   const getSubmission = (body) => api.post('transaction/get_submission_id', body)
   const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
@@ -348,7 +349,8 @@ const create = (type = "") => {
     deleteAllItemReport,
     validateSubmitReport,
     checkUploadOperatingInd,
-    uploadOperatingInd
+    uploadOperatingInd,
+    getLastestUpdateMB
   }
 }
 

src/container/BudgetTahunan.js

@@ -349,7 +349,7 @@ export default class BudgetTahunan extends Component {
 
 
     render() {
-        const columns = ["#", "Jenis Laporan",
+        const columns = ["#", "Report Type",
             {
                 name: "Revision",
                 options: {
@@ -464,12 +464,12 @@ export default class BudgetTahunan extends Component {
                 {this.state.visibleBudgetTahunan && (
                     <div>
                         <div className={"main-color"} style={{ height: 78, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
-                            <Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
+                            <Typography style={{ fontSize: '16px', color: 'white' }}>Master Budget Submission</Typography>
                         </div>
                         <div style={{ padding: 20, width: '100%' }}>
                             <Paper style={{ paddingTop: 10 }}>
                                 <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                                    <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan</Typography>
+                                    <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget</Typography>
                                 </div>
                                 <div style={{ padding: 20 }}>
                                     <div>
@@ -484,7 +484,7 @@ export default class BudgetTahunan extends Component {
                                             disableClearable
                                             style={{ width: 250 }}
                                             renderInput={(params) =>
-                                                <TextField {...params} label="Periode" margin="normal" style={{ marginTop: 7 }}
+                                                <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }}
                                                 />}
                                             value={this.state.periode}
                                         />

src/container/BudgetTahunan/TaxPlanning.js

@@ -661,7 +661,7 @@ export default class TaxPlanning extends Component {
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
-            "balance_sheet": data,
+            "tax_planning": data,
             "status": "submitted"
         }
         api.create().validateSubmitReport(payload).then((response) => {
@@ -725,7 +725,7 @@ export default class TaxPlanning extends Component {
             let total = 0
             dataTable2[tableMeta.rowIndex].map((item, index) => {
                 if (index >= 9 && index <= 20) {
-                    console.log(item);
+                    // console.log(item);
                     let valItem = item.fcp == undefined || item.fcp == "" ? 0 : item.fcp
                     total += Number(valItem)
                 }
@@ -4075,7 +4075,7 @@ export default class TaxPlanning extends Component {
                             <div className="grid grid-3x content-center">
                                 {/* <div className="col-1"> */}
                                     <div style={{ textAlign: 'right' }}>
-                                    {tableMeta.rowData[1] === 3 ?
+                                    {tableMeta.rowData[2] === 3 ?
                                             <div style={{ flex: 1 }}>
                                                 <FormControlLabel
                                                     style={{ margin: 0 }}
@@ -4851,8 +4851,8 @@ export default class TaxPlanning extends Component {
                                             // this.forceUpdate()
                                             this.setState({ loading: true }, () => {
                                                 setTimeout(() => {
-                                                    this.setState({ loading: false, buttonError: false, editable: true })
-                                                    // this.handleValidate()
+                                                    // this.setState({ loading: false, buttonError: false, editable: true })
+                                                    this.handleValidate()
                                                 }, 100);
                                             })
                                         }}