Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/BudgetTahunan.js

@@ -1019,6 +1019,7 @@ export default class BudgetTahunan extends Component {
                         onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })}
                         getReport={this.getCompanyActive.bind(this)}
                         status={this.state.status}
+                        isApprover={this.state.isApprover}
                     />
                 )}
                 {this.state.visibleCAT && (

src/container/BudgetTahunan/BalanceSheet.js

@@ -45,7 +45,8 @@ export default class BalanceSheet extends Component {
             editable: false,
             buttonError: false,
             judulColumn: null,
-            updateBy: '-'
+            updateBy: '-',
+            handleTekTekTek: 0
         }
         this.handleValue = this.handleValue.bind(this)
         this.fileHandler = this.fileHandler.bind(this);
@@ -326,7 +327,7 @@ export default class BalanceSheet extends Component {
                             item.total_current_year,
                             item.total_next_year,
                             item.total_more_year,
-                            item.order,
+                            item.orders,
                             item.error
                         ]
                     })
@@ -2126,13 +2127,14 @@ export default class BalanceSheet extends Component {
                                                 outline: 'none',
                                                 marginRight: 20
                                             }}
-                                            onClick={() => this.state.editable === true ?
+                                            onClick={() =>
+                                                this.state.editable === true ?
                                                     null :
-                                                this.setState({ loading: true }, () => {
-                                                    setTimeout(() => {
+                                                    this.state.handleTekTekTek == 1 ? null :
+                                                        this.setState({ handleTekTekTek: 1 }, () => {
                                                             this.backToMasterBudget('draft')
-                                                    }, 100);
-                                                })}
+                                                        })
+                                            }
                                         >
                                             <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
                                                 <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
@@ -2141,17 +2143,14 @@ export default class BalanceSheet extends Component {
                                         <button
                                             type="button"
                                             disabled={this.state.buttonError}
-                                            onClick={() => {
+                                            onClick={() =>
                                                 this.state.buttonError ?
-                                                    this.setState({ loading: true }, () => {
-                                                        setTimeout(() => {
-                                                            this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning', loading: false })
-                                                        }, 100);
-                                                    })
-                                                    : this.setState({ loading: true }, () => {
+                                                    this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
+                                                    :
+                                                    this.state.handleTekTekTek == 1 ? null :
+                                                        this.setState({ handleTekTekTek: 1 }, () => {
                                                             this.backToMasterBudget('submitted')
-                                                    })
-                                            }}
+                                                        })}
                                             style={{
                                                 backgroundColor: 'transparent',
                                                 cursor: this.state.buttonError === true ? 'default' : 'pointer',
@@ -2233,11 +2232,14 @@ export default class BalanceSheet extends Component {
                                         <button
                                             type="button"
                                             disabled={this.state.buttonError}
-                                            onClick={() => this.setState({ loading: true }, () => {
+                                            onClick={() => this.setState({ loading: true }, () =>
+                                                this.state.handleTekTekTek == 1 ? null :
+                                                    this.setState({ handleTekTekTek: 1 }, () => {
                                                         setTimeout(() => {
                                                             this.uploadBalanceSheet('draft')
                                                         }, 100);
-                                            })}
+                                                    })
+                                            )}
                                             style={{ marginRight: 20 }}
                                         >
                                             <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
@@ -2247,11 +2249,14 @@ export default class BalanceSheet extends Component {
                                         <button
                                             type="button"
                                             disabled={this.state.buttonError}
-                                            onClick={() => this.setState({ loading: true }, () => {
+                                            onClick={() => this.setState({ loading: true }, () =>
+                                                this.state.handleTekTekTek == 1 ? null :
+                                                    this.setState({ handleTekTekTek: 1 }, () => {
                                                         setTimeout(() => {
                                                             this.uploadBalanceSheet('submitted')
                                                         }, 100);
-                                            })}
+                                                    })
+                                            )}
                                         >
                                             <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
                                                 <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>