From 73db6b620a4695265574cf5635fe7b8aa605c197 Mon Sep 17 00:00:00 2001
From: Ricsi <tricsusz@gmail.com>
Date: Fri, 10 Feb 2017 21:53:39 +0100
Subject: [PATCH] diary bugfixes

---
 _include/include_diary.php        | 4 ++--
 template/templates/user_diary.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_include/include_diary.php b/_include/include_diary.php
index 69db8d0..49a6f34 100644
--- a/_include/include_diary.php
+++ b/_include/include_diary.php
@@ -47,7 +47,7 @@ else {
                                     and date(tr_date) = uk_first_training
                             ORDER BY tr_date ASC
                             limit 1)
-                    order by tr_id ASC
+                    order by tr_date ASC
                     limit 2) as elso_ket_edzes)) as 'training_per_month',
     (SELECT 
             count(pr_id)
@@ -83,7 +83,7 @@ else {
                             and date(tr_date) = uk_first_training
                     ORDER BY tr_date ASC
                     limit 1)
-            order by tr_id ASC
+            order by tr_date ASC
             limit 2) elso2edzes) as 'first_two'
 FROM
     ((SELECT 
diff --git a/template/templates/user_diary.tpl b/template/templates/user_diary.tpl
index 953d509..e1d7b6d 100644
--- a/template/templates/user_diary.tpl
+++ b/template/templates/user_diary.tpl
@@ -117,7 +117,7 @@
 				</div>
 
 				<div class="side_block">
-				{assign var="dicount" value=""}
+				{assign var="discount" value=""}
 				<span class="bold" style="font-size: 20px;">{$action->get_de_balance()|number_format:0:'':' '} Ft</span><br>{$discount}
 				</div>
 			</div>