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

fix get pic

See merge request !2398

src/container/BudgetTahunan/BudgetTahunan.js

@@ -360,7 +360,7 @@ export default class BudgetTahunan extends Component {
                             item.revision,
                             (item?.master_report_type_id === 2 ? this.state.lastStatusCat : this.state.lastStatus) === 'APPROVED' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : status_approv,
                             item.report_id,
-                            item.report_name === "Cash Flow" ? handleOpbal(item.is_can_upload) : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : handleOpbal(item.is_can_upload)) : handleOpbal(item.is_can_upload)),
+                            item.report_name === "Cash Flow" ? handleOpbal(item.is_can_upload) : (Number(item.revision) > 0 ? (item.current_status === "not-yet" ? false : handleOpbal(item.is_can_upload)) : handleOpbal(item.is_can_upload)),
                             item.revision
                         ]
                     })
@@ -676,7 +676,7 @@ export default class BudgetTahunan extends Component {
         let payload = {
             "company_id": this.state.company.company_id,
             "periode": this.state.periode.periode,
-            "is_approver": this.state.isAdmin && _lastStatus == 'WAITING FOR APPROVAL' ? false : (this.state.permissionhandle ? this.state.permissionhandle : this.state.isApprover)
+            "is_approver": this.state.isAdmin && _lastStatus === 'WAITING FOR APPROVAL' ? false : (this.state.permissionhandle ? this.state.permissionhandle : this.state.isApprover)
         }
         console.log(payload)
         api.create().getSubmission(payload).then(response => {
@@ -2772,13 +2772,15 @@ export default class BudgetTahunan extends Component {
             lastStatusCat,
             submitter,
             submitterCAT,
+            pic,
+            picCAT
         } = this.state;
 
         const key = tableKeyParam ?? tableKey;
 
         return key === 2
-            ? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT }
-            : { btnApprove, lastStatus, submitter };
+            ? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT, pic: picCAT }
+            : { btnApprove, lastStatus, submitter, pic };
     };
 
     renderFilter = () => {
@@ -2982,7 +2984,7 @@ export default class BudgetTahunan extends Component {
                             <span>{obj.lastStatus}</span>
                         </div> : obj.lastStatus === 'WAITING FOR APPROVAL' ?
                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
-                                <span>{`${obj.lastStatus} - ${this.state.pic}`}</span>
+                                <span>{`${obj.lastStatus} - ${obj.pic}`}</span>
                             </div> : obj.lastStatus === 'APPROVED' ?
                                 <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                     <span>{`${obj.lastStatus}`}</span>
@@ -2994,7 +2996,7 @@ export default class BudgetTahunan extends Component {
                     </div> :
                     obj.lastStatus === 'WAITING FOR APPROVAL' ?
                         <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
-                            <span>{`${obj.lastStatus} - ${this.state.pic}`}</span>
+                            <span>{`${obj.lastStatus} - ${obj.pic}`}</span>
                         </div> :
                         obj.lastStatus === 'REVISION' ?
                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>