Merge branch 'rifka' into 'master'

update btn close

See merge request !168

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -445,7 +445,7 @@ export default class CreateApprovalMatrix extends Component {
                             </div> */}
                         </div>
                         <div className="margin-top-10px" style={{ padding: 10, paddingLeft: 0 }}>
-                            <Typography style={{ fontSize: 11 }}>{`Created at  : ${format(this.state.date, 'dd MMMM yyyy', {locale: localeID})}`}</Typography>
+                            <Typography style={{ fontSize: 11 }}>{`Created by  : `}</Typography>
                             {/* <Typography style={{ fontSize: 11 }}>Diubah	: Admin - 21 Jul 2020, 18:45</Typography> */}
                         </div>
                     </div>

src/container/BudgetTahunan.js

@@ -305,7 +305,9 @@ export default class BudgetTahunan extends Component {
                     <ProfitLoss />
                 )}
                 {this.state.visibleTP && (
-                    <TaxPlanning />
+                    <TaxPlanning 
+                        onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
+                    />
                 )}
                 {this.state.visibleFAM && (
                     <FixedAssetsMovement />

src/container/BudgetTahunan/TaxPlanning.js

@@ -329,16 +329,16 @@ export default class BalanceSheet extends Component {
                     </div>
                     <div className="grid grid-2x" style={{ marginBottom: 20, paddingRight: 10, paddingLeft: 10 }}>
                         <div className="col-1">
-                            <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Kembali</Typography>
+                            <div onClick={() => this.props.onClickClose()} style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', cursor: 'pointer' }}>
+                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
                             </div>
                         </div>
                         <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
-                            <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960', marginRight: 20 }}>
-                                <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Batal</Typography>
+                            <div onClick={() => this.props.onClickClose()} style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960', cursor: 'pointer', marginRight: 20 }}>
+                                <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Cancel</Typography>
                             </div>
-                            <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Simpan</Typography>
+                            <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', cursor: 'pointer' }}>
+                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save</Typography>
                             </div>
                         </div>
                     </div>