Skip to content

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

Merge branch 'dev/riri' into 'ENV-DEV' 

Currency MB PL

See merge request !1795
parents 6812a354 64eada77
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 31 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ d9163c6c
......@@ -97,7 +97,9 @@ export default class BudgetTahunan extends Component {
downloadedFileReportId: null,
arrayReport: [],
popupDownload: false,
currency: null,
defaultCurrency: null,
dataCurrency: [],
currency: [],
dataCurrency: [
{
"id": 1,
......@@ -259,7 +261,6 @@ export default class BudgetTahunan extends Component {
this.setState({ listCompany: defaultProps, company: indexID == null ? (this.state.company !== null ? this.state.company : companyData[0]) : companyData[indexID] }, () => {
// this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID] }, () => {
// // // console.log(response.data.data);
if (response.data.data.length > 0) {
this.getRevision()
} else {
......@@ -310,6 +311,7 @@ export default class BudgetTahunan extends Component {
"company_id": this.state.company.company_id,
"periode": this.state.periode.periode,
"report_type": "Master Budget",
"currency_id": this.state.defaultCurrency.id
}
console.log(payload);
api.create().getReportTypeBody(payload).then(response => {
......@@ -377,7 +379,6 @@ export default class BudgetTahunan extends Component {
if (response.data) {
if (response.data.status === "success") {
this.setState({ isSubmit: response.data.data.is_can_submit }, () => {
this.getReport()
this.getReportAttachment()
})
} else {
......@@ -394,6 +395,52 @@ export default class BudgetTahunan extends Component {
})
}
getCurrency(companyID) {
// console.log(companyID);
api.create().getDetailPerusahaan(companyID).then(response => {
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
let data = response.data.data
let datas = []
if (response.data.data.currency.length > 0) {
response.data.data.currency.map((item) => {
console.log(item);
datas.push({
id: item.currencyId,
value: item.currencyName
})
})
}
let index = datas.findIndex((val) => val.id == response.data.data.default_currency)
this.setState({
defaultCurrencyID: response.data.data.default_currency,
currency: datas,
defaultCurrency: index == -1 ? null : datas[index]
}, () => {
this.getReport()
})
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
getDetailUser() {
let userId = localStorage.getItem(Constant.USER)
api.create().getDetailUser(userId).then((response) => {
......@@ -443,6 +490,7 @@ export default class BudgetTahunan extends Component {
let index = arrayBaru.findIndex((val) => val.company_id == comID)
this.setState({ listCompany: defaultProps, company: arrayBaru.length < 1 ? companyData[0] : (index == -1 ? arrayBaru[0] : arrayBaru[index]) }, () => {
this.getLastPeriod()
console.log(this.state.company.company_id);
})
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
......@@ -515,6 +563,7 @@ export default class BudgetTahunan extends Component {
this.getCompanySubmitted()
} else {
this.getRevision()
this.getCurrency(this.state.company.company_id)
}
})
}
......@@ -2910,8 +2959,28 @@ export default class BudgetTahunan extends Component {
value={this.state.periode}
/>
</div>
<div style={{ width: '20%', marginTop: 12}}>
<div style={{ width: 255 }}>
<Autocomplete
id="tipe"
disableClearable
options={this.state.currency}
getOptionLabel={(option) => option.value}
value={this.state.defaultCurrency}
onChange={(event, newInputValue) => this.setState({ defaultCurrency: newInputValue }, () => this.clearError())}
renderInput={(params) =>
<TextField
{...params}
variant="standard"
label="Default Currency"
margin="normal"
style={{ marginTop: 6 }}
// InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
// InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
/>
}
/>
{/* <Autocomplete
options={this.state.dataCurrency}
getOptionLabel={(option) => option.value}
onChange={(event, newInputValue) => this.setState({ currency: newInputValue })}
......@@ -2927,7 +2996,7 @@ export default class BudgetTahunan extends Component {
/>
)}
value={this.state.currency == null ? "IDR" : this.state.currency}
/>
/> */}
</div>
</div>
......@@ -2939,6 +3008,7 @@ export default class BudgetTahunan extends Component {
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
this.setState({ visibleTableHistory: false })
// this.getLastPeriod()
this.getCurrency(newInputValue.company_id)
this.getRevision()
})}
disableClearable
......@@ -3314,6 +3384,7 @@ export default class BudgetTahunan extends Component {
height={this.props.height}
width={this.props.width}
company={this.state.company}
defaultCurrency={this.state.defaultCurrency}
revision={this.state.revisionTable}
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
......@@ -3336,6 +3407,7 @@ export default class BudgetTahunan extends Component {
height={this.props.height}
width={this.props.width}
company={this.state.company}
defaultCurrency={this.state.defaultCurrency}
revision={this.state.revisionTable}
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ d9163c6c
......@@ -81,7 +81,8 @@ export default class ProfitLoss extends Component {
"revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"submission_id": this.props.submissionID
"submission_id": this.props.submissionID,
"currency_id": this.props.defaultCurrency.id
}
api.create().getLastestUpdateMB(payload).then(response => {
if (response.data) {
......@@ -110,10 +111,10 @@ export default class ProfitLoss extends Component {
"revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"submission_id": this.props.submissionID
"submission_id": this.props.submissionID,
"currency_id": this.props.defaultCurrency.id
}
api.create().getDetailReportMB(payload).then(response => {
// console.log(response);
let dataTable = []
this.setState({ visibleProfitLoss: true })
if (response.data) {
......
src/container/MasterData/Company/Company.js
View file @ d9163c6c
......@@ -78,10 +78,10 @@ export default class Perusahaan extends Component {
"company_name": item[0] === undefined ? "" : item[0],
"company_parent": item[1] === undefined ? "" : item[1],
"unit_bisnis": item[2] === undefined ? "" : item[2],
"start_date": item[3] === undefined ? "" : item[3],
"end_date": item[4] === undefined ? "" :item[4],
"currency": item[5] === undefined ? "" :item[5],
"default_currency": item[6] === undefined ? "" :item[6],
"currency": item[3] === undefined ? "" :item[3],
"default_currency": item[4] === undefined ? "" :item[4],
"start_date": item[5] === undefined ? "" : item[5],
"end_date": item[6] === undefined ? "" :item[6]
})
}
})
......@@ -106,10 +106,10 @@ export default class Perusahaan extends Component {
item.company_name,
item.company_parent,
item.unit_bisnis,
item.start_date,
item.end_date,
item.currency,
item.default_currency,
item.start_date,
item.end_date,
item.error
]
})
......@@ -190,12 +190,12 @@ export default class Perusahaan extends Component {
}
},
{
name: "Valid From",
name: "Currency",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('start_date'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -203,24 +203,24 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="startdate">
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
</div >
);
}
}
},
{
name: "Valid To",
name: "Default Currency",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('end_date'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -228,24 +228,24 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="enddate">
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
</div >
);
}
}
},
{
name: "Currency",
name: "Valid From",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('start_date'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -253,24 +253,24 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<a data-tip={tableMeta.rowData[7][check].message} data-for="startdate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
</div >
);
}
}
},
{
name: "Default Currency",
name: "Valid To",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('end_date'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -278,12 +278,12 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<a data-tip={tableMeta.rowData[7][check].message} data-for="enddate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div >
);
}
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ d9163c6c
......@@ -268,7 +268,7 @@ export default class BalanceSheetRO extends Component {
}
}
})
console.log(dataTable)
// console.log(dataTable)
this.setState({ dataTable, loading: false, buttonError: true, editable: true })
} else {
this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
......
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