Merge branch 'faisal' into 'master'

compeni

See merge request !200

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -186,13 +186,13 @@ export default class CreatePerusahaan extends Component {
 
     validasiEdit() {
         if (R.isEmpty(this.state.company)) {
-            this.setState({ errorNP: true, msgErrorNP: 'Company Name required' })
+            this.setState({ errorNP: true, msgErrorNP: 'Company Name Cannot be Empty' })
         } else if (R.isNil(this.state.getTypes)) {
-            this.setState({ errorUB: true, msgErrorUB: 'Business Unit required' })        
+            this.setState({ errorUB: true, msgErrorUB: 'Business Unit Cannot be Empty' })        
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorSD: true, msgErrorSD: 'Valid From required' })
+            this.setState({ errorSD: true, msgErrorSD: 'Valid From Cannot be Empty' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorED: true, msgErrorED: 'Valid To required' })
+            this.setState({ errorED: true, msgErrorED: 'Valid To Cannot be Empty' })
         } else {
             let payload = {
                 "company_id": this.state.companyID,
@@ -208,13 +208,13 @@ export default class CreatePerusahaan extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.company)) {
-            this.setState({ errorNP: true, msgErrorNP: 'Company Name required' })
+            this.setState({ errorNP: true, msgErrorNP: 'Company Name Cannot be Empty' })
         } else if (R.isNil(this.state.getTypes)) {
-            this.setState({ errorUB: true, msgErrorUB: 'Business Unit required' })        
+            this.setState({ errorUB: true, msgErrorUB: 'Business Unit Cannot be Empty' })        
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorSD: true, msgErrorSD: 'Valid From required' })
+            this.setState({ errorSD: true, msgErrorSD: 'Valid From Cannot be Empty' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorED: true, msgErrorED: 'Valid To required' })
+            this.setState({ errorED: true, msgErrorED: 'Valid To Cannot be Empty' })
         } 
         else {
             let payload = {
@@ -538,7 +538,7 @@ export default class CreatePerusahaan extends Component {
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5, backgroundColor: '#e8e8e8', }}>
                                 <TextField
                                     style={{ width: '100%' }}
-                                    defaultValue={"Aktif"}
+                                    defaultValue={"Active"}
                                     id="status"
                                     label="Status"
                                     disabled