tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parent view hotfix

Browse Source
This commit is contained in:
Ricsi
2019-10-02 10:36:04 +02:00
parent 37a3946745
commit 2856bf65c8
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_include/include_diary.php
View File

@@ -18,7 +18,7 @@
JOIN training ON (tr_id = pr_training_tr_id
AND tr_locked = 1)
WHERE
pr_user_kid_uk_id = ".$user->get_uk_id()."
pr_user_kid_uk_id = {$user->get_uk_id()}
AND tr_deleted = 0) UNION (SELECT
mod_id,
TIMESTAMP(mi_date),
@@ -28,7 +28,7 @@
money_deposit
JOIN money_income ON mi_id = mod_money_income_mi_id
WHERE
mod_user_kid_uk_id = ".$user->get_uk_id()."
mod_user_kid_uk_id = {$user->get_uk_id()}
AND mod_deleted = 0)) actions
ORDER BY object_date ASC;
";
@@ -57,9 +57,8 @@
}
//itt csak hivatkozással adjuk át a tömböt, a calculate_balance kiszámolja, belerakja és visszadja
$user->calculate_balance($de_array, $user);
$user->calculate_balance($de_array, $user, false);
//lekérjük az áthozatot, és felvesszük entryként
$balance_transfer = $user->get_uk_balance_transfer();
if (null == $balance_transfer) {