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

shirt and money update fix

Browse Source
This commit is contained in:
Tóth Richárd
2018-06-03 18:08:52 +02:00
parent 330f403244
commit a88c0df0d2
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_include/include_camp_shirt_types.php
View File

@@ -16,7 +16,7 @@ else {
# TÁBORI PÓLÓ LISTA # TÁBORI PÓLÓ LISTA
$camp_shirt_query = "SELECT * FROM camp_shirt WHERE cshirt_deleted = 0 ORDER BY cshirt_name ASC"; $camp_shirt_query = "SELECT * FROM camp_shirt WHERE cshirt_deleted = 0 ORDER BY cshirt_id DESC";
$shirt_assoc_array = $sql->assoc_array($camp_shirt_query); $shirt_assoc_array = $sql->assoc_array($camp_shirt_query);
$smarty->assign('shirt_assoc_array',$shirt_assoc_array); $smarty->assign('shirt_assoc_array',$shirt_assoc_array);

11
_include/include_money_update.php
View File

@@ -11,8 +11,9 @@
# EDZÉS LISTA # EDZÉS LISTA
$action_list_query = "
SELECT $action_list_query = "
SELECT
object_id, object_id,
timestamp(object_date) as object_date, timestamp(object_date) as object_date,
object_type, object_type,
@@ -101,15 +102,17 @@
pr_user_kid_uk_id = ".$user->get_uk_id()." pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_deleted = 0) UNION (SELECT AND tr_deleted = 0) UNION (SELECT
mod_id, mod_id,
timestamp(mod_date), timestamp(mi_date),
if(mod_id is not null, 'money_deposit', null) as object_type if(mod_id is not null, 'money_deposit', null) as object_type
FROM FROM
money_deposit money_deposit
JOIN
money_income ON mi_id = mod_money_income_mi_id
WHERE WHERE
mod_user_kid_uk_id = ".$user->get_uk_id()." mod_user_kid_uk_id = ".$user->get_uk_id()."
and mod_deleted = 0)) actions and mod_deleted = 0)) actions
order by object_date ASC; order by object_date ASC;
"; ";
$action_assoc_array = $sql->assoc_array($action_list_query); $action_assoc_array = $sql->assoc_array($action_list_query);