From 27522d0053d90ca98bf7b307435934ef5702520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20Rich=C3=A1rd?= Date: Tue, 30 Jul 2019 13:38:51 +0200 Subject: [PATCH] added news --- _class/class_news.php | 211 +++++++++++++++++ _class/class_page.php | 12 +- _css/default.css | 21 ++ _css/default_view.css | 22 ++ _image/news.png | Bin 0 -> 17252 bytes _include/include_create.php | 4 + _include/include_delete_news.php | 9 + _include/include_diary.php | 12 + _include/include_information.php | 29 ++- _include/include_information_wall.php | 14 ++ event_handler.php | 15 ++ queries/news_20190729.sql | 16 ++ template/templates/news_create.tpl | 27 +++ template/templates/news_data_edit.tpl | 31 +++ template/templates/news_list.tpl | 15 ++ template/templates/user_diary.tpl | 319 +++++++++++++++----------- 16 files changed, 610 insertions(+), 147 deletions(-) create mode 100644 _class/class_news.php create mode 100644 _image/news.png create mode 100644 _include/include_delete_news.php create mode 100644 _include/include_information_wall.php create mode 100644 queries/news_20190729.sql create mode 100644 template/templates/news_create.tpl create mode 100644 template/templates/news_data_edit.tpl create mode 100644 template/templates/news_list.tpl diff --git a/_class/class_news.php b/_class/class_news.php new file mode 100644 index 0000000..c78ddf9 --- /dev/null +++ b/_class/class_news.php @@ -0,0 +1,211 @@ +assoc_array("select * from news where n_id = " . $_n_id); + $news_data_array = $news_data_assoc_array[0]; + foreach ($news_data_array as $field => $value) { + $function_name = "set_" . $field; + $this->$function_name($value); //alapadatok beállítása + if ($field == 'n_user_ua_id' && !empty($value)) { + $coach = new user(); + $coach->set_user_data_by_id($value); + $this->set_n_user($coach); + } + } + } + + public static function create_news($_values, $user_id = null) { + global $sql, $user; + if (null === $user_id) { + $user_id = $user->get_ua_id(); + } + + if (!isset($_values['n_title'])) { + $title = 'null'; + } + else { + $title = $_values['n_title']; + } + + return $sql->insert_into('news', array( + 'n_title' => $title, + 'n_user_ua_id' => $user_id, + 'n_text' => $_values['n_text'], + 'n_date' => $_values['n_date'] + )); + } + + public static function update_news($_values, $n_id) { + global $sql, $user; + + if (!isset($_values['n_title'])) { + $title = 'null'; + } + else { + $title = $_values['n_title']; + } + + $sql->update_table('news', array( + 'n_title' => $title, + 'n_text' => $_values['n_text'], + 'n_date' => $_values['n_date'] + ), array( + 'n_id' => $n_id, + )); + } + + /** + * @return mixed + */ + public function get_n_id() + { + return $this->n_id; + } + + /** + * @param mixed $n_id + * + * @return self + */ + public function set_n_id($n_id) + { + $this->n_id = $n_id; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_title() + { + return $this->n_title; + } + + /** + * @param mixed $n_title + * + * @return self + */ + public function set_n_title($n_title) + { + $this->n_title = $n_title; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_date() + { + return $this->n_date; + } + + /** + * @param mixed $n_date + * + * @return self + */ + public function set_n_date($n_date) + { + $this->n_date = $n_date; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_text() + { + return $this->n_text; + } + + /** + * @param mixed $n_text + * + * @return self + */ + public function set_n_text($n_text) + { + $this->n_text = $n_text; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_deleted() + { + return $this->n_deleted; + } + + /** + * @param mixed $n_deleted + * + * @return self + */ + public function set_n_deleted($n_deleted) + { + $this->n_deleted = $n_deleted; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_user_ua_id() + { + return $this->n_user_ua_id; + } + + /** + * @param mixed $n_user_ua_id + * + * @return self + */ + public function set_n_user_ua_id($n_user_ua_id) + { + $this->n_user_ua_id = $n_user_ua_id; + + return $this; + } + + /** + * @return mixed + */ + public function get_n_user() + { + return $this->n_user; + } + + /** + * @param mixed $n_user + * + * @return self + */ + public function set_n_user($n_user) + { + $this->n_user = $n_user; + + return $this; + } +} + + +?> diff --git a/_class/class_page.php b/_class/class_page.php index 6749ac2..c1a0221 100644 --- a/_class/class_page.php +++ b/_class/class_page.php @@ -244,6 +244,10 @@ class page { # STATISZTIKÁK include('include_stats.php'); break; + case 'news': + # INFORMÁCIÓS FAL + include('include_information.php'); + break; case 'delete_training_type': # EDZÉS TÍPUS TÖRLÉS include('include_delete_training_type.php'); @@ -288,6 +292,10 @@ class page { # BEVÉTEL TÖRLÉS include('include_delete_money_income.php'); break; + case 'delete_news': + # HÍR TÖRLÉS + include('include_delete_news.php'); + break; case 'logout': # kijelentkezés $from = "admin"; @@ -321,7 +329,7 @@ class page { break; case 'information': # információk - include('include_information.php'); + include('include_information_wall.php'); break; default: include('include_diary.php'); @@ -341,7 +349,7 @@ class page { break; case 'information': # információk - include('include_information.php'); + include('include_information_wall.php'); break; default: include('include_diary.php'); diff --git a/_css/default.css b/_css/default.css index 2f7e7f7..3a6b520 100644 --- a/_css/default.css +++ b/_css/default.css @@ -317,6 +317,15 @@ a.addbutton.noti { margin-bottom: 5px; } +.list.news .date_separator { + color: black; + background-color: #19f40c; +} + +.list.news .date_separator:hover { + background-color: #24991e; +} + .list_item label { font-weight: bold; } @@ -604,6 +613,12 @@ h1.apply { border-left: 3px solid black; } +.info-wall { + border-top: 2px solid #0a4404; + border-left: none; + margin-top: 20px; +} + .toggle { width: 50px; height: 120px; @@ -847,6 +862,12 @@ form#auto_filters > div > label { margin: 20px; } + .info-wall { + border-left: 2px solid #0a4404; + border-top: none; + margin-top: 0; + } + .diary_header { width: 35%; } diff --git a/_css/default_view.css b/_css/default_view.css index 0a03ae8..7714407 100644 --- a/_css/default_view.css +++ b/_css/default_view.css @@ -97,3 +97,25 @@ div.list div.actual_balance:hover { .full { display: inline-block; } + +.diary_container { + display: flex; + justify-content: stretch; + flex-wrap: wrap; + flex-direction: column; +} + +.diary_container > div { + flex: 1 1 50%; +} + +@media (min-width: 1250px) { + .diary_container { + flex-direction: row; + } + + .list.news, .list.entries { + width: 100%; + padding: 15px; + } +} diff --git a/_image/news.png b/_image/news.png new file mode 100644 index 0000000000000000000000000000000000000000..ef53c32a64a84a2939aa3ed012797d92640db048 GIT binary patch literal 17252 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 G`u_oiw{rXd literal 0 HcmV?d00001 diff --git a/_include/include_create.php b/_include/include_create.php index 944494a..f4abb94 100644 --- a/_include/include_create.php +++ b/_include/include_create.php @@ -186,6 +186,10 @@ switch ($this->get_id()) { $smarty->display('training_template_create.tpl'); break; + case 'news': + # hír létrehozása + $smarty->display('news_create.tpl'); + break; default: # code... break; diff --git a/_include/include_delete_news.php b/_include/include_delete_news.php new file mode 100644 index 0000000..3291cb5 --- /dev/null +++ b/_include/include_delete_news.php @@ -0,0 +1,9 @@ +is_id()) { + $sql->update_table('news', array('n_deleted' => 1), array('n_id' => $this->get_id())); + log::register('delete_news', $this->get_id()); + header("Location: /admin/news"); +} + +?> diff --git a/_include/include_diary.php b/_include/include_diary.php index ba62783..7ce1833 100644 --- a/_include/include_diary.php +++ b/_include/include_diary.php @@ -70,6 +70,18 @@ order by object_date ASC; $smarty->assign('actions', $de_array); $smarty->assign('balance_transfer', $balance_transfer); + //get news + $news_assoc_array = $sql->assoc_array('SELECT * FROM news WHERE n_deleted = 0 ORDER BY n_date DESC;'); + + $news_array = array(); + foreach ($news_assoc_array as $key => $news) { + $new_news = new news(); + $new_news->set_news_data_by_id($news['n_id']); + $news_array[] = $new_news; + } + + $smarty->assign('news_array',$news_array); + //$smarty->assign('balance', $balance); $smarty->display('user_diary.tpl'); diff --git a/_include/include_information.php b/_include/include_information.php index cd98a8d..854128c 100644 --- a/_include/include_information.php +++ b/_include/include_information.php @@ -1,14 +1,29 @@ is_id()) { + $news = new news(); + $news->set_news_data_by_id($this->get_id()); - $setv_id = $sql->single_variable($info_query); + $smarty->assign('news',$news); + $smarty->display('news_data_edit.tpl'); +} +else { + //lista + $news_query = "SELECT * FROM news WHERE n_deleted = 0 AND n_user_ua_id = " . $user->get_ua_id() . " ORDER BY n_date DESC"; - $new_setval = new setting_value(); - $new_setval->set_setting_value_data_by_id($setv_id); - $smarty->assign('setting', $new_setval); + $news_assoc_array = $sql->assoc_array($news_query); + + $news_array = array(); + foreach ($news_assoc_array as $key => $news) { + $new_news = new news(); + $new_news->set_news_data_by_id($news['n_id']); + $news_array[] = $new_news; + } + + $smarty->assign('news_array', $news_array); + $smarty->display('news_list.tpl'); +} - $smarty->display('information.tpl'); ?> diff --git a/_include/include_information_wall.php b/_include/include_information_wall.php new file mode 100644 index 0000000..cd98a8d --- /dev/null +++ b/_include/include_information_wall.php @@ -0,0 +1,14 @@ +single_variable($info_query); + + $new_setval = new setting_value(); + $new_setval->set_setting_value_data_by_id($setv_id); + $smarty->assign('setting', $new_setval); + + $smarty->display('information.tpl'); +?> diff --git a/event_handler.php b/event_handler.php index 28ca85a..0efefa5 100644 --- a/event_handler.php +++ b/event_handler.php @@ -568,6 +568,21 @@ if (isset($_POST['action'])) { log::register('update_training_template', $_POST['tt_id']); header('Location: /admin/training_templates/'.$_POST['tt_id']); break; + case 'news_create': + # új hír + unset($_POST['action']); + $new_news_id = news::create_news($_POST); + log::register('new_news', $new_news_id); + header('Location: /admin/news/'.$new_news_id); + break; + case 'news_update': + unset($_POST['action']); + $n_id = $_POST['n_id']; + unset($_POST['n_id']); + news::update_news($_POST, $n_id); + log::register('update_news', $n_id); + header('Location: /admin/news/'.$n_id); + break; default: # code... break; diff --git a/queries/news_20190729.sql b/queries/news_20190729.sql new file mode 100644 index 0000000..bb0c04a --- /dev/null +++ b/queries/news_20190729.sql @@ -0,0 +1,16 @@ +CREATE TABLE `news` ( + `n_id` INT NOT NULL AUTO_INCREMENT, + `n_title` VARCHAR(255) NULL DEFAULT NULL, + `n_date` DATETIME NOT NULL, + `n_text` TEXT NULL DEFAULT NULL, + `n_user_ua_id` INT NOT NULL, + `n_deleted` INT NULL DEFAULT 0, + PRIMARY KEY (`n_id`)); + +INSERT INTO `subpage` (`spage_url`, `spage_title`, `spage_page_id`) VALUES ('news', 'Információk', '1'); + +INSERT INTO `log_category` (`logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES ('new_news', 'Új hír', '1', 'news', 'n_title', 'n_id'); +INSERT INTO `log_category` (`logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES ('update_news', 'Hír módosítása', '1', 'news', 'n_title', 'n_id'); +INSERT INTO `log_category` (`logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES ('delete_news', 'Hír törlése', '1', 'news', 'n_title', 'n_id'); + +DELETE FROM `subpage` WHERE `spage_name` = 'information'; diff --git a/template/templates/news_create.tpl b/template/templates/news_create.tpl new file mode 100644 index 0000000..9b95575 --- /dev/null +++ b/template/templates/news_create.tpl @@ -0,0 +1,27 @@ +
+
+ + +
+ +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ + diff --git a/template/templates/news_data_edit.tpl b/template/templates/news_data_edit.tpl new file mode 100644 index 0000000..5eba347 --- /dev/null +++ b/template/templates/news_data_edit.tpl @@ -0,0 +1,31 @@ +
+
+ Hír törlése +
+
+ + + +
+ +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ + diff --git a/template/templates/news_list.tpl b/template/templates/news_list.tpl new file mode 100644 index 0000000..c5611cb --- /dev/null +++ b/template/templates/news_list.tpl @@ -0,0 +1,15 @@ +
+ Új hír hozzádása +
+ +
+{foreach $news_array as $news} + +
+ + {$news->get_n_title()} + {$news->get_n_date()|date_format:"%Y.%m.%d %H:%M"} +
+ +{/foreach} +
diff --git a/template/templates/user_diary.tpl b/template/templates/user_diary.tpl index 6d44f9a..733abee 100644 --- a/template/templates/user_diary.tpl +++ b/template/templates/user_diary.tpl @@ -1,155 +1,175 @@ -
+
- {foreach $actions as $action} +
- {if $action@first} -
-
- - Aktuális egyenleg: {$action->get_de_balance()|number_format:0:'':' '} Ft - + {foreach $actions as $action} + + {if $action@first} +
+
+ + Aktuális egyenleg: {$action->get_de_balance()|number_format:0:'':' '} Ft + +
+ {/if} + + {if $action->get_de_training()|is_a:'training'} + + {if !$action@first && + $actions[$action@index-1]->get_de_training()|is_a:'training' && + $actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2 + + || + + !$action@first && + $actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' && + $actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 + + } +
- {/if} - - {if $action->get_de_training()|is_a:'training'} - - {if !$action@first && - $actions[$action@index-1]->get_de_training()|is_a:'training' && - $actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2 - - || - - !$action@first && - $actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' && - $actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 - - } - -
- {$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}. - {$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]} - ({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés) -
- Egyenleg - -
- -
- - {elseif $action@first} - {$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}. - {$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]} - ({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés) -
- Egyenleg - -
- -
- - {/if} -
-
- - {$action->get_de_training()->get_tr_date()|substr:0:4}. + {$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}. {$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]} - {$action->get_de_training()->get_tr_date_day()}. - {$days[$action->get_de_training()->get_tr_date_day_of_week()]} - {$action->get_de_training()->get_tr_date_time()} + ({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés) +
+ Egyenleg + +
-
- {if $action->get_de_training()->get_tr_training_type_trt_id()}{$action->get_de_training()->get_tr_type_name_by_id()} edzés{/if} - {$action->get_de_training()->get_tr_duration()} p - {if $action->get_de_training()->is_coach()} - {foreach $action->get_de_training()->get_tr_coaches_name() as $coach_name} - {if $coach_name@first}({/if}{$coach_name}{if $coach_name@last}){else}, {/if} - {/foreach} +
+ + {elseif $action@first} + {$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}. + {$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]} + ({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés) +
+ Egyenleg + +
+ +
+ {/if} - - {assign var="discount" value=""} - {if $action->get_de_has_discount()} - {if $action->get_de_discount_id() == 1} - {assign var="discount" value="Próba kedvezmény"} - {elseif $action->get_de_discount_id() == 2} - {assign var="discount" value="Havi 10+ kedvezmény"} - {elseif $action->get_de_discount_id() == 3} - {assign var="discount" value="Duplázó kedvezmény"} - {/if} - {/if} - -
- Egyenleg: {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft - {if $discount != ""}
{$discount}{/if} -
-
- -
- - - {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft
{$discount} -
-
- - {elseif $action->get_de_money_deposit()|is_a:'money_deposit'} - - - {if !$action@first && - $actions[$action@index-1]->get_de_training()|is_a:'training' && - $actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2 - - || - - !$action@first && - $actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' && - $actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 - - } - -
- {$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. - {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} - ({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés) - - -
- - {elseif $action@first} - - {$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. - {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} - ({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés) - - -
- - - {/if} -
-
+
+
- {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. - {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} - {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date_day()}. + {$action->get_de_training()->get_tr_date()|substr:0:4}. + {$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]} + {$action->get_de_training()->get_tr_date_day()}. + {$days[$action->get_de_training()->get_tr_date_day_of_week()]} + {$action->get_de_training()->get_tr_date_time()}
- befizetés: {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_sum(true)} Ft + {if $action->get_de_training()->get_tr_training_type_trt_id()}{$action->get_de_training()->get_tr_type_name_by_id()} edzés{/if} + {$action->get_de_training()->get_tr_duration()} p + {if $action->get_de_training()->is_coach()} + {foreach $action->get_de_training()->get_tr_coaches_name() as $coach_name} + {if $coach_name@first}({/if}{$coach_name}{if $coach_name@last}){else}, {/if} + {/foreach} + {/if} + + {assign var="discount" value=""} + {if $action->get_de_has_discount()} + {if $action->get_de_discount_id() == 1} + {assign var="discount" value="Próba kedvezmény"} + {elseif $action->get_de_discount_id() == 2} + {assign var="discount" value="Havi 10+ kedvezmény"} + {elseif $action->get_de_discount_id() == 3} + {assign var="discount" value="Duplázó kedvezmény"} + {/if} + {/if} + +
+ Egyenleg: {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft + {if $discount != ""}
{$discount}{/if} +
- {assign var="discount" value=""} + + {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft
{$discount}
+
+ + {elseif $action->get_de_money_deposit()|is_a:'money_deposit'} + + + {if !$action@first && + $actions[$action@index-1]->get_de_training()|is_a:'training' && + $actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2 + + || + + !$action@first && + $actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' && + $actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 + + } + +
+ {$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. + {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} + ({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés) + + +
+ + {elseif $action@first} + + {$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. + {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} + ({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés) + + +
+ + + {/if} +
+
+ + {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}. + {$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]} + {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date_day()}. + +
+ befizetés: {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_sum(true)} Ft +
+ +
+ {assign var="discount" value=""} + {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft
{$discount} +
+
+ + {/if} + + {if $action@last} + +
+ + {/if} + {/foreach} +
+
+
+
+

+ Hírek, információk +

- - {/if} - - {if $action@last} - -
- - {/if} - {/foreach} + {foreach $news_array as $news} + + {$news->get_n_title()} - {$news->get_n_date()|date_format:"%Y.%m.%d %H:%M"} + +
+ {$news->get_n_text()} +
+ {/foreach} +
+