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

store correct expire date

Browse Source
This commit is contained in:
Ricsi
2019-10-12 14:20:09 +02:00
parent 4996283631
commit a51d912b68
5 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
_class/class_money_deposit.php
View File

@@ -116,7 +116,7 @@ class money_deposit {
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) {
public static function create_money_deposit($_user_id, $_date, $_sum, $_lease, $_mod_expire_date, $_pt = 1, $_sets_date = false) {
global $sql;
$income_id = $sql->insert_into('money_income', array(
@@ -131,11 +131,14 @@ class money_deposit {
$expireDate = 'null';
if ($_sets_date) {
$userLastDeposit = $sql->single_variable("SELECT uk_last_deposit FROM user_kid WHERE uk_id = {$_user_id}");
if ($userLastDeposit < $_date) {
$sql->update_table('user_kid', array(
'uk_last_deposit' => date('Y-m-d')
'uk_last_deposit' => $_date,
), 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
@@ -143,10 +146,19 @@ class money_deposit {
$lease = new lease();
$lease->set_l_data_by_id($_lease);
if ($lease->get_l_expire_type() == 1) {
$userBalanceExpireDate = $sql->single_variable("SELECT uk_balance_expire_date FROM user_kid WHERE uk_id = {$_user_id}");
if ($userBalanceExpireDate < $_mod_expire_date && $_mod_expire_date > date('Y-m-d')) {
$sql->update_table('user_kid', array(
'uk_balance_expire_date' => $_mod_expire_date,
), array(
'uk_id' => $_user_id,
));
}
/*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')
'uk_balance_expire_date' => date('Y-m-t', strtotime($_mod_expire_date))
), array(
'uk_id' => $_user_id,
));
@@ -155,11 +167,11 @@ class money_deposit {
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())),
'uk_balance_expire_date' => date("Y-m-d", strtotime("+1 month", $_mod_expire_date)),
), array(
'uk_id' => $_user_id,
));
$expireDate = date("Y-m-d", strtotime("+1 month", time()));
$expireDate = date("Y-m-d", strtotime("+1 month", $_mod_expire_date));
}
elseif ($lease->get_l_expire_type() == 3) {
//egyedi dátum
@@ -169,7 +181,7 @@ class money_deposit {
'uk_id' => $_user_id,
));
$expireDate = date("Y-m-d", strtotime($lease->get_l_expire_date()));
}
}*/
}
}
@@ -178,7 +190,7 @@ 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,
'mod_expire_date' => $_mod_expire_date,
));
}

2
event_handler.php
View File

@@ -290,7 +290,7 @@ if (isset($_POST['action'])) {
# új befizetés létrehozása
$sets_date = (isset($_POST['mod_sets_expire_date']) && $_POST['mod_sets_expire_date']) ? $_POST['mod_sets_expire_date'] : false;
$new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_lease_l_id'], 1, $sets_date);
$new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_lease_l_id'], $_POST['mod_expire_date'], 1, $sets_date);
$tmp_user = new user_kid();
$tmp_user->set_user_data_by_id($_POST['mod_user_kid_uk_id']);
log::register('new_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')');

4
template/templates/lease_create.tpl
View File

@@ -17,11 +17,11 @@
<legend for="l_expire_type">Lejárati dátum: </legend>
<div>
<input id="r_01" type="radio" name="l_expire_type" value="1" checked>
<label class="choice" for="r_01">Aktuális hónap vége</label>
<label class="choice" for="r_01">Befizetés hónapjának vége</label>
</div>
<div>
<input id="r_02" type="radio" name="l_expire_type" value="2">
<label class="choice" for="r_02">Következő tárgyhónap</label>
<label class="choice" for="r_02">Befizetés után következő tárgyhónap</label>
</div>
<div>
<input id="r_03" type="radio" name="l_expire_type" value="3">

4
template/templates/lease_data_edit.tpl
View File

@@ -22,11 +22,11 @@
<legend for="l_expire_type">Lejárati dátum: </legend>
<div>
<input id="r_01" type="radio" name="l_expire_type" value="1" {if $lease->get_l_expire_type() == 1}checked{/if}>
<label class="choice" for="r_01">Aktuális hónap vége</label>
<label class="choice" for="r_01">Befizetés hónapjának vége</label>
</div>
<div>
<input id="r_02" type="radio" name="l_expire_type" value="2" {if $lease->get_l_expire_type() == 2}checked{/if}>
<label class="choice" for="r_02">Következő tárgyhónap</label>
<label class="choice" for="r_02">Befizetés után következő tárgyhónap</label>
</div>
<div>
<input id="r_03" type="radio" name="l_expire_type" value="3" {if $lease->get_l_expire_type() == 3}checked{/if}>

9
template/templates/money_deposit_create.tpl
View File

@@ -52,7 +52,10 @@
<div>
<label for="mod_sum">Lejár:</label>
<div id="expire_date" style="padding-top: 6px;">Következő hónapban (alapértelmezett beállítás)</div>
<input type="hidden" name="mod_expire_date" id="mod_expire_date">
<div id="expire_date" style="padding-top: 6px;">
Következő hónapban (alapértelmezett beállítás)
</div>
</div>
<div>
@@ -98,15 +101,19 @@
//var nextMonthBeginning = new Date(today.getFullYear(), today.getMonth() + 1, 1);
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));
$('#mod_expire_date').val(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 today = new Date($('#mod_date').val());
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));
$('#mod_expire_date').val(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']);
$('#mod_expire_date').val(pdata['l_expire_date']);
}
}
});