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

updated lease type to expire at the END of next month

Browse Source
This commit is contained in:
Tóth Richárd
2020-02-16 20:02:34 +01:00
parent 02b2350828
commit 093c9c25e7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_class/class_money_deposit.php
View File

@@ -228,7 +228,7 @@ class money_deposit {
$expireDate = date('Y-m-t', strtotime($mod->get_mod_money_income()->get_mi_date())); $expireDate = date('Y-m-t', strtotime($mod->get_mod_money_income()->get_mi_date()));
} }
elseif ($lease->get_l_expire_type() == 2) { elseif ($lease->get_l_expire_type() == 2) {
$expireDate = date("Y-m-d", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date()))); $expireDate = date("Y-m-t", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date())));
} }
elseif ($lease->get_l_expire_type() == 3) { elseif ($lease->get_l_expire_type() == 3) {
//egyedi dátum //egyedi dátum

2
template/templates/lease_create.tpl
View File

@@ -21,7 +21,7 @@
</div> </div>
<div> <div>
<input id="r_02" type="radio" name="l_expire_type" value="2"> <input id="r_02" type="radio" name="l_expire_type" value="2">
<label class="choice" for="r_02">Befizetés után következő tárgyhónap</label> <label class="choice" for="r_02">Befizetést követő tárgyhónap vége</label>
</div> </div>
<div> <div>
<input id="r_03" type="radio" name="l_expire_type" value="3"> <input id="r_03" type="radio" name="l_expire_type" value="3">

2
template/templates/lease_data_edit.tpl
View File

@@ -26,7 +26,7 @@
</div> </div>
<div> <div>
<input id="r_02" type="radio" name="l_expire_type" value="2" {if $lease->get_l_expire_type() == 2}checked{/if}> <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">Befizetés után következő tárgyhónap</label> <label class="choice" for="r_02">Befizetést követő tárgyhónap vége</label>
</div> </div>
<div> <div>
<input id="r_03" type="radio" name="l_expire_type" value="3" {if $lease->get_l_expire_type() == 3}checked{/if}> <input id="r_03" type="radio" name="l_expire_type" value="3" {if $lease->get_l_expire_type() == 3}checked{/if}>

6
template/templates/money_deposit_create.tpl
View File

@@ -107,9 +107,9 @@
else if (pdata['l_expire_type'] == '2') { else if (pdata['l_expire_type'] == '2') {
//var today = new Date(); //var today = new Date();
var today = new Date($('#mod_date').val()); var today = new Date($('#mod_date').val());
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1); var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+2, 0);
$('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.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' + today.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'] == '3') { else if (pdata['l_expire_type'] == '3') {
$('#expire_date').html(pdata['l_expire_date']); $('#expire_date').html(pdata['l_expire_date']);