From 02b23508284e0a72c24dd1286c8249885b694938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20Rich=C3=A1rd?= Date: Sun, 16 Feb 2020 19:18:23 +0100 Subject: [PATCH] remove credit --- _ajax/update_presence.php | 8 --- _class/class_user_kid.php | 17 +---- queries/202002_delete_credit.sql | 1 + template/templates/presence.tpl | 89 +-------------------------- template/templates/user_data_edit.tpl | 6 -- 5 files changed, 3 insertions(+), 118 deletions(-) create mode 100644 queries/202002_delete_credit.sql diff --git a/_ajax/update_presence.php b/_ajax/update_presence.php index d83d5d7..706745e 100644 --- a/_ajax/update_presence.php +++ b/_ajax/update_presence.php @@ -15,18 +15,10 @@ $check_query = "SELECT * FROM presence WHERE pr_training_tr_id = " . $_POST['tr_ if (!$sql->num_of_rows($check_query) && $_POST['checked'] == "false") { $sql->insert_into('presence', array('pr_user_kid_uk_id' => $_POST['user_id'], 'pr_training_tr_id' => $_POST['tr_id'])); log::register('new_presence', 'Edzés: ' . $_POST['tr_id'] . ', gyerek: ' . $_POST['user_id'], null, $_POST['admin_id']); - - if ($_POST['credited'] == 'true') { - $sql->update_table('user_kid', array('uk_credit' => $_POST['credit'] + 1), array('uk_id' => $_POST['user_id'])); - } } elseif ($sql->num_of_rows($check_query) && $_POST['checked'] == "true") { $sql->execute_query('delete from presence where pr_user_kid_uk_id = ' . $_POST['user_id'] . ' AND pr_training_tr_id = ' . $_POST['tr_id']); log::register('delete_presence', 'Edzés: ' . $_POST['tr_id'] . ', gyerek: ' . $_POST['user_id'], null, $_POST['admin_id']); - - if ($_POST['credit'] > 0) { - $sql->update_table('user_kid', array('uk_credit' => $_POST['credit'] - 1), array('uk_id' => $_POST['user_id'])); - } } ?> diff --git a/_class/class_user_kid.php b/_class/class_user_kid.php index 7acc140..4b2005b 100644 --- a/_class/class_user_kid.php +++ b/_class/class_user_kid.php @@ -749,23 +749,8 @@ class user_kid extends user_parent { //ha igen, túllepte-e PIROS //ha nem, akkor SÁRGA //ha nincs, akkor azonnal PIROS - if (!$this->get_uk_lease()) { - return false; - } - if ($this->get_uk_balance() < 0 || ($this->get_uk_balance() - $trainingPrice) < 0) { - if (!$has_credit) { - return 'restricted'; - } - else { - if ($this->get_uk_credit() < $credit) { - return 'credit-warning'; - } - else { - return 'credit-restricted'; - } - } - + return 'credit-warning'; } return false; } diff --git a/queries/202002_delete_credit.sql b/queries/202002_delete_credit.sql new file mode 100644 index 0000000..475ad4c --- /dev/null +++ b/queries/202002_delete_credit.sql @@ -0,0 +1 @@ +DELETE FROM `setting` WHERE `set_id`='5'; diff --git a/template/templates/presence.tpl b/template/templates/presence.tpl index 4873f6f..1362430 100644 --- a/template/templates/presence.tpl +++ b/template/templates/presence.tpl @@ -97,9 +97,6 @@
{$user->get_uk_name()} - {if $user->get_credit_color($has_credit, $credit, $training->get_tr_price())} - ({$user->get_uk_credit()}/{$credit}) - {/if}
@@ -114,9 +111,6 @@
{$rest_user->get_uk_name()} - {if $rest_user->get_credit_color($has_credit, $credit, $training->get_tr_price())} - ({$rest_user->get_uk_credit()}/{$credit}) - {/if}
{/foreach} @@ -128,9 +122,6 @@
{$user->get_uk_name()} - {if $user->get_uk_credit() and $user->get_credit_color($has_credit, $credit, $training->get_tr_price())} - ({$user->get_uk_credit()}/{$credit}) - {/if}
{/foreach} @@ -139,10 +130,6 @@ {/if}