Commit b6f5fc4c authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

Didam

See merge request !1095
parents d56b1ea3 894e70b5
......@@ -247,7 +247,11 @@ const create = (type = "") => {
const createReportPLMB = (body) => api.post('/transaction/db_profit_loss/master_budget/create_submission_report', body)
const createReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/create_monthly_report', body)
const getPLID = (body) => api.post('/transaction/db_profit_loss/get_profit_loss_id', body)
const getHierarkiCreateReportFRMB = (body) => api.post('/transaction/db_ratio/master_budget/get_report_hierarki', body)
const getHierarkiCreateReportFRMR = (body) => api.post('/transaction/db_ratio/monthly_report/get_report_hierarki', body)
const getFRID = (body) => api.post('/transaction/db_ratio/get_ratio_id', body)
const createReportFRMB = (body) => api.post('/transaction/db_ratio/master_budget/create_submission_report', body)
const createReportFRMR = (body) => api.post('/transaction/db_ratio/monthly_report/create_monthly_report', body)
// const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
// const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
const getReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
......@@ -645,7 +649,11 @@ const create = (type = "") => {
getFRID,
getHierarkiReportHistorical,
getHierarkiReportMTD,
getHierarkiReportYtd
getHierarkiReportYtd,
getHierarkiCreateReportFRMB,
getHierarkiCreateReportFRMR,
createReportFRMB,
createReportFRMR
}
}
......
This diff is collapsed.
......@@ -98,6 +98,10 @@ export default class SubHolding extends Component {
}
})
if (arrayBaru.length > 0) {
arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let defaultProps = {
options: arrayBaru,
getOptionLabel: (option) => titleCase(option.company_name),
......
This diff is collapsed.
......@@ -188,6 +188,10 @@ export default class OperatingIndicator extends Component {
}
})
if (arrayBaru.length > 0) {
arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let defaultProps = {
options: arrayBaru,
getOptionLabel: (option) => titleCase(option.company_name),
......
......@@ -110,6 +110,10 @@ export default class OutlookPA extends Component {
}
})
if (arrayBaru.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let defaultProps = {
options: companyData,
getOptionLabel: (option) => titleCase(option.company_name),
......
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