updates and restart camps

This commit is contained in:
Tóth Richárd
2018-05-03 20:27:35 +02:00
parent 392b484666
commit a249c20433
38 changed files with 1153 additions and 235 deletions

View File

@@ -468,7 +468,7 @@ class user_kid extends user_parent {
$sql->update_table('user_kid', $_user_value_array, array('uk_id' => $_user_id));
}
public function calculate_balance(&$_de_obj_array, $_user_obj = null) {
public function calculate_balance(&$_de_obj_array, $_user_obj = null, $update = true) {
//kiszámolja az egyenleget a diary entry-k alapján, amik tömbben érkeznek
//a tömbben feltölti a pénzmozgást, és minden lépésben befrissíti az egyenleget
//az update-elt tömböt adja vissza
@@ -508,17 +508,17 @@ class user_kid extends user_parent {
}
}
elseif ($_de->get_de_type() == 'money_deposit') {
$_de->set_de_transaction($_de->get_de_money_deposit()->get_mod_sum());
$_de->set_de_transaction($_de->get_de_money_deposit()->get_mod_money_income()->get_mi_sum());
$_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction());
//$balance += $_de->get_de_money_deposit()->get_mod_sum();
//echo $_de->get_de_date() . " plussz " . $_de->get_de_money_deposit()->get_mod_sum() . "<br><br>";
}
}
if (isset($_de)) $sql->update_table('user_kid', (array('uk_balance' => $_de->get_de_balance())), array('uk_id' => (is_object($_user_obj)?$_user_obj->get_uk_id():$this->get_uk_id())), false);
else $sql->update_table('user_kid', (array('uk_balance' => 0)), array('uk_id' => (is_object($_user_obj)?$_user_obj->get_uk_id():$this->get_uk_id())), false);
if ($update) {
if (isset($_de)) $sql->update_table('user_kid', (array('uk_balance' => $_de->get_de_balance())), array('uk_id' => (is_object($_user_obj)?$_user_obj->get_uk_id():$this->get_uk_id())), false);
else $sql->update_table('user_kid', (array('uk_balance' => 0)), array('uk_id' => (is_object($_user_obj)?$_user_obj->get_uk_id():$this->get_uk_id())), false);
}
return $_de_obj_array;
}