Merge branch 'riri' into 'master'

handletektektek

See merge request !857

src/container/MonthlyReport/BalanceSheetMR.js

@@ -419,7 +419,7 @@ export default class BalanceSheetMR extends Component {
                     this.props.onClickClose()
                     // this.props.getReport()
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleTekTekTek: 0 }, () => {
                         if (response.data.message.includes("Someone Logged In")) {
                             setTimeout(() => {
                                 localStorage.removeItem(Constant.TOKEN)
@@ -429,7 +429,7 @@ export default class BalanceSheetMR extends Component {
                     })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, handleTekTekTek: 0 })
             }
         })
     }
@@ -472,12 +472,12 @@ export default class BalanceSheetMR extends Component {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()
                 } else {
-                    this.setState({ loading: false }, () => {
+                    this.setState({ loading: false, handleTekTekTek: 0 }, () => {
                         this.props.saveToMonthlyReport()
                     })
                 }
             } else {
-                this.setState({ loading: false })
+                this.setState({ loading: false, handleTekTekTek: 0 })
             }
         })
     }

src/container/MonthlyReport/ProfitLossMR.js

@@ -389,12 +389,12 @@ export default class ProfitLossMR extends Component {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()
                 } else {
-                    this.setState({ loading: false }, () => {
+                    this.setState({ loading: false, handleTekTekTek: 0 }, () => {
                         this.props.saveToMonthlyReport()
                     })
                 }
             } else {
-                this.setState({ loading: false })
+                this.setState({ loading: false, handleTekTekTek: 0 })
             }
         })
     }
@@ -537,7 +537,7 @@ export default class ProfitLossMR extends Component {
                         // this.props.onClickClose()
                         // this.props.getReport()
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleTekTekTek: 0 }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -548,10 +548,10 @@ export default class ProfitLossMR extends Component {
                         // alert(response.data.status)
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false, handleTekTekTek: 0 })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, handleTekTekTek: 0 })
             }
         })
     }