Merge branch 'rifka' into 'master'

update tax planning

See merge request !300

src/container/DocumentManagement/CreateManagementDoc.js

@@ -168,11 +168,11 @@ export default class CreateManagementDoc extends Component {
 
     validasi() {
         if (R.isNil(this.state.getPerusahaan)) {
-            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty.' })
+            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
         } else if (R.isNil(this.state.getDocument)) {
-            this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty.' })
+            this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' })
         } else if (R.isNil(this.state.file)) {
-            this.setState({ alert: true, messageAlert: 'File Cannot be Empty.', tipeAlert: 'warning' })
+            this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' })
         } else {
             const formData = new FormData();
             formData.append("file", this.state.file);

src/container/DocumentManagement/DocumentManagement.js

@@ -162,9 +162,7 @@ export default class DocumentManagement extends Component {
                                 onClick={() => this.setState({ visibleCreate: true, refresh: '' })}
                                 style={{ marginRight: 25 }}
                             >
-                                <div style={{ width: 150, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                                    <span style={{ color: '#fff', fontSize: 11 }}>Add</span>
-                                </div>
+                                <img src={Images.add} />
                             </button>
                         </div>
                         <div style={{ display: 'flex' }}>

src/container/DocumentManagement/ManualBookTia.js

@@ -15,7 +15,8 @@ export default class ManualBookTia extends Component {
         this.state = {
             dataTable: [],
             visibleCreate: false,
-            refresh: ''
+            refresh: '',
+            alert: false,
         }
     }
 

src/container/DocumentManagement/QReview.js

@@ -23,7 +23,8 @@ export default class QReview extends Component {
         this.state = {
             dataTable: [],
             visibleCreate: false,
-            refresh: ''
+            refresh: '',
+            alert: false,
         }
     }
 
@@ -47,9 +48,6 @@ export default class QReview extends Component {
 
         api.create().getAllDocument(payload).then((response) => {
             console.log(response)
-            if (response.problem){
-                alert(response.problem)
-            } 
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
@@ -94,7 +92,6 @@ export default class QReview extends Component {
 
     openPopUp = async (index, val, type) =>{
         if (type === 'download') {
-            console.log(this.state.docPath[val])
             let res = await fetch(
                 "https://tia.eksad.com/tia-reporting-dev/public/document/download_document?documentName="+this.state.docPath[val]+"&&fileType="+index[5]
             )
@@ -110,6 +107,10 @@ export default class QReview extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     render() {
         let columns = [{
             name: "Action",
@@ -117,7 +118,6 @@ export default class QReview extends Component {
                 filter: false,
                 sort: false,
                 customBodyRender: (val, tableMeta) => {
-                    console.log(tableMeta)
                     return (
                         <div style={{ display: 'flex' }}>
                             {/* {this.state.btnedit && <span> */}

src/library/Upload.js

@@ -70,7 +70,7 @@ class Upload extends Component {
                         // alert('File Tidak Boleh Lebih Dari 1MB')
                     }
                 } else {
-                    this.setState({ alertMessage: 'File extension not allowed.', alert: true })
+                    this.setState({ alertMessage: 'File extension not allowed', alert: true })
                     // alert('File Tidak Mendukung')
                 }
             }
@@ -81,7 +81,7 @@ class Upload extends Component {
                     uploadProgress: false,
                     percentage: '0'
                 })
-                this.setState({ alertMessage: "File extension not allowed.", alert: true })
+                this.setState({ alertMessage: "File extension not allowed", alert: true })
                 // alert("Unsupported Media Type")
             }
         } else {
@@ -105,7 +105,7 @@ class Upload extends Component {
                     uploadProgress: false,
                     percentage: '0'
                 })
-                this.setState({ alertMessage: "File extension not allowed.", alert: true })
+                this.setState({ alertMessage: "File extension not allowed", alert: true })
                 // alert("Unsupported Media Type")
             }
         }
@@ -154,7 +154,7 @@ class Upload extends Component {
                 }
             }
         } else {
-            this.setState({ alertMessage: 'File extension not allowed.', alert: true })
+            this.setState({ alertMessage: 'File extension not allowed', alert: true })
             // alert('File Tidak Mendukung')
         }
     }