Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1331

src/api/index.js

@@ -248,7 +248,7 @@ const create = (type = "") => {
   const getRollingOutlookReport = (body) => api.post('transaction/rolling_outlook/get_all_report', body)
   const getRollingOutlookLastUpdate = (body) => api.post('transaction/rolling_outlook/get_latest_update', body)
   const getRollingOutlookRevision = (body) => api.post('transaction/rolling_outlook/get_revision', body)
-  const getRollingOutlookIsApprover = (body) => api.get('transaction/rolling_outlook/is_approver')
+  const getRollingOutlookIsApprover = (body) => api.get('transaction/rolling_outlook/is_approver', body)
   const uploadAttachmentRO = (body) => api.post('transaction/rolling_outlook/upload_attachment', body)
   const deleteAttachmentRO = (id) => api.post(`transaction/rolling_outlook/delete_attachment/${id}`)
 

src/container/RollingOutlook.js

@@ -124,6 +124,7 @@ export default class RollingOutlook extends Component {
     }
 
     checkApprover() {
+        // console.log('tot')
         let listStatus1 = [
             { name: 'Open', value: 'not-yet' },
             { name: 'Submitted', value: 'approval_review' },
@@ -138,6 +139,7 @@ export default class RollingOutlook extends Component {
         ]
 
         api.create().getRollingOutlookIsApprover().then(response => {
+            // console.log('yuuuu')
             console.log(response);
             if (response.data.data.is_approver === true) {
                 this.setState({ isApprover: true, checkApprover: true, listStatus: listStatus1, selectedStatus: listStatus1 }, () =>
@@ -533,15 +535,15 @@ export default class RollingOutlook extends Component {
                         console.log(this.state.lastStatus);
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
-                        api.create().checkApprover().then(response => {
-                            // console.log(response);
-                            if (response.data.data.is_approver === true) {
+                        // api.create().checkApprover().then(response => {
+                        //     console.log(response);
+                            if (this.state.isApprover) {
                                 this.setState({ isApprover: true, checkApprover: true })
                             } else {
                                 this.setState({ isApprover: this.state.lastStatus === "SUBMITTED" ? true : false, checkApprover: false })
                             }
 
-                        })
+                        // })
                     })
                 } else {
                     this.setState({ rollingOutlookID: null, loading: false })