Merge branch 'rifka' into 'master'

mr dan tpmr lagi

See merge request !565

src/container/MonthlyReport.js

@@ -557,9 +557,9 @@ export default class MonthlyReport extends Component {
                         periode={this.state.periode.periode}
                         submissionID={this.state.submissionID}
                         // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
-                        onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
+                        // onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
                         // getReport={this.getCompanyActive.bind(this)}
-                        // onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
+                        onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
                     />
                 )}
                 {this.state.visibleFAM && (

src/container/MonthlyReport/TaxPlanningMR.js

@@ -1857,7 +1857,7 @@ export default class TaxPlanningMR extends Component {
         return (
             <div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
-                    <Typography style={{ fontSize: '16px', color: 'white' }}>Master Budget Submission</Typography>
+                    <Typography style={{ fontSize: '16px', color: 'white' }}>Monthly Report Submission</Typography>
                 </div>
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
@@ -1869,13 +1869,13 @@ export default class TaxPlanningMR extends Component {
                     {this.state.visibleTP === true ?
                         <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                             <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                                <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget - Tax Planning</Typography>
+                                <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Monthly Report - Tax Planning</Typography>
                             </div>
                             <div style={{ padding: 20 }}>
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>TFX - TaxPlan</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : 2021 (rev.0)</Typography>
+                                        <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={{ width: '50%' }}>
@@ -1995,8 +1995,8 @@ export default class TaxPlanningMR extends Component {
                                         </div>
                                     </button>
                                 </div>
-                                {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
-                                    (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
+                                {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
+                                    (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
                                 <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                     <button
                                         className="button"
@@ -2071,6 +2071,7 @@ export default class TaxPlanningMR extends Component {
                                         </div>
                                     </button>
                                 </div>
+                                : null }
                             </div>
                         </Paper>
                         :