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

issue ribet

See merge request !2218

src/container/GeneralSetting/MaintenanceMode.js

@@ -235,34 +235,34 @@ class MaintenanceMode extends Component {
             "maintenance_headline": this.state.headline,
             "maintenance_content": this.state.maintenanceContent,
             "maintenance_status": this.state.maintenanceStatus,
-            // "maintenance_mail": [
-            //     {
-            //         "mail_type": "MAINTENANCE_MODE_ACTIVE",
-            //         "mail_subject": "TIA 4.0 Is Under Maintenance",
-            //         "mail_body": "",
-            //         "mail_status": 0
-            //     },
-            //     {
-            //         "mail_type": "MAINTENANCE_MODE_INACTIVE",
-            //         "mail_subject": "TIA 4.0 is Back",
-            //         "mail_body": "",
-            //         "mail_status": 1
-            //     }
-            // ]
             "maintenance_mail": [
                 {
                     "mail_type": "MAINTENANCE_MODE_ACTIVE",
                     "mail_subject": this.state.subjectMailActive,
                     "mail_body": this.state.mailcontentModeActive,
-                    "mail_status": this.state.mailStatusActive
+                    "mail_status": 0
                 },
                 {
                     "mail_type": "MAINTENANCE_MODE_INACTIVE",
                     "mail_subject": this.state.subjectMailNonActive,
                     "mail_body": this.state.mailcontentModeNonActive,
-                    "mail_status": this.state.mailStatusNonActive
+                    "mail_status": 1
                 }
             ]
+            // "maintenance_mail": [
+            //     {
+            //         "mail_type": "MAINTENANCE_MODE_ACTIVE",
+            //         "mail_subject": this.state.subjectMailActive,
+            //         "mail_body": this.state.mailcontentModeActive,
+            //         "mail_status": this.state.mailStatusActive
+            //     },
+            //     {
+            //         "mail_type": "MAINTENANCE_MODE_INACTIVE",
+            //         "mail_subject": this.state.subjectMailNonActive,
+            //         "mail_body": this.state.mailcontentModeNonActive,
+            //         "mail_status": this.state.mailStatusNonActive
+            //     }
+            // ]
         }
         console.log(payload);
         api.create().updateMaintenanceMode(payload).then((response) => {
@@ -846,4 +846,4 @@ class MaintenanceMode extends Component {
     }
 }
 
-export default MaintenanceMode;
+export default MaintenanceMode;
\ No newline at end of file

src/container/Reports/SubHolding.js

@@ -4344,6 +4344,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
+                                            this.setState({ report: bizpar[0], reportType: bizpar })
                                         })}
                                         disableClearable
                                         style={{ width: 250 }}