Skip to content

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

Merge branch 'ENV-DEV' into 'ENV-STAGING' 

full amount

See merge request !2036
parents 4fa4d1d7 f36aeab0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17375 additions and 10495 deletions
src/api/index.js
View file @ 5b703adf
......@@ -189,6 +189,7 @@ const create = (type = "") => {
const searchParameter = (body) => api.post('setting/search_setting', body)
const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
const getDataReport = () => api.get('setting_type/get_all_setting_type_by_report_submit_period_group')
const getFormatValue = () => api.get('setting_type/get_all_setting_type_by_money_format_group')
// MASTER DATA - CAT
const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
......@@ -649,6 +650,7 @@ const create = (type = "") => {
deleteUnitBisnis,
deleteParameter,
getDataReport,
getFormatValue,
deletePerusahaan,
getDataCurrency,
deleteReportItems,
......
src/assets/Images.js
View file @ 5b703adf
......@@ -58,6 +58,7 @@ const Images = {
zip: require('./zip.png'),
warning: require('./warning.png'),
simulasiUpload: require('./upload-simulasi.png'),
information: require('./information.png'),
}
export default Images
\ No newline at end of file
src/container/BudgetTahunan/BalanceSheet.js
View file @ 5b703adf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ 5b703adf
This diff is collapsed.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 5b703adf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/ProfitLoss.js
View file @ 5b703adf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/TaxPlanning.js
View file @ 5b703adf
This diff is collapsed.
src/container/MonthlyReport/CashFlowMR.js
View file @ 5b703adf
This diff is collapsed.
src/container/MonthlyReport/MonthlyReport.js
View file @ 5b703adf
......@@ -1531,8 +1531,23 @@ export default class MonthlyReport extends Component {
createCashFlow(payload) {
console.log(JSON.stringify(payload))
api.create().createMonthlyReportCF(payload).then((res) => {
this.saveToMonthlyReport()
console.log(res)
if (res.data.status === "success") {
this.saveToMonthlyReport()
console.log(res)
} else {
if (res.data?.message == "Please Set Up Rate Currency First") {
this.setState({ visibleAlertSave: true })
} else {
this.setState({ alert: true, messageAlert: res.data.message, tipeAlert: 'warning', loading: false, handleDoubleClick: 0 }, () => {
if (res.data.message.includes("Someone Logged In") || res.data.message.includes("Token Expired")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
}
})
}
......@@ -3763,7 +3778,7 @@ export default class MonthlyReport extends Component {
marginRight: 20,
borderRadius: 9
}}
onClick={() => this.setState({ visibleAlertSave: false })}
onClick={() => this.setState({ visibleAlertSave: false, loading: false })}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 30, borderRadius: 9, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #3549609e' }}>
<Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography>
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 5b703adf
This diff is collapsed.
src/container/OperatingIndicator/OperatingIndicator.js
View file @ 5b703adf
......@@ -1290,7 +1290,7 @@ export default class OperatingIndicator extends Component {
marginRight: 20,
borderRadius: 9
}}
onClick={() => this.setState({ visibleAlertSave: false, handleDoubleClick: 0 })}
onClick={() => this.setState({ visibleAlertSave: false, handleDoubleClick: 0, loading: false })}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 30, borderRadius: 9, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #3549609e' }}>
<Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography>
......
src/container/OutlookPA/BalanceSheetOLPA.js
View file @ 5b703adf
This diff is collapsed.
src/container/OutlookPA/CashFlowOLPA.js
View file @ 5b703adf
This diff is collapsed.
src/container/OutlookPA/ProfitLossOLPA.js
View file @ 5b703adf
This diff is collapsed.
src/container/OutlookPA/TaxPlanningOLPA.js
View file @ 5b703adf
This diff is collapsed.
src/container/Reports/SubHolding.js
View file @ 5b703adf
......@@ -841,21 +841,21 @@ export default class SubHolding extends Component {
item.level,
item.description,
item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
Number(item.balance_sheet.january).toFixed(1),
Number(item.balance_sheet.february).toFixed(1),
Number(item.balance_sheet.march).toFixed(1),
Number(item.balance_sheet.april).toFixed(1),
Number(item.balance_sheet.may).toFixed(1),
Number(item.balance_sheet.june).toFixed(1),
Number(item.balance_sheet.july).toFixed(1),
Number(item.balance_sheet.august).toFixed(1),
Number(item.balance_sheet.september).toFixed(1),
Number(item.balance_sheet.october).toFixed(1),
Number(item.balance_sheet.november).toFixed(1),
Number(item.balance_sheet.december).toFixed(1),
Number(item.balance_sheet.total_current_year).toFixed(1),
Number(item.balance_sheet.total_next_year).toFixed(1),
Number(item.balance_sheet.total_more_year).toFixed(1),
Number(item.balance_sheet.january),
Number(item.balance_sheet.february),
Number(item.balance_sheet.march),
Number(item.balance_sheet.april),
Number(item.balance_sheet.may),
Number(item.balance_sheet.june),
Number(item.balance_sheet.july),
Number(item.balance_sheet.august),
Number(item.balance_sheet.september),
Number(item.balance_sheet.october),
Number(item.balance_sheet.november),
Number(item.balance_sheet.december),
Number(item.balance_sheet.total_current_year),
Number(item.balance_sheet.total_next_year),
Number(item.balance_sheet.total_more_year),
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
......@@ -975,21 +975,21 @@ export default class SubHolding extends Component {
item.level,
item.description,
item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
Number(item.balance_sheet.january).toFixed(1),
Number(item.balance_sheet.february).toFixed(1),
Number(item.balance_sheet.march).toFixed(1),
Number(item.balance_sheet.april).toFixed(1),
Number(item.balance_sheet.may).toFixed(1),
Number(item.balance_sheet.june).toFixed(1),
Number(item.balance_sheet.july).toFixed(1),
Number(item.balance_sheet.august).toFixed(1),
Number(item.balance_sheet.september).toFixed(1),
Number(item.balance_sheet.october).toFixed(1),
Number(item.balance_sheet.november).toFixed(1),
Number(item.balance_sheet.december).toFixed(1),
Number(item.balance_sheet.total_current_year).toFixed(1),
Number(item.balance_sheet.total_next_year).toFixed(1),
Number(item.balance_sheet.total_more_year).toFixed(1),
Number(item.balance_sheet.january),
Number(item.balance_sheet.february),
Number(item.balance_sheet.march),
Number(item.balance_sheet.april),
Number(item.balance_sheet.may),
Number(item.balance_sheet.june),
Number(item.balance_sheet.july),
Number(item.balance_sheet.august),
Number(item.balance_sheet.september),
Number(item.balance_sheet.october),
Number(item.balance_sheet.november),
Number(item.balance_sheet.december),
Number(item.balance_sheet.total_current_year),
Number(item.balance_sheet.total_next_year),
Number(item.balance_sheet.total_more_year),
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
......@@ -1905,8 +1905,8 @@ export default class SubHolding extends Component {
item.level,
item.description,
item.uom,
item.master_budget.total_actual_before == "" ? item.master_budget.total_actual_before : String(item.master_budget.total_actual_before).indexOf(".") == -1 ? Number(item.master_budget.total_actual_before) : Number(item.master_budget.total_actual_before).toFixed(1),
item.master_budget.january == "" ? item.master_budget.january : String(item.master_budget.january).indexOf(".") == -1 ? Number(item.master_budget.january) : Number(item.master_budget.january).toFixed(1),
item.master_budget.total_actual_before == "" ? item.master_budget.total_actual_before : String(item.master_budget.total_actual_before).indexOf(".") == -1 ? Number(item.master_budget.total_actual_before) : Number(item.master_budget.total_actual_before),
item.master_budget.january == "" ? item.master_budget.january : String(item.master_budget.january).indexOf(".") == -1 ? Number(item.master_budget.january) : Number(item.master_budget.january),
item.master_budget.february == "" ? item.master_budget.february : String(item.master_budget.february).indexOf(".") == -1 ? Number(item.master_budget.february) : Number(item.master_budget.february).toFixed(1),
item.master_budget.march == "" ? item.master_budget.march : String(item.master_budget.march).indexOf(".") == -1 ? Number(item.master_budget.march) : Number(item.master_budget.march).toFixed(1),
item.master_budget.april == "" ? item.master_budget.april : String(item.master_budget.april).indexOf(".") == -1 ? Number(item.master_budget.april) : Number(item.master_budget.april).toFixed(1),
......@@ -1951,8 +1951,8 @@ export default class SubHolding extends Component {
item.level,
item.description,
item.uom,
item.master_budget.total_actual_before == "" ? item.master_budget.total_actual_before : String(item.master_budget.total_actual_before).indexOf(".") == -1 ? Number(item.master_budget.total_actual_before) : Number(item.master_budget.total_actual_before).toFixed(1),
item.master_budget.january == "" ? item.master_budget.january : String(item.master_budget.january).indexOf(".") == -1 ? Number(item.master_budget.january) : Number(item.master_budget.january).toFixed(1),
item.master_budget.total_actual_before == "" ? item.master_budget.total_actual_before : String(item.master_budget.total_actual_before).indexOf(".") == -1 ? Number(item.master_budget.total_actual_before) : Number(item.master_budget.total_actual_before),
item.master_budget.january == "" ? item.master_budget.january : String(item.master_budget.january).indexOf(".") == -1 ? Number(item.master_budget.january) : Number(item.master_budget.january),
item.master_budget.february == "" ? item.master_budget.february : String(item.master_budget.february).indexOf(".") == -1 ? Number(item.master_budget.february) : Number(item.master_budget.february).toFixed(1),
item.master_budget.march == "" ? item.master_budget.march : String(item.master_budget.march).indexOf(".") == -1 ? Number(item.master_budget.march) : Number(item.master_budget.march).toFixed(1),
item.master_budget.april == "" ? item.master_budget.april : String(item.master_budget.april).indexOf(".") == -1 ? Number(item.master_budget.april) : Number(item.master_budget.april).toFixed(1),
......
src/container/Reports/TableSubHolding.js
View file @ 5b703adf
This diff is collapsed.
src/container/RollingOutlook/CashFlowRO.js
View file @ 5b703adf
This diff is collapsed.
src/container/RollingOutlook/RollingOutlook.js
View file @ 5b703adf
......@@ -2760,7 +2760,7 @@ export default class RollingOutlook extends Component {
marginRight: 20,
borderRadius: 9
}}
onClick={() => this.setState({ visibleAlertSave: false })}
onClick={() => this.setState({ visibleAlertSave: false, loading: false })}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 30, borderRadius: 9, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #3549609e' }}>
<Typography style={{ fontSize: '15px', color: '#354960', textAlign: 'center' }}>Close</Typography>
......
src/library/PopUpInformation.js 0 → 100644
View file @ 5b703adf
This diff is collapsed.
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