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

handle last deposit in month

Browse Source
This commit is contained in:
Richard Toth
2020-10-06 11:11:24 +02:00
parent 11815bc9ab
commit 5a252e28a0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_class/class_user_kid.php
View File

@@ -667,8 +667,13 @@ class user_kid extends user_parent {
$nonZero = $_de->get_de_money_deposit()->get_mod_non_zero(); $nonZero = $_de->get_de_money_deposit()->get_mod_non_zero();
$_de->set_de_transaction($_de->get_de_money_deposit()->get_mod_money_income()->get_mi_sum()); $_de->set_de_transaction($_de->get_de_money_deposit()->get_mod_money_income()->get_mi_sum());
$lastEntryInMonth = false;
if (isset($_de_obj_array[$i+1])) {
$lastEntryInMonth = date('m', strtotime($_de_obj_array[$i+1]->get_de_date())) !== date('m', strtotime($_de->get_de_date()));
}
//var_dump($i < (count($_de_obj_array) -1 ) || !$_de->get_de_expired() || !$lastEntryInMonth);
//ha ez a befizetés az utolsó és lejárt, akkor ne adjuk hozzá a balancehoz //ha ez a befizetés az utolsó és lejárt, akkor ne adjuk hozzá a balancehoz
if ($i < (count($_de_obj_array) -1 ) || !$_de->get_de_expired()) { if ($i < (count($_de_obj_array) -1 ) || !$_de->get_de_expired() || !$lastEntryInMonth) {
$_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction()); $_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction());
} }

3
template/templates/money_deposit_create.tpl
View File

@@ -101,9 +101,6 @@
//var nextMonthBeginning = new Date(today.getFullYear(), today.getMonth() + 1, 1); //var nextMonthBeginning = new Date(today.getFullYear(), today.getMonth() + 1, 1);
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0); var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0);
//console.log(lastDayOfMonth, today, lastDayOfMonth.getTime() === today.getTime()); //console.log(lastDayOfMonth, today, lastDayOfMonth.getTime() === today.getTime());
if (lastDayOfMonth.getTime() === today.getTime()) {
lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+2, 0);
}
$('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2)); $('#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)); $('#mod_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));