Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/api/index.js

@@ -189,7 +189,7 @@ const create = (type = "") => {
   const uploadAttachment = (body) => api.post('transaction/master_budget/upload_attachment', body)
   const getRevision = (body) => api.post('transaction/master_budget/get_revision', body)
   const getPeriodeTransaction = () => api.get('transaction/get_periode')
-  const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`)
+  const deleteAttachment = (id) => api.post(`transaction/master_budget/delete_attachment/${id}`)
   const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
   const getLastestUpdateMB = (body) => api.post('/transaction/master_budget/get_latest_update', body)
   const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)

src/container/BudgetTahunan.js

@@ -177,7 +177,7 @@ export default class BudgetTahunan extends Component {
                             item.number,
                             item.report_name,
                             item.revision,
-                            this.state.isSubmit === false ? "CLOSED" : item.current_status,
+                            this.state.lastStatus === 'APPROVE' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : item.current_status,
                             item.report_id,
                             Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
                             item.revision
@@ -567,6 +567,7 @@ export default class BudgetTahunan extends Component {
 
     deleteAttachment(item) {
         api.create().deleteAttachment(item.attachment_id).then(response => {
+            console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     this.getSubmission()
@@ -1079,6 +1080,9 @@ export default class BudgetTahunan extends Component {
                                                 </div> : this.state.lastStatus === 'WAITING FOR APPROVAL' ?
                                                     <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                                         <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
+                                                    </div> : this.state.lastStatus === 'APPROVED' ?
+                                                        <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                            <span>{`${this.state.lastStatus}`}</span>
                                                         </div> : null
                                         :
                                         this.state.lastStatus === 'SUBMITTED' ?