diff --git a/_class/class_money_deposit.php b/_class/class_money_deposit.php index 4d2af75..4d2136e 100644 --- a/_class/class_money_deposit.php +++ b/_class/class_money_deposit.php @@ -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) { - $sql->update_table('user_kid', array( - 'uk_last_deposit' => date('Y-m-d') - ), array( - 'uk_id' => $_user_id, - )); + $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, + ), 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, )); } diff --git a/event_handler.php b/event_handler.php index d589b6c..eb46e93 100644 --- a/event_handler.php +++ b/event_handler.php @@ -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'] . ')'); diff --git a/template/templates/lease_create.tpl b/template/templates/lease_create.tpl index 6284969..36e9a39 100644 --- a/template/templates/lease_create.tpl +++ b/template/templates/lease_create.tpl @@ -17,11 +17,11 @@ Lejárati dátum:
- +
- +
diff --git a/template/templates/lease_data_edit.tpl b/template/templates/lease_data_edit.tpl index 655d6e2..5a092c7 100644 --- a/template/templates/lease_data_edit.tpl +++ b/template/templates/lease_data_edit.tpl @@ -22,11 +22,11 @@ Lejárati dátum:
get_l_expire_type() == 1}checked{/if}> - +
get_l_expire_type() == 2}checked{/if}> - +
get_l_expire_type() == 3}checked{/if}> diff --git a/template/templates/money_deposit_create.tpl b/template/templates/money_deposit_create.tpl index d53f80e..b4421d8 100644 --- a/template/templates/money_deposit_create.tpl +++ b/template/templates/money_deposit_create.tpl @@ -52,7 +52,10 @@
-
Következő hónapban (alapértelmezett beállítás)
+ +
+ Következő hónapban (alapértelmezett beállítás) +
@@ -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']); } } });