Merge branch 'rifka' into 'master'

tp ketinggalan view aktual ytd

See merge request !891

src/container/MonthlyReport/TaxPlanningMR.js

@@ -88,7 +88,6 @@ export default class TaxPlanningMR extends Component {
                         maxValue: response.data.data[0] ? response.data.data[0].max_value : null,
                     }, () => {
                         this.getItemHierarki()
-                        console.log("masuk ko")
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -1223,7 +1222,7 @@ export default class TaxPlanningMR extends Component {
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
-                                                    value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value).toFixed(2) : Number(value).toFixed(1)}
+                                                    value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(tableMeta.rowData[16]).toFixed(2) : Number(tableMeta.rowData[16]).toFixed(1)}
                                                 />
                                             }
                                         />
@@ -1336,7 +1335,7 @@ export default class TaxPlanningMR extends Component {
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
-                                                    value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value).toFixed(2) : Number(value).toFixed(1)}
+                                                    value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(tableMeta.rowData[11]).toFixed(2) : Number(tableMeta.rowData[11]).toFixed(1)}
                                                 />
                                             }
                                         />