Skip to content

T
Tia-dev
Commit ad793fb0 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

issue ribet

See merge request !2218
parents ea59a3da 4097b03f
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
src/container/GeneralSetting/MaintenanceMode.js
View file @ ad793fb0
...@@ -235,34 +235,34 @@ class MaintenanceMode extends Component { ...@@ -235,34 +235,34 @@ class MaintenanceMode extends Component {
"maintenance_headline": this.state.headline, "maintenance_headline": this.state.headline,
"maintenance_content": this.state.maintenanceContent, "maintenance_content": this.state.maintenanceContent,
"maintenance_status": this.state.maintenanceStatus, "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": [ "maintenance_mail": [
{ {
"mail_type": "MAINTENANCE_MODE_ACTIVE", "mail_type": "MAINTENANCE_MODE_ACTIVE",
"mail_subject": this.state.subjectMailActive, "mail_subject": this.state.subjectMailActive,
"mail_body": this.state.mailcontentModeActive, "mail_body": this.state.mailcontentModeActive,
"mail_status": this.state.mailStatusActive "mail_status": 0
}, },
{ {
"mail_type": "MAINTENANCE_MODE_INACTIVE", "mail_type": "MAINTENANCE_MODE_INACTIVE",
"mail_subject": this.state.subjectMailNonActive, "mail_subject": this.state.subjectMailNonActive,
"mail_body": this.state.mailcontentModeNonActive, "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); console.log(payload);
api.create().updateMaintenanceMode(payload).then((response) => { api.create().updateMaintenanceMode(payload).then((response) => {
...@@ -846,4 +846,4 @@ class MaintenanceMode extends Component { ...@@ -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
View file @ ad793fb0
...@@ -4344,6 +4344,8 @@ export default class SubHolding extends Component { ...@@ -4344,6 +4344,8 @@ export default class SubHolding extends Component {
onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => { onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
this.getReportType() this.getReportType()
this.getCurrency(newInputValue.company_id) 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 disableClearable
style={{ width: 250 }} style={{ width: 250 }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment