Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -285,6 +285,7 @@ export default class Perusahaan extends Component {
         this.setState({ visibleEdit: false })
         api.create().updatePerusahaan(payload).then(response => {
             if (response.data.status == 'success') {
+                alert(response.data.message)
                 this.getData()
             } else {
                 alert(response.data.message)
@@ -296,6 +297,7 @@ export default class Perusahaan extends Component {
         this.setState({ visibleCreate: false })
         api.create().createPerusahaan(payload).then(response => {
             if (response.data.status == 'success') {
+                alert(response.data.message)
                 this.getData()
             } else {
                 alert(response.data.message)
@@ -580,7 +582,7 @@ export default class Perusahaan extends Component {
                 )}
 
                 {this.state.visibleEdit && (
-                    <EditPerusahaan
+                    <CreatePerusahaan
                         type={"edit"}
                         onClickClose={() => this.setState({ visibleEdit: false })}
                         data={this.state.listData[this.state.selectIndex]}
@@ -588,6 +590,15 @@ export default class Perusahaan extends Component {
                     />
                 )}
 
+                {/* {this.state.visibleEdit && (
+                    <EditPerusahaan
+                        type={"edit"}
+                        onClickClose={() => this.setState({ visibleEdit: false })}
+                        data={this.state.listData[this.state.selectIndex]}
+                        updatePerusahaan={this.updatePerusahaan.bind(this)}
+                    />
+                )} */}
+
                 {this.state.popupError && (
                     <PopUpFailedSave onClickClose={() => this.setState({ popupError: false })} />
                 )}

src/container/Otorisasi/UserRole/AddRole.js

@@ -116,7 +116,7 @@ export default class AddRole extends Component {
         } else if (R.isNil(this.state.endDate)) {
             this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
         } else if (this.state.privileges.length < 1) {
-            alert('Hak Akses belum di pilih !!')
+            this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
         } else {
             this.addRole()
         }

src/container/Otorisasi/UserRole/EditRole.js

@@ -122,7 +122,7 @@ export default class EditRole extends Component {
         } else if (R.isNil(this.state.tempData.end_date)) {
             this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
         } else if (this.state.privileges.length < 1) {
-            alert('Hak Akses belum di pilih !!')
+            this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
         } else {
             this.updateRole()
         }