Commit 4b7ccdf0 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

latest update

See merge request !761
parents 915515b4 4308cf90
......@@ -227,6 +227,9 @@ const create = (type = "") => {
const getLastPeriodeOI = (idCompany) => api.post(`transaction/master_budget/get_last_periode/${idCompany}`)
const getReportHierarkiPL = (body) => api.post('transaction/db_report_detail/get_report_hierarki', body)
const getLastestUpdateMR = (body) => api.post('/transaction/monthly_report/get_latest_update', body)
const getLastestUpdateMROI = (body) => api.post('transaction/monthly_report_oi/get_latest_update', body)
//CASH FLOW
const getDetailReportCF = (body) => api.post('/transaction/cash_flow/get_report_hierarki', body)
......@@ -436,6 +439,8 @@ const create = (type = "") => {
checkUploadOperatingInd,
uploadOperatingInd,
getLastestUpdateMB,
getLastestUpdateMR,
getLastestUpdateMROI,
countingFormula,
submitMasterBudget,
checkIsSubmit,
......
......@@ -183,34 +183,6 @@ export default class BudgetTahunan extends Component {
})
}
getPermission() {
let payload = {
menu: "master budget & cat"
}
api.create().getPermission(payload).then(response => {
console.log(response)
if (response.data) {
if (response.data.status === "success") {
this.setState({
btncreate: response.data.data.create,
loadview: response.data.data.view
})
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
getCompanySubmitted() {
let body = {
"periode": this.state.periode.periode
......@@ -1548,8 +1520,6 @@ export default class BudgetTahunan extends Component {
isApprover={this.state.isApprover}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
btncreate={this.state.btncreate}
loadview={this.state.loadview}
/>
)
}
......
......@@ -61,8 +61,7 @@ export default class TaxPlanningMR extends Component {
componentDidMount() {
this.getSettingControl()
// this.getItemHierarki()
// this.getLatestUpdate()
console.log(this.props.loadview)
this.getLatestUpdate()
}
getSettingControl() {
......@@ -85,13 +84,15 @@ export default class TaxPlanningMR extends Component {
getLatestUpdate() {
let payload = {
"report_id": 5,
"revision": 0,
"periode": 2021,
"company_id": 2193390,
"submission_id": 3425765
"report_id": this.props.report_id,
"revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"monthly_report_id": this.props.monthlyReportId,
"months": this.props.month.month_id
}
api.create().getLastestUpdateMB(payload).then(response => {
api.create().getLastestUpdateMR(payload).then(response => {
console.log(response)
if (response.data) {
if (response.data.status === "success") {
this.setState({
......@@ -113,7 +114,7 @@ export default class TaxPlanningMR extends Component {
"months": this.props.month.month_id
}
api.create().getHierarkiMontlyReportTP(payload).then(response => {
console.log(response);
// console.log(response);
// console.log(payload);
let dataTable = []
if (response.data) {
......@@ -198,7 +199,7 @@ export default class TaxPlanningMR extends Component {
} else {
this.setState({ dataTable, loading: false, editable: true })
}
console.log(this.state.dataTable)
// console.log(this.state.dataTable)
})
}
......@@ -244,8 +245,8 @@ export default class TaxPlanningMR extends Component {
}
api.create('UPLOAD').createMonthlyReportTP(payload).then(response => {
console.log(payload);
console.log(response);
// console.log(payload);
// console.log(response);
if (response.data) {
if (response.data.status === "success") {
this.props.saveToMonthlyReport()
......@@ -311,7 +312,7 @@ export default class TaxPlanningMR extends Component {
api.create().checkUploadMonthlyReportTP(this.state.payload).then(response => {
// console.log(JSON.stringify(this.state.payload));
// console.log(this.state.payload)
console.log(response)
// console.log(response)
if (response.data) {
if (response.data.status === 'success') {
this.setState({ visibleUpload: false, visibleTP: false, loading: true })
......@@ -379,7 +380,7 @@ export default class TaxPlanningMR extends Component {
api.create('UPLOAD').uploadMonthlyReportTP(body).then(response => {
// console.log(body);
// console.log(JSON.stringify(body));
console.log(response);
// console.log(response);
if (response.data) {
if (response.data.status === "success") {
this.props.saveToMonthlyReport()
......@@ -474,9 +475,6 @@ export default class TaxPlanningMR extends Component {
render() {
let dataTable2 = this.state.dataTable
let dataFormula = []
let id = 0
let double = false
const handleValueFormula = (value, tableMeta, dex, xntd, forecast, periode) => {
// console.log(xntd)
let form = dex === 1 ? tableMeta.rowData[6].tbc : dex === 2 ? tableMeta.rowData[6].fcp : tableMeta.rowData[6].tbf
......
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