Merge branch 'ENV-DEV' into 'ENV-STAGING'

Issue Subco

See merge request !2271

package.json

 {
   "name": "my-app",
   "version": "0.1.0",
-  "homepage": "http://localhost:8080/web-staging/",
+  "homepage": "http://localhost:8080/web/", 
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",

src/assets/sass/app.css

 .main-color{
-  background-color: #0b6b24 !important;
+  background-color: #273b80 !important;
 }
 
+/* for staging */
+/* .main-color{
+  background-color: #0b6b24 !important;
+} */
+
 /* .main-color{
   background-color: #1474CA !important;
 } */

src/container/Menu/Home.js

@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.enteringScreen,
     }),
-    backgroundColor: '#0b6b24'
+    backgroundColor: '#273b80'
   },
   topleftClose: {
     borderRight: 0,
@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
     },
     padding: 20,
     display: 'flex',
-    backgroundColor: '#0b6b24'
+    backgroundColor: '#273b80'
   },
   drawerOpen: {
     width: drawerWidth,

src/container/Reports/SubHolding.js

@@ -4326,6 +4326,10 @@ export default class SubHolding extends Component {
                                         {...this.state.listPeriode}
                                         id="periode"
                                         onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            this.setState({ report: bizpar[0], reportType: bizpar })
+                                            this.getCurrency(this.state.company.company_id)
                                             this.getReportType()
                                         })}
                                         disabled={this.state.intent === 'Home' ? true : false}
@@ -4345,7 +4349,8 @@ export default class SubHolding extends Component {
                                         onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
                                             this.getReportType()
                                             this.getCurrency(newInputValue.company_id)
-                                            let bizpar = this.state.usdBefore2024 == false && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
                                             this.setState({ report: bizpar[0], reportType: bizpar })
                                         })}
                                         disableClearable
@@ -4385,7 +4390,8 @@ export default class SubHolding extends Component {
                                             //     })
                                             //     console.log("report 2");
                                             // }
-                                            let bizpar = this.state.usdBefore2024 == false && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
                                             this.setState({ report: bizpar[0], reportType: bizpar })
                                             this.getReportType()