Merge branch 'syadziy' into 'master'

Syadziy

See merge request !135

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -197,7 +197,7 @@ export default class CreatePerusahaan extends Component {
                 "company_id": this.state.companyID,
                 "company_name": this.state.company,
                 "business_unit_id": this.state.getTypes.business_unit_id,
-                "parent": this.state.getPerusahaan.company_id,
+                "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
                 // "total_report": this.state.totalReport,
                 "start_date": this.state.startDate,
                 "end_date": this.state.endDate
@@ -223,7 +223,7 @@ export default class CreatePerusahaan extends Component {
         } else {
             let payload = {
                 "company_name": this.state.company,
-                "parent": this.state.getPerusahaan.company_id,
+                "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
                 "business_unit_id": this.state.getTypes.business_unit_id,
                 "total_report": this.state.totalReport,
                 "start_date": this.state.startDate,

src/container/MasterData/Perusahaan/EditPerusahaan.js

@@ -138,7 +138,7 @@ export default class EditPerusahaan extends Component {
             "company_id": this.state.companyID,
             "company_name": this.state.company,
             "business_unit_id": this.state.getTypes.business_unit_id,
-            "parent": this.state.getPerusahaan.company_id,
+            "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
             "total_report": this.state.totalReport,
             "start_date": this.state.startDate,
             "end_date": this.state.endDate

src/container/Otorisasi/User/AddUser.js

@@ -662,8 +662,8 @@ export default class AddUser extends Component {
                         </div>
                     </div>
                     <div style={{ flexDirection: 'column', display: 'flex', paddingLeft: 20, paddingRight: 20 }}>
-                        <Typography style={{ fontSize: 12 }}>{`Dibuat  : ${format(this.state.date, 'dd MMMM yyyy', { locale: localeID })}`}</Typography>
-                        {/* <Typography style={{fontSize: 12}}>{`Diubah: ${this.state.tempData === null? '' : this.state.tempData.updated}`}</Typography> */}
+                        <Typography style={{ fontSize: 12 }}>{`Dibuat: `}</Typography>
+                        <Typography style={{fontSize: 12}}>{`Diubah: `}</Typography>
                     </div>
                     <Divider style={{ margin: 20 }} />
                     <div style={{ paddingLeft: 20, paddingRight: 20 }}>

src/container/Otorisasi/UserRole/AddRole.js

@@ -468,8 +468,8 @@ export default class AddRole extends Component {
                         </div>
                     </div>
                     <div style={{ flexDirection: 'column', display: 'flex', paddingLeft: 20, paddingRight: 20 }}>
-                        <Typography style={{ fontSize: 12 }}>{`Dibuat  : ${format(this.state.date, 'dd MMMM yyyy', { locale: localeID })}`}</Typography>
-                        {/* <Typography style={{fontSize: 12}}>{`Diubah: ${this.state.tempData === null? '' : this.state.tempData.updated}`}</Typography> */}
+                        <Typography style={{ fontSize: 12 }}>{`Dibuat: `}</Typography>
+                        <Typography style={{fontSize: 12}}>{`Diubah: `}</Typography>
                     </div>
                     <Divider style={{ margin: 20 }} />
                     <div style={{ paddingLeft: 20, paddingRight: 20 }}>