Merge branch 'faisal' into 'master'

update company

See merge request !167

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -352,7 +352,7 @@ export default class CreatePerusahaan extends Component {
                                     <Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
                                 </div>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Edited</Typography>
+                                    <Typography style={{ fontSize: 11, width: '20%' }}>Updated</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
                                 </div>
                             </div>
@@ -593,7 +593,7 @@ export default class CreatePerusahaan extends Component {
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <Typography style={{ fontSize: 11 }}>Created    : </Typography>
-                                <Typography style={{ fontSize: 11 }}>Edited	: </Typography>
+                                <Typography style={{ fontSize: 11 }}>Updated	: </Typography>
                             </div>
                         </div>
 

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -337,7 +337,7 @@ export default class Perusahaan extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = 'Template Perusahaan.xlsx';
+            a.download = 'Template Company.xlsx';
             a.click();
         }
     }
@@ -352,7 +352,7 @@ export default class Perusahaan extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = 'Perusahaan.xlsx';
+            a.download = 'Company.xlsx';
             a.click();
         }
     }
@@ -649,7 +649,7 @@ export default class Perusahaan extends Component {
                 {this.state.visibleUpload && (
                     <div className="test app-popup-show">
                         <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
-                            <div className="popup-panel grid grid-2x" style={{ backgroundColor: '#51c6ea', height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
+                            <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                                 <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                                     <div className="popup-title">
                                         <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Upload File</span>

src/container/MasterData/Perusahaan/VisualPerusahaan.js

@@ -107,11 +107,11 @@ export default class VisualPerusahaan extends Component {
                     <div style={{ width: '100%', backgroundColor: '#354960' }} />
                         <div>
                             <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
-                                <label style={{ color: 'white', width: '20%', fontSize: 16, paddingTop: 8 }}>Hirarki Perusahaan</label>
+                                <label style={{ color: 'white', width: '20%', fontSize: 16, paddingTop: 8 }}>Company Hierarchy</label>
                             </div>
                             <div style={{ display: 'flex', paddingRight: 25, paddingLeft: 25 }}>
-                                <label style={{ color: '#51c6ea', width: '20%', fontSize: 11 }}>Master Data / Perusahaan / 
-                                    <span style={{ color: 'white', width: '20%', fontSize: 11 }}> Visualisasi</span> 
+                                <label style={{ color: '#51c6ea', width: '20%', fontSize: 11 }}>Master Data / Company / 
+                                    <span style={{ color: 'white', width: '20%', fontSize: 11 }}> Visualization</span> 
                                 </label>
                             </div>
                             <div style={{ padding: 25, width: '100%' }}>
@@ -127,14 +127,14 @@ export default class VisualPerusahaan extends Component {
                             </div>
                             <div className="row" style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 15, paddingLeft: 15, paddingBottom: 25 }}>
                                 <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: 'dodgerblue', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
-                                    <span style={{ color: '#fff', fontSize: 11 }}>Kembali</span>
+                                    <span style={{ color: '#fff', fontSize: 11 }}>Back</span>
                                 </div>
                                 <div className="row" style={{ float: 'right', marginRight: 25 }}>
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
-                                        <span style={{ color: '#354960', fontSize: 11 }} >Batal</span>
+                                        <span style={{ color: '#354960', fontSize: 11 }} >Cancel</span>
                                     </div>
                                     <div onClick={() => this.handleSave()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
-                                        <span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
+                                        <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                     </div>
                                 </div>
                             </div>