diff --git a/module/program/control.php b/module/program/control.php index bec85c65c1..cadf110f5c 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -722,28 +722,28 @@ class program extends control * Ajax get available budget. * * @param int $programID - * @param int $parentProgramID + * @param int $selectedProgramID * @param int $budget * @access public * @return void */ - public function ajaxGetAvailableBudget($programID, $parentProgramID, $budget) + public function ajaxGetAvailableBudget($programID, $selectedProgramID, $budget) { if(!empty($programID)) { $program = $this->program->getByID($programID); - $parentProgram = $this->program->getByID($parentProgramID); - $budgetLeft = $this->program->getBudgetLeft($parentProgram); - $availableBudget = $program->parent == $parentProgramID ? $budgetLeft + $program->budget : $budgetLeft; + $selectedProgram = $this->program->getByID($selectedProgramID); + $budgetLeft = $this->program->getBudgetLeft($selectedProgram); + $availableBudget = $program->parent == $selectedProgramID ? $budgetLeft + $program->budget : $budgetLeft; } else { - $parentProgram = $this->program->getByID($parentProgramID); - $availableBudget = $this->program->getBudgetLeft($parentProgram); + $selectedProgram = $this->program->getByID($selectedProgramID); + $availableBudget = $this->program->getBudgetLeft($selectedProgram); } $tips = ''; - if($budget != 0 && $budget !== null && $budget > $availableBudget) $tips = "" . $this->lang->program->budgetOverrun . zget($this->lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget . ""; + if($budget != 0 && $budget !== null && $budget > $availableBudget) $tips = "" . $this->lang->program->budgetOverrun . zget($this->lang->project->currencySymbol, $selectedProgram->budgetUnit) . $availableBudget . ""; echo json_encode($tips); } diff --git a/module/program/js/common.js b/module/program/js/common.js index 1711930d96..f921954967 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -324,19 +324,19 @@ function setBudgetTipsAndAclList(programID) */ function budgetOverrunTips(programID = 0) { - var parentProgramID = $('#parent').val(); - var budget = $('#budget').val(); - if(parentProgramID == 0) + var selectedProgramID = $('#parent').val(); + var budget = $('#budget').val(); + if(selectedProgramID == 0) { - if($('#programBudget').length > 0) $('#programBudget').remove(); + if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove(); return false; } - $.get(createLink('program', 'ajaxGetAvailableBudget', 'programID=' + programID + "&parentProgramID=" + parentProgramID + "&budget=" + budget), function(data) + $.get(createLink('program', 'ajaxGetAvailableBudget', 'programID=' + programID + "&selectedProgramID=" + selectedProgramID + "&budget=" + budget), function(data) { var data = JSON.parse(data); - if($('#programBudget').length > 0) $('#programBudget').remove(); + if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove(); $('#budgetBox').after(data); }); }