tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove credit

Browse Source
This commit is contained in:
Tóth Richárd
2020-02-16 19:18:23 +01:00
parent 06db8798d0
commit 02b2350828
5 changed files with 3 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_ajax/update_presence.php
View File

@@ -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']));
}
}
?>

15
_class/class_user_kid.php
View File

@@ -749,24 +749,9 @@ 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 false;
}

1
queries/202002_delete_credit.sql Normal file
View File

@@ -0,0 +1 @@
DELETE FROM `setting` WHERE `set_id`='5';

89
template/templates/presence.tpl
View File

@@ -97,9 +97,6 @@
<img class="{if !$user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
<span class="{if !$user->get_uk_lease()}no-lease{/if}">{$user->get_uk_name()}</span>
{if $user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$user->get_uk_credit()}</span>/{$credit})</span>
{/if}
</div>
</div>
@@ -114,9 +111,6 @@
<img class="{if !$rest_user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
<span class="{if !$rest_user->get_uk_lease()}no-lease{/if}">{$rest_user->get_uk_name()}</span>
{if $rest_user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$rest_user->get_uk_credit()}</span>/{$credit})</span>
{/if}
</div>
</div>
{/foreach}
@@ -128,9 +122,6 @@
<img class="{if !$user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
<span class="{if !$user->get_uk_lease()}no-lease{/if}">{$user->get_uk_name()}</span>
{if $user->get_uk_credit() and $user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$user->get_uk_credit()}</span>/{$credit})</span>
{/if}
</div>
</div>
{/foreach}
@@ -139,10 +130,6 @@
{/if}
<script>
function leaveClassesAndAdd(obj, className) {
$(obj).removeClass('restricted').removeClass('credit-restricted').removeClass('credit-warning').addClass(className);
}
$('.name_tag, .name_tag_checked').click(function() {
if (($(this).hasClass('restricted') || $(this).hasClass('credit-restricted')) && !$(this).hasClass('name_tag_checked')) {
console.log('stop');
@@ -156,11 +143,6 @@
var checked = $(this).hasClass('name_tag_checked');
var tr_id = $("#tr_id").val();
//hitelezett alkalom, logikai változó
var credited = $(this).hasClass('credit-warning');
var credit = $(this).data('credit');
var originalCredit = $(this).data('credit');
//ha kék, akkor zöldre változtatja, egyébként fordítva
//if (color == '#e2edff') {
if ($(this).hasClass('name_tag')) {
@@ -170,20 +152,6 @@
var el = $('#headcount');
var num = parseInt(el.text());
el.text(num+1).append(" fő");
if (credited) {
credit++;
$(this).data('credit', credit);
$(this).attr('data-credit', credit);
$(this).find('.credit-counter').html(credit);
//meg kell nézni, hogy a classokat le kell-e venni/hozzá kell-e adni
if (credit == $('#main-list-container').data('max-credit')) {
leaveClassesAndAdd($(this), 'credit-restricted');
}
}
}
else {
//$(this).css('backgroundColor', '#e2edff');
@@ -192,60 +160,7 @@
var el = $('#headcount');
var num = parseInt(el.text());
el.text(num-1).append(" fő");
if (credit > 0) {
credit--;
$(this).data('credit', credit);
$(this).attr('data-credit', credit);
$(this).find('.credit-counter').html(credit);
//meg kell nézni, hogy a classokat le kell-e venni/hozzá kell-e adni
if ($('#main-list-container').data('max-credit') > 0) {
leaveClassesAndAdd($(this), 'credit-warning');
}
else {
leaveClassesAndAdd($(this), 'credit-restricted');
}
}
}
//alert(checked);
var admin_id = $("#admin_id").val();
$.ajax({
type: "POST",
url: '/_ajax/update_presence.php',
data: { checked : checked, user_id : user_id, tr_id : tr_id, admin_id : admin_id, credited : credited, credit : originalCredit},
success: function(data) {
}
});
});
/* $('.name_tag_checked').click(function() {
//alert($(this).css('backgroundColor'));
var user_id = $(this).attr('id');
var x = $(this).css('backgroundColor');
hexc(x);
var checked = (color == '#e2edff');
var tr_id = $("#tr_id").val();
//ha kék, akkor zöldre változtatja, egyébként fordítva
if (color == '#e2edff') {
$(this).css('backgroundColor', '#1eea0b');
var el = $('#headcount');
var num = parseInt(el.text());
el.text(num+1).append(" fő");
}
else {
$(this).css('backgroundColor', '#e2edff');
var el = $('#headcount');
var num = parseInt(el.text());
el.text(num-1).append(" fő");
}
//alert(checked);
var admin_id = $("#admin_id").val();
$.ajax({
@@ -256,9 +171,7 @@
}
});
});*/
});
function hexc(colorval) {
var parts = colorval.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);

6
template/templates/user_data_edit.tpl
View File

@@ -42,12 +42,6 @@
<div style="padding-top: 6px;">{{$user_data.uk_balance|number_format:0:'':' '}} Ft</div>
</div>
<div>
<label>Hitelalkalom:</label>
<div style="padding-top: 6px;">{$user_data.uk_credit|number_format:0:'':' '}/{$maxCredit}</div>
<div style="margin-top: 6px;"><a class="addbutton small" href="/admin/set_credit_to_zero/{$user_data.uk_id}">Nullázás</a></div>
</div>
<div style="padding-bottom: 15px; border-bottom: 1px solid;">
{if $user_data.uk_balance}
<label>Lejár:</label>