Merge branch 'rifka' into 'master'

on isApprover tp & lbt

See merge request !554

src/container/BudgetTahunan/TaxPlanning.js

@@ -93,7 +93,7 @@ export default class TaxPlanning extends Component {
             "submission_id": this.props.submissionID
         }
         api.create().getDetailReportMB(payload).then(response => {
-            // console.log(response);
+            console.log(payload);
             let dataTable = []
             if (response.data) {
                 let res = response.data.data
@@ -7513,8 +7513,8 @@ export default class TaxPlanning 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"
@@ -7527,7 +7527,6 @@ export default class TaxPlanning extends Component {
                                             marginRight: 20
                                         }}
                                         onClick={() => {
-                                            // this.forceUpdate()
                                             this.setState({ loading: true, buttonDraft: false }, () => {
                                                 setTimeout(() => {
                                                     // this.setState({ loading: false, buttonError: false, editable: true })
@@ -7588,7 +7587,8 @@ export default class TaxPlanning extends Component {
                                             <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
                                         </div>
                                     </button>
-                                </div>
+                                </div> : null
+                                } 
                             </div>
                         </Paper>
                         :