Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Env dev

See merge request !2393

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2228,18 +2228,18 @@ export default class BudgetTahunan extends Component {
             document.body.style.overflow = 'hidden';
         })
         let body = {
-            "approval_id": this.state.approverID,
+            "approval_id": master_report_type_id === 2 ? this.state.approverIDCAT : this.state.approverID,
             "status": type,
             "detail": this.state.detailRevisiCheck,
             "is_superadmin": this.state.isAdmin,
             "currency_id": this.state.defaultCurrency.id,
+            master_report_type_id
         }
         let payload = {
             "company_id": this.state.company.company_id,
             "periode": this.state.periode.periode,
             "min_periode": moment(this.state.minDateRevision).format('YYYY-MM-DD'),
             "max_periode": moment(this.state.maxDateRevision).format('YYYY-MM-DD'),
-            master_report_type_id
         }
         // console.log(payload)
         // // console.log(this.props.location);
@@ -3045,7 +3045,7 @@ export default class BudgetTahunan extends Component {
                     </div>
                 </div>
                 :
-                this.state.isAdmin && (obj.lastStatus == 'WAITING FOR YOUR APPROVAL' || obj.lastStatus == 'WAITING FOR APPROVAL') ?
+                this.state.isAdmin && (obj.lastStatus === 'WAITING FOR YOUR APPROVAL' || obj.lastStatus === 'WAITING FOR APPROVAL') ?
                     <div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
                         <div className="col-1" />
                         <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>