From a88c0df0d25369b031cb4498474c0c4938b4dfd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B3th=20Rich=C3=A1rd?= <tricsusz@gmail.com>
Date: Sun, 3 Jun 2018 18:08:52 +0200
Subject: [PATCH] shirt and money update fix

---
 _include/include_camp_shirt_types.php |  4 +--
 _include/include_money_update.php     | 37 +++++++++++++++------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/_include/include_camp_shirt_types.php b/_include/include_camp_shirt_types.php
index 30737d2..21eb009 100644
--- a/_include/include_camp_shirt_types.php
+++ b/_include/include_camp_shirt_types.php
@@ -16,7 +16,7 @@ else {
 	
 	# 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);
 
 	$smarty->assign('shirt_assoc_array',$shirt_assoc_array);
@@ -25,4 +25,4 @@ else {
 	
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/_include/include_money_update.php b/_include/include_money_update.php
index 97fe401..8302145 100644
--- a/_include/include_money_update.php
+++ b/_include/include_money_update.php
@@ -7,16 +7,17 @@
         $user = new user_kid();
         $user->set_user_data_by_id($value['uk_id']);
 
-    
+
 
     	# EDZÉS LISTA
 
-    	$action_list_query = "
-    	SELECT 
+
+            $action_list_query = "
+            SELECT
             object_id,
             timestamp(object_date) as object_date,
             object_type,
-            (SELECT 
+            (SELECT
                     count(distinct date(tr_date))
                 FROM
                     presence
@@ -27,12 +28,12 @@
                         AND MONTH(tr_date) = MONTH(object_date)
                         AND tr_date <= object_date
                         AND pr_user_kid_uk_id = ".$user->get_uk_id()."
-                        AND tr_date > (select 
+                        AND tr_date > (select
                             if(max(trd) is null,
                                     '1900-01-01',
                                     max(trd))
                         from
-                            (select 
+                            (select
                                 tr_date trd
                             from
                                 presence
@@ -40,7 +41,7 @@
                             join user_kid ON uk_id = pr_user_kid_uk_id
                             where
                                 pr_user_kid_uk_id = ".$user->get_uk_id()."
-                                    and tr_date >= (SELECT 
+                                    and tr_date >= (SELECT
                                         tr_date
                                     from
                                         presence
@@ -53,7 +54,7 @@
                                     limit 1)
                             order by tr_date ASC
                             limit 2) as elso_ket_edzes)) as 'training_per_month',
-            (SELECT 
+            (SELECT
                     count(pr_id)
                 FROM
                     presence
@@ -63,12 +64,12 @@
                     DATE(tr_date) = DATE(object_date)
                         AND tr_date <= object_date
                         AND pr_user_kid_uk_id = ".$user->get_uk_id().") as 'training_per_day',
-            (select 
+            (select
                     if(sum(if(trd = object_date, 1, 0)) > 0,
                             1,
                             0)
                 from
-                    (select 
+                    (select
                         tr_date trd
                     from
                         presence
@@ -76,7 +77,7 @@
                     join user_kid ON uk_id = pr_user_kid_uk_id
                     where
                         pr_user_kid_uk_id = ".$user->get_uk_id()."
-                            and tr_date >= (SELECT 
+                            and tr_date >= (SELECT
                                 tr_date
                             from
                                 presence
@@ -90,7 +91,7 @@
                     order by tr_date ASC
                     limit 2) elso2edzes) as 'first_two'
         FROM
-            ((SELECT 
+            ((SELECT
                 pr_training_tr_id as object_id,
                     timestamp(tr_date) as object_date,
                     if(pr_training_tr_id is not null, 'training', null) as object_type
@@ -99,17 +100,19 @@
             JOIN training ON tr_id = pr_training_tr_id
             WHERE
                 pr_user_kid_uk_id = ".$user->get_uk_id()."
-                    AND tr_deleted = 0) UNION (SELECT 
+                    AND tr_deleted = 0) UNION (SELECT
                 mod_id,
-                    timestamp(mod_date),
+                    timestamp(mi_date),
                     if(mod_id is not null, 'money_deposit', null) as object_type
             FROM
                 money_deposit
+            JOIN
+                money_income ON mi_id = mod_money_income_mi_id
             WHERE
                 mod_user_kid_uk_id = ".$user->get_uk_id()."
                     and mod_deleted = 0)) actions
         order by object_date ASC;
-    	";
+            ";
 
     	$action_assoc_array = $sql->assoc_array($action_list_query);
 
@@ -140,9 +143,9 @@
     	//var_dump($de_array);
     	//$smarty->assign('actions', $actions);
 
-	
+
     }
 
     header('Location: /admin/balance_list' . ($this->is_id()?'/'.$this->get_id():''));
 
-?>
\ No newline at end of file
+?>