Merge branch 'ENV-STAGING' into 'ENV-PROD'

Fixing Issue TEM OLPA BS

See merge request !2194

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -483,7 +483,7 @@ export default class BalanceSheetOLPA extends Component {
                                 this.setState({ buttonError: true, errorPreview: true, editable: true })
                             }
                         })
-                        console.log(this.state.dataTable);
+                        // console.log(this.state.dataTable);
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -552,6 +552,7 @@ export default class BalanceSheetOLPA extends Component {
             balance_sheet: data,
             status: type
         }
+        console.log(body);
         // console.log(JSON.stringify(body));
         api.create('UPLOAD').uploadOLPA(body).then(response => {
             console.log(response);
@@ -628,13 +629,13 @@ export default class BalanceSheetOLPA extends Component {
                 // console.log(Number(i[18].value).toFixed(1))
                 // console.log(Number(i[19]).toFixed(1))
 
-                if ((this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[17].value), 1) : Number(i[17].value) < Number(this.state.minValue)) || (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[17].value), 1) : Number(i[17].value) > Number(this.state.maxValue))) {
+                if (this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[17].value), 1) < Number(this.state.minValue)) : (Number(i[17].value) < Number(this.state.minValue)) || this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[17].value), 1) > Number(this.state.maxValue)) : (Number(i[17].value) > Number(this.state.maxValue))) {
                     console.log("masuk selisih control 1")
                     err = true
-                } else if ((this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[18].value), 1) : Number(i[18].value) < Number(this.state.minValue)) || (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[18].value), 1) : Number(i[18].value) > Number(this.state.maxValue))) {
+                } else if (this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[18].value), 1) < Number(this.state.minValue)) : (Number(i[18].value) < Number(this.state.minValue)) || this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[18].value), 1) > Number(this.state.maxValue)) : (Number(i[18].value) > Number(this.state.maxValue))) {
                     console.log("masuk selisih control 2")
                     err = true
-                } else if ((this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[19]), 1) : Number(i[19]) < Number(this.state.minValue)) || (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[19]), 1) : Number(i[19]) > Number(this.state.maxValue))) {
+                } else if (this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[19]), 1) < Number(this.state.minValue)) : (Number(i[19]) < Number(this.state.minValue)) || this.props.defaultCurrency.id == 1 ? (fixNumber(Number(i[19]), 1) > Number(this.state.maxValue)) : (Number(i[19]) > Number(this.state.maxValue))) {
                     console.log("masuk selisih control 3")
                     err = true
                 }
@@ -658,7 +659,7 @@ export default class BalanceSheetOLPA extends Component {
                 total_current_year: i[0] === 3 && i[19] === "" ? "0.0" : String(Number(i[19])),
             })
         })
-        console.log(JSON.stringify(data))
+        // console.log(JSON.stringify(data))
         let payload = {
             "outlook_pa_id": this.props.outlook_pa_id,
             "company_id": this.props.company.company_id,
@@ -669,26 +670,26 @@ export default class BalanceSheetOLPA extends Component {
             "status": "submitted"
         }
         api.create().validateSubmitReportOLPA(payload).then((response) => {
-            // console.log(response)
+            console.log(response)
             // console.log(response.data.data.result)
-            // console.log(err);
+            console.log(err);
             if (response.data) {
                 if (response.data.status === "success") {
                     if (response.data.data.result && err === false) {
                         this.setState({ loading: false, buttonError: false, editable: false, saveDraft: false })
                         if (kansas == 0) {
-                            this.setState({ kansas: 1, loading: true }, () => {
-                                this.handleValidate()
-                            })
+                            // this.setState({ kansas: 1, loading: true }, () => {
+                            // this.handleValidate()
+                            // })
                         } else {
                             this.setState({ kansas: 0 })
                         }
                     } else {
                         this.setState({ loading: false, buttonError: true, editable: true, saveDraft: true })
                         if (kansas == 0) {
-                            this.setState({ kansas: 1, loading: true }, () => {
-                                this.handleValidate()
-                            })
+                            // this.setState({ kansas: 1, loading: true }, () => {
+                            // this.handleValidate()
+                            // })
                         } else {
                             this.setState({ kansas: 0 })
                         }
@@ -2455,4 +2456,4 @@ export default class BalanceSheetOLPA extends Component {
             </div>
         )
     }
-}
+}
\ No newline at end of file