diff --git a/_ajax/get_lease_sum.php b/_ajax/get_lease_sum.php index 1e34503..95e6cdc 100644 --- a/_ajax/get_lease_sum.php +++ b/_ajax/get_lease_sum.php @@ -5,15 +5,15 @@ include('class_sql.php'); if ($_SERVER['HTTP_HOST'] == 'cegledcoach.hu') $sql = new sql('bcd_mysql','root','','badminton_coach'); else $sql = new sql('localhost','livingsp_coach','R186er012qw5','livingsp_badminton'); -if (empty($_GET['lease_id'])) { +if (empty($_GET['lease_id']) || 'null' == $_GET['lease_id']) { echo json_encode(null); } else { - $l_query = "SELECT l_sum FROM lease WHERE l_id = " . $_GET['lease_id']; + $l_query = "SELECT l_sum, l_expire_type, l_expire_date FROM lease WHERE l_id = " . $_GET['lease_id']; - $l_sum = $sql->single_variable($l_query); + $l_res = $sql->assoc_array($l_query); - echo json_encode($l_sum); + echo json_encode($l_res[0]); } ?> diff --git a/_class/class_diary_entry.php b/_class/class_diary_entry.php index f14090a..d25a3b8 100644 --- a/_class/class_diary_entry.php +++ b/_class/class_diary_entry.php @@ -16,8 +16,9 @@ class diary_entry { private $de_balance = 0; //a felhasználóhoz tartozó aktuális egyenleg private $de_has_discount = false; //van-e kedvzemény private $de_discount_id; //kedvezmény ID + private $de_expired = 0; - function __construct($_pr_id, $_date, $_type, $_tpm, $_tpd, $_ft, $_tr = null, $_mod = null) { + function __construct($_pr_id, $_date, $_type, $_tpm, $_tpd, $_ft, $_expired = 0, $_tr = null, $_mod = null) { $this->set_de_presence_id($_pr_id); $this->set_de_date($_date); $this->set_de_type($_type); @@ -26,7 +27,7 @@ class diary_entry { $this->set_de_first_two($_ft); $this->set_de_training($_tr); $this->set_de_money_deposit($_mod); - + $this->set_de_expired($_expired); } public function set_de_presence_id($_item) { @@ -83,6 +84,10 @@ class diary_entry { $this->de_discount_id = $_item; } + public function set_de_expired($_item) { + $this->de_expired = $_item; + } + public function get_de_presence_id() { return $this->de_presence_id; } @@ -131,6 +136,10 @@ class diary_entry { return $this->de_discount_id; } + public function get_de_expired() { + return $this->de_expired; + } + } diff --git a/_class/class_lease.php b/_class/class_lease.php index 0f65ab7..8773a1c 100644 --- a/_class/class_lease.php +++ b/_class/class_lease.php @@ -159,7 +159,7 @@ class lease { $expDate = $_values['l_expire_date']; } else { - $expDate = $_values['l_expire_date_hidden']; + $expDate = 'null'; } $l_id = $sql->insert_into('lease', array( @@ -188,7 +188,7 @@ class lease { $expDate = $_values['l_expire_date']; } else { - $expDate = $_values['l_expire_date_hidden']; + $expDate = 'null'; } $sql->update_table('lease', array( diff --git a/_class/class_money_deposit.php b/_class/class_money_deposit.php index 7861a40..8172e0d 100644 --- a/_class/class_money_deposit.php +++ b/_class/class_money_deposit.php @@ -12,6 +12,7 @@ class money_deposit { private $mod_money_income; //OBJECT private $mod_deleted; private $mod_sets_expire_date; + private $mod_expire_date; private $mod_lease_l_id; //OBJECT public function set_mod_id($_id) { @@ -42,6 +43,10 @@ class money_deposit { $this->mod_sets_expire_date = $_sets_expire_date; } + public function set_mod_expire_date($_expire_date) { + $this->mod_expire_date = $_expire_date; + } + public function set_mod_lease_l_id($_lease_l_id) { $this->mod_lease_l_id = $_lease_l_id; } @@ -74,6 +79,10 @@ class money_deposit { return $this->mod_sets_expire_date; } + public function get_mod_expire_date() { + return $this->mod_expire_date; + } + public function get_mod_lease_l_id() { return $this->mod_lease_l_id; } @@ -103,6 +112,9 @@ class money_deposit { } } } + public function is_expired() { + return $this->get_mod_expire_date() <= date('Y-m-d'); + } public static function create_money_deposit($_user_id, $_date, $_sum, $_lease, $_pt = 1, $_sets_date = false) { global $sql; @@ -116,12 +128,49 @@ class money_deposit { ) ); + $expireDate = 'null'; + if ($_sets_date) { $sql->update_table('user_kid', array( 'uk_last_deposit' => date('Y-m-d') ), array( 'uk_id' => $_user_id, )); + + //lekérjük, hogy milyen a lejárati típusa a bérletnek, és az alapján beállítjuk a lejárati dátumot az usernek + + if ('null' != $_lease) { + $lease = new lease(); + $lease->set_l_data_by_id($_lease); + + if ($lease->get_l_expire_type() == 1) { + //naptári hónap vége + $sql->update_table('user_kid', array( + 'uk_balance_expire_date' => date('Y-m-t') + ), array( + 'uk_id' => $_user_id, + )); + $expireDate = date('Y-m-t'); + } + elseif ($lease->get_l_expire_type() == 2) { + //következő hónapban + $sql->update_table('user_kid', array( + 'uk_balance_expire_date' => date("Y-m-d", strtotime("+1 month", time())), + ), array( + 'uk_id' => $_user_id, + )); + $expireDate = date("Y-m-d", strtotime("+1 month", time())); + } + elseif ($lease->get_l_expire_type() == 3) { + //egyedi dátum + $sql->update_table('user_kid', array( + 'uk_balance_expire_date' => $lease->get_l_expire_date(), + ), array( + 'uk_id' => $_user_id, + )); + $expireDate = date("Y-m-d", strtotime($lease->get_l_expire_date())); + } + } } return $sql->insert_into('money_deposit', array( @@ -129,10 +178,11 @@ class money_deposit { 'mod_money_income_mi_id' => $income_id, 'mod_sets_expire_date' => $_sets_date, 'mod_lease_l_id' => $_lease, + 'mod_expire_date' => $expireDate, )); } - public static function update_money_deposit($_user_id, $_date, $_sum, $_lease, $_mod_id, $_pt, $_mi_id) { + public static function update_money_deposit($_date, $_sum, $_mod_id, $_pt, $_mi_id) { global $sql; $sql->update_table('money_income', array( //'mod_user_kid_uk_id' => $_user_id, @@ -143,15 +193,39 @@ class money_deposit { 'mi_id' => $_mi_id )); - $sql->update_table('money_deposit', array( - 'mod_user_kid_uk_id' => $_user_id, - 'mod_lease_l_id' => $_lease, - ), array( - 'mod_id' => $_mod_id - )); + // $sql->update_table('money_deposit', array( + // 'mod_user_kid_uk_id' => $_user_id, + // //'mod_lease_l_id' => $_lease, + // ), array( + // 'mod_id' => $_mod_id + // )); } + public static function calculate_expire_date($_mod_id) { + global $sql; + + $mod = new money_deposit(); + $mod->set_mod_data_by_id($_mod_id); + + $expireDate = null; + + $lease = $mod->get_mod_lease_l_id(); + if (null !== $lease) { + if ($lease->get_l_expire_type() == 1) { + $expireDate = date('Y-m-t', strtotime($mod->get_mod_money_income()->get_mi_date())); + } + elseif ($lease->get_l_expire_type() == 2) { + $expireDate = date("Y-m-d", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date()))); + } + elseif ($lease->get_l_expire_type() == 3) { + //egyedi dátum + $expireDate = date("Y-m-d", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date()))); + } + } + + return $expireDate; + } } diff --git a/_class/class_user_kid.php b/_class/class_user_kid.php index 8c9e7ae..870326c 100644 --- a/_class/class_user_kid.php +++ b/_class/class_user_kid.php @@ -587,7 +587,11 @@ class user_kid extends user_parent { } elseif ($_de->get_de_type() == 'money_deposit') { $_de->set_de_transaction($_de->get_de_money_deposit()->get_mod_money_income()->get_mi_sum()); - $_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction()); + if (!$_de->get_de_expired()) { + $_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction()); + } else { + $_de->set_de_balance(0); + } //$balance += $_de->get_de_money_deposit()->get_mod_sum(); //echo $_de->get_de_date() . " plussz " . $_de->get_de_money_deposit()->get_mod_sum() . "

"; } @@ -600,20 +604,20 @@ class user_kid extends user_parent { return $_de_obj_array; } - public function get_groups() { - global $sql; + // public function get_groups() { + // global $sql; - $group_array = array(); - $g_assoc = $sql->assoc_array("select * from user_group_kid join user_group on ug_id = ugk_user_group_ug_id where ug_is_automatic = 1 and ugk_user_kid_uk_id = ".$this->get_uk_id().";"); + // $group_array = array(); + // $g_assoc = $sql->assoc_array("select * from user_group_kid join user_group on ug_id = ugk_user_group_ug_id where ug_is_automatic = 1 and ugk_user_kid_uk_id = ".$this->get_uk_id().";"); - foreach ($g_assoc as $g) { - $group = new user_group(); - $group->set_ug_data_by_id($g['ugk_user_group_ug_id']); - $group_array[] = $group; - } + // foreach ($g_assoc as $g) { + // $group = new user_group(); + // $group->set_ug_data_by_id($g['ugk_user_group_ug_id']); + // $group_array[] = $group; + // } - return $group_array; - } + // return $group_array; + // } public function update_balance() { global $sql; @@ -622,35 +626,39 @@ class user_kid extends user_parent { $action_list_query = " SELECT - object_id, - timestamp(object_date) as object_date, - object_type - FROM - ((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 + object_id, + TIMESTAMP(object_date) AS object_date, + object_type, + expire_date, + IF(expire_date <= NOW(), 1, 0) AS expired FROM - presence - JOIN training ON (tr_id = pr_training_tr_id AND tr_locked = 1) - WHERE - pr_user_kid_uk_id = ".$userId." - AND tr_deleted = 0) UNION (SELECT - mod_id, - 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 = ".$userId." - and mod_deleted = 0)) actions - order by object_date ASC; + ((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, + NULL AS expire_date + FROM + presence + JOIN training ON (tr_id = pr_training_tr_id + AND tr_locked = 1) + WHERE + pr_user_kid_uk_id = ".$userId." + AND tr_deleted = 0) UNION (SELECT + mod_id, + TIMESTAMP(mi_date), + IF(mod_id IS NOT NULL, 'money_deposit', NULL) AS object_type, + mod_expire_date AS expire_date + FROM + money_deposit + JOIN money_income ON mi_id = mod_money_income_mi_id + WHERE + mod_user_kid_uk_id = ".$userId." + AND mod_deleted = 0)) actions + ORDER BY object_date ASC; "; $action_assoc_array = $sql->assoc_array($action_list_query); - +var_dump($action_assoc_array); $actions = array(); $de_array = array(); foreach ($action_assoc_array as $action) { @@ -660,13 +668,14 @@ class user_kid extends user_parent { $new_training = new training(); $new_training->set_training_data_by_id($action['object_id']); //$actions[] = $new_training; - $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, $new_training); + $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, 0, $new_training, null); } elseif ($action['object_type'] == 'money_deposit') { $new_mod = new money_deposit(); $new_mod->set_mod_data_by_id($action['object_id']); + //var_dump($new_mod); //$actions[] = $new_mod; - $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, null, $new_mod); + $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, $action['expired'], null, $new_mod); } $de_array[] = $new_diary_entry; @@ -702,5 +711,42 @@ class user_kid extends user_parent { } return false; } + + public function balance_meta_update() { + global $sql; + + $lastDeposit = 'null'; + $expireDate = 'null'; + + $deposits = $sql->assoc_array(' + SELECT + * + FROM + money_deposit + JOIN + money_income ON mi_id = mod_money_income_mi_id + WHERE + mod_user_kid_uk_id = '.$this->get_uk_id().' + AND mod_deleted = 0 + AND mod_expire_date > NOW() + ORDER BY mi_date DESC + LIMIT 1; + '); + + if (count($deposits)) { + $lastDeposit = $deposits[0]['mi_date']; + $expireDate = money_deposit::calculate_expire_date($deposits[0]['mod_id']); + } + + $sql->update_table('user_kid', + array( + 'uk_last_deposit' => $lastDeposit, + 'uk_balance_expire_date' => $expireDate, + ), + array( + 'uk_id' => $this->get_uk_id(), + ) + ); + } } ?> diff --git a/_css/default.css b/_css/default.css index af56638..5075b67 100644 --- a/_css/default.css +++ b/_css/default.css @@ -188,6 +188,12 @@ a.addbutton.noti { text-align: left; } +.list_item table.money.expired { + color: #7d6d6d; + font-weight: normal; + cursor: not-allowed; +} + .list_item table.money td.icon { width: 25px; padding: 0px; diff --git a/_css/default_view.css b/_css/default_view.css index 7714407..e721391 100644 --- a/_css/default_view.css +++ b/_css/default_view.css @@ -36,6 +36,11 @@ div.list div.money_deposit { color: #020372; } +div.list div.money_deposit.expired { + background-color: #D9D6D3; + color: #5b5b60; +} + .list .money_deposit:hover { background-color: #F3BF75; border-left: 2px solid #000; diff --git a/_include/include_delete_money_deposit.php b/_include/include_delete_money_deposit.php index 9b176a0..2beee43 100644 --- a/_include/include_delete_money_deposit.php +++ b/_include/include_delete_money_deposit.php @@ -4,10 +4,13 @@ if ($this->is_id()) { $sql->update_table('money_deposit', array('mod_deleted' => 1), array('mod_id' => $this->get_id())); $new_mod = new money_deposit(); $new_mod->set_mod_data_by_id($this->get_id()); - $sql->update_table('money_income', array('mi_deleted' => 1), array('mi_id' => $new_mod->get_mod_money_income_mi_id())); - //log::register('update_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')'); - log::register('delete_money_deposit', $new_mod->get_mod_user_kid()->get_uk_name() . ': ' . $new_mod->get_mod_money_income()->get_mi_sum() . ' Ft (' . $new_mod->get_mod_money_income()->get_mi_date() . ')'); - header("Location: /admin/money_deposit"); + $sql->update_table('money_income', array('mi_deleted' => 1), array('mi_id' => $new_mod->get_mod_money_income_mi_id())); + //log::register('update_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')'); + log::register('delete_money_deposit', $new_mod->get_mod_user_kid()->get_uk_name() . ': ' . $new_mod->get_mod_money_income()->get_mi_sum() . ' Ft (' . $new_mod->get_mod_money_income()->get_mi_date() . ')'); + $new_mod->get_mod_user_kid()->update_balance(); + //$sql->update_table('user_kid', array('uk_balance_expire_date' => 'null'), array('uk_id' => $new_mod->get_mod_user_kid()->get_uk_id())); + $new_mod->get_mod_user_kid()->balance_meta_update(); + header("Location: /admin/money_deposit"); } diff --git a/_include/include_diary.php b/_include/include_diary.php index 3314525..5e93102 100644 --- a/_include/include_diary.php +++ b/_include/include_diary.php @@ -1,32 +1,36 @@ get_uk_id()." - AND tr_deleted = 0) UNION (SELECT - mod_id, - 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; + SELECT + object_id, + TIMESTAMP(object_date) AS object_date, + object_type, + expire_date, + IF(expire_date <= NOW(), 1, 0) AS expired + FROM + ((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, + NULL AS expire_date + FROM + presence + JOIN training ON (tr_id = pr_training_tr_id + AND tr_locked = 1) + WHERE + pr_user_kid_uk_id = ".$user->get_uk_id()." + AND tr_deleted = 0) UNION (SELECT + mod_id, + TIMESTAMP(mi_date), + IF(mod_id IS NOT NULL, 'money_deposit', NULL) AS object_type, + mod_expire_date AS expire_date + 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); @@ -40,13 +44,13 @@ order by object_date ASC; $new_training = new training(); $new_training->set_training_data_by_id($action['object_id']); //$actions[] = $new_training; - $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, $new_training); + $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, 0, $new_training, null); } elseif ($action['object_type'] == 'money_deposit') { $new_mod = new money_deposit(); $new_mod->set_mod_data_by_id($action['object_id']); //$actions[] = $new_mod; - $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, null, $new_mod); + $new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], 0, 0, 0, $action['expired'], null, $new_mod); } $de_array[] = $new_diary_entry; diff --git a/_include/include_lock_training.php b/_include/include_lock_training.php index ffad400..6196283 100644 --- a/_include/include_lock_training.php +++ b/_include/include_lock_training.php @@ -16,7 +16,7 @@ if ($this->is_id()) { ); log::register(($locked?'training_open':'training_close'), $this->get_id()); - if (true) { + if (!$locked) { //ha most zárjuk le $kid_ids = $sql->assoc_array('SELECT pr_user_kid_uk_id FROM presence WHERE pr_training_tr_id = ' . $this->get_id()); foreach ($kid_ids as $k_array) { diff --git a/_include/include_presence.php b/_include/include_presence.php index e53b96e..23f3c7c 100644 --- a/_include/include_presence.php +++ b/_include/include_presence.php @@ -78,7 +78,7 @@ if ($this->is_id()) { FROM user_kid LEFT JOIN - money_deposit ON mod_user_kid_uk_id = uk_id + money_deposit ON mod_user_kid_uk_id = uk_id AND mod_expire_date > now() AND mod_deleted = 0 LEFT JOIN lease ON l_id = mod_lease_l_id LEFT JOIN @@ -87,6 +87,7 @@ if ($this->is_id()) { uk_deleted = 0 AND uk_is_active = 1 AND ((uk_lease = 1 AND mod_id IS NOT NULL) OR (uk_lease = 0 AND mod_lease_l_id IS NULL)) + GROUP BY uk_id ORDER BY uk_name; "; $rest_user_assoc_array = $sql->assoc_array($rest_user_query); diff --git a/event_handler.php b/event_handler.php index 3cd349d..e4ec9f5 100644 --- a/event_handler.php +++ b/event_handler.php @@ -305,7 +305,7 @@ if (isset($_POST['action'])) { break; case 'money_deposit_update': # befizetés módosítás - money_deposit::update_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_lease_l_id'], $_POST['mod_id'], 1, $_POST['mi_id']); + money_deposit::update_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_id'], 1, $_POST['mi_id']); $tmp_user = new user_kid(); $tmp_user->set_user_data_by_id($_POST['mod_user_kid_uk_id']); $tmp_user->update_balance(); diff --git a/queries/lease_201908241.sql b/queries/lease_201908241.sql index 0751c39..88ad549 100644 --- a/queries/lease_201908241.sql +++ b/queries/lease_201908241.sql @@ -3,7 +3,7 @@ CREATE TABLE `lease` ( `l_name` VARCHAR(128) NOT NULL, `l_expire_type` TINYINT(3) NOT NULL, `l_sum` INT NOT NULL, - `l_expire_date` DATE NOT NULL, + `l_expire_date` DATE NULL DEFAULT NULL, `l_deleted` INT NULL DEFAULT 0, PRIMARY KEY (`l_id`)); @@ -38,3 +38,7 @@ ADD CONSTRAINT `fk_money_deposit_2` REFERENCES `lease` (`l_id`) ON DELETE SET NULL ON UPDATE CASCADE; + + +ALTER TABLE `money_deposit` +ADD COLUMN `mod_expire_date` DATE NULL DEFAULT NULL AFTER `mod_lease_l_id`; diff --git a/template/templates/lease_create.tpl b/template/templates/lease_create.tpl index 712d157..6284969 100644 --- a/template/templates/lease_create.tpl +++ b/template/templates/lease_create.tpl @@ -55,20 +55,21 @@ diff --git a/template/templates/money_deposit.tpl b/template/templates/money_deposit.tpl index cf48729..96eea2a 100644 --- a/template/templates/money_deposit.tpl +++ b/template/templates/money_deposit.tpl @@ -21,9 +21,9 @@
{/if} - +
- +
{if $mod->get_mod_money_income()->get_mi_payment_type_pt_id() == 1} @@ -33,7 +33,7 @@ {/if} - {$mod->get_mod_user_kid()->get_uk_name()} + {$mod->get_mod_user_kid()->get_uk_name()} {if $mod->is_expired()}(Lejárt: {$mod->get_mod_expire_date()}){/if} {$mod->get_mod_money_income()->get_mi_date(true)} diff --git a/template/templates/money_deposit_create.tpl b/template/templates/money_deposit_create.tpl index 3db955b..ef160c6 100644 --- a/template/templates/money_deposit_create.tpl +++ b/template/templates/money_deposit_create.tpl @@ -50,6 +50,11 @@
+
+ +
Következő hónapban (alapértelmezett beállítás)
+
+
@@ -75,10 +80,30 @@ var pdata = JSON.parse(data); if (null == pdata) { + $('#expire_date').html('Következő hónapban (alapértelmezett beállítás)'); + $('#mod_sum').val(''); + return; + } + + if (null == pdata['l_sum']) { $('#mod_sum').val(''); } else { - $('#mod_sum').val(pdata); + $('#mod_sum').val(pdata['l_sum']); + } + + if (pdata['l_expire_type'] == '1') { + var today = new Date(); + var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0); + $('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2)); + } + else if (pdata['l_expire_type'] == '2') { + var today = new Date(); + var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1); + $('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)); + } + else if (pdata['l_expire_type'] == '3') { + $('#expire_date').html(pdata['l_expire_date']); } } }); diff --git a/template/templates/money_deposit_update.tpl b/template/templates/money_deposit_update.tpl index 8d2e24f..20c0733 100644 --- a/template/templates/money_deposit_update.tpl +++ b/template/templates/money_deposit_update.tpl @@ -10,7 +10,7 @@
- {foreach $user_kids as $user_kid} > {/foreach} @@ -39,10 +39,10 @@
- {foreach $lease_array as $lease} - {/foreach} @@ -55,6 +55,11 @@
+
+ +
{$mod->get_mod_expire_date()}
+
+
diff --git a/template/templates/user_data_edit.tpl b/template/templates/user_data_edit.tpl index 6074236..3449d6e 100644 --- a/template/templates/user_data_edit.tpl +++ b/template/templates/user_data_edit.tpl @@ -32,10 +32,10 @@
-
+{*
-
+
*}
diff --git a/template/templates/user_diary.tpl b/template/templates/user_diary.tpl index 0cee380..dd64ab6 100644 --- a/template/templates/user_diary.tpl +++ b/template/templates/user_diary.tpl @@ -13,12 +13,12 @@
- {if $user->get_uk_balance_expires()} + {if $user->get_uk_balance_expires() && $user->get_uk_balance() > 0}
{if $user->get_uk_balance_expire_date()} Az egyenleg lejár: {{$user->get_uk_balance_expire_date()|date_format:"%Y.%m.%d"}} {elseif $user->get_uk_last_deposit()} - Az egyenleg lejár: {{$user->get_uk_last_deposit()|date_format:"%Y.%m.%d"}} + Az egyenleg lejár: {strtotime("+1 month",strtotime($user->get_uk_last_deposit()))|date_format:"%Y.%m.%d"} {else} Kérjük, töltse fel egyenlegét! {/if} @@ -140,7 +140,7 @@ {/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]} @@ -150,10 +150,16 @@ 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 !$action->get_de_expired()} +
+ {assign var="discount" value=""} + {if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft
{$discount} +
+ {else} +
+ Lejárt: {$action->get_de_money_deposit()->get_mod_expire_date()|date_format:"%Y.%m.%d"} +
+ {/if}
{/if}