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

big changes

Browse Source 
everything with lease and expire dates
This commit is contained in:
Tóth Richárd
2019-08-29 17:22:24 +02:00
parent 3915d630dd
commit dccd23f1a1
20 changed files with 315 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
template/templates/lease_create.tpl
View File

@@ -55,20 +55,21 @@
<script type="text/javascript">
$('input[name="l_expire_type"]').on('change', function() {
console.log($(this).val());
if ($(this).val() == '1') {
$('#l_expire_date').prop('disabled', true);
var today = new Date();
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0);
$('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
$('#l_expire_date_hidden').val($('#l_expire_date').val());
$('#l_expire_date').val('');
// var today = new Date();
// var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0);
// $('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
// $('#l_expire_date_hidden').val($('#l_expire_date').val());
}
else if ($(this).val() == '2') {
$('#l_expire_date').prop('disabled', true);
var today = new Date();
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1);
$('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
$('#l_expire_date_hidden').val($('#l_expire_date').val());
$('#l_expire_date').val('');
// var today = new Date();
// var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1);
// $('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
// $('#l_expire_date_hidden').val($('#l_expire_date').val());
}
else if ($(this).val() == '3') {
$('#l_expire_date').removeAttr('disabled');

21
template/templates/lease_data_edit.tpl
View File

@@ -60,20 +60,21 @@
<script type="text/javascript">
$('input[name="l_expire_type"]').on('change', function() {
console.log($(this).val());
if ($(this).val() == '1') {
$('#l_expire_date').prop('disabled', true);
var today = new Date();
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0);
$('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
$('#l_expire_date_hidden').val($('#l_expire_date').val());
$('#l_expire_date').val('');
// var today = new Date();
// var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1, 0);
// $('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
// $('#l_expire_date_hidden').val($('#l_expire_date').val());
}
else if ($(this).val() == '2') {
$('#l_expire_date').prop('disabled', true);
var today = new Date();
var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1);
$('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
$('#l_expire_date_hidden').val($('#l_expire_date').val());
$('#l_expire_date').val('');
// var today = new Date();
// var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1);
// $('#l_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
// $('#l_expire_date_hidden').val($('#l_expire_date').val());
}
else if ($(this).val() == '3') {
$('#l_expire_date').removeAttr('disabled');
@@ -81,7 +82,7 @@
});
$(document).ready(function () {
//$('input[name="l_expire_type"]:checked').trigger('change');
$('input[name="l_expire_type"]:checked').trigger('change');
$('#l_expire_date_hidden').val($('#l_expire_date').val());
});
</script>

6
template/templates/money_deposit.tpl
View File

@@ -21,9 +21,9 @@
<div id="block_{$mod->get_mod_money_income()->get_mi_date()|substr:0:4}{$mod->get_mod_money_income()->get_mi_date()|substr:5:2}" class="month_block">
{/if}
<a href="/admin/money_deposit/{$mod->get_mod_id()}">
<a href="{if $mod->is_expired()}#{else}/admin/money_deposit/{$mod->get_mod_id()}{/if}">
<div class="list_item">
<table class="money">
<table class="money{if $mod->is_expired()} expired{/if}">
<tr>
<td class="icon">
{if $mod->get_mod_money_income()->get_mi_payment_type_pt_id() == 1}
@@ -33,7 +33,7 @@
{/if}
</td>
<td>
{$mod->get_mod_user_kid()->get_uk_name()}
{$mod->get_mod_user_kid()->get_uk_name()} {if $mod->is_expired()}(Lejárt: {$mod->get_mod_expire_date()}){/if}
</td>
<td class="date">
{$mod->get_mod_money_income()->get_mi_date(true)}

27
template/templates/money_deposit_create.tpl
View File

@@ -50,6 +50,11 @@
<div><input type="text" name="mod_sum" id="mod_sum" required></div>
</div>
<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>
</div>
<div>
<label for="mod_sets_expire_date">Frissítse az egyenleg lejárati dátumát:</label>
<div><input type="checkbox" name="mod_sets_expire_date" id="mod_sets_expire_date" value="1" checked="checked"></div>
@@ -75,10 +80,30 @@
var pdata = JSON.parse(data);
if (null == pdata) {
$('#expire_date').html('Következő hónapban (alapértelmezett beállítás)');
$('#mod_sum').val('');
return;
}
if (null == pdata['l_sum']) {
$('#mod_sum').val('');
}
else {
$('#mod_sum').val(pdata);
$('#mod_sum').val(pdata['l_sum']);
}
if (pdata['l_expire_type'] == '1') {
var today = new Date();
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));
}
else if (pdata['l_expire_type'] == '2') {
var today = new Date();
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));
}
else if (pdata['l_expire_type'] == '3') {
$('#expire_date').html(pdata['l_expire_date']);
}
}
});

11
template/templates/money_deposit_update.tpl
View File

@@ -10,7 +10,7 @@
<div>
<label class="desc" id="title1" for="mod_user_kid_uk_id">Befizető:</label>
<div>
<select name="mod_user_kid_uk_id" id="mod_user_kid_uk_id">
<select name="mod_user_kid_uk_id" id="mod_user_kid_uk_id" disabled>
{foreach $user_kids as $user_kid}
<option value="{$user_kid->get_uk_id()}"{if $user_kid->get_uk_id() == $mod->get_mod_user_kid_uk_id()} selected{/if}>{$user_kid->get_uk_name()}</option>>
{/foreach}
@@ -39,10 +39,10 @@
<div>
<label for="mod_lease_l_id">Bérlettípus:</label>
<div>
<select name="mod_lease_l_id" id="mod_lease_l_id">
<select name="mod_lease_l_id" id="mod_lease_l_id" disabled>
<option value="null">Nincs beállítva</option>
{foreach $lease_array as $lease}
<option value="{$lease->get_l_id()}" {if $lease->get_l_id() == $mod->get_mod_lease_l_id()->get_l_id()}selected{/if}>
<option value="{$lease->get_l_id()}" {if $mod->get_mod_lease_l_id() != null && $lease->get_l_id() == $mod->get_mod_lease_l_id()->get_l_id()}selected{/if}>
{$lease->get_l_name()}
</option>
{/foreach}
@@ -55,6 +55,11 @@
<div><input type="text" name="mod_sum" id="mod_sum" value="{$mod->get_mod_money_income()->get_mi_sum()}" required></div>
</div>
<div>
<label for="mod_sum">Lejár:</label>
<div id="expire_date" style="padding-top: 6px;">{$mod->get_mod_expire_date()}</div>
</div>
<div>
<div>
<input class="button black" type="submit" value="Mentés">

4
template/templates/user_data_edit.tpl
View File

@@ -32,10 +32,10 @@
<div><input type="checkbox" name="uk_balance_expires" id="uk_balance_expires" value="1" {if 1==$user_data.uk_balance_expires}checked{/if}></div>
</div>
<div class="balance_expire_date">
{* <div class="balance_expire_date">
<label for="uk_balance_expire_date">Egyenleg lejárati dátuma (ha üres, akkor automatikusan lejár a legutóbbi befizetéshez képest):</label>
<div><input type="text" name="uk_balance_expire_date" id="uk_balance_expire_date" placeholder="ÉÉÉÉ-HH-NN" value="{$user_data.uk_balance_expire_date}"></div>
</div>
</div> *}
<div>
<label>Egyenleg:</label>

20
template/templates/user_diary.tpl
View File

@@ -13,12 +13,12 @@
</div>
</div>
{if $user->get_uk_balance_expires()}
{if $user->get_uk_balance_expires() && $user->get_uk_balance() > 0}
<div class="list_item line_height14 bigger_space" style="margin-bottom: 20px;">
{if $user->get_uk_balance_expire_date()}
Az egyenleg lejár: <span class="bold">{{$user->get_uk_balance_expire_date()|date_format:"%Y.%m.%d"}}</span>
{elseif $user->get_uk_last_deposit()}
Az egyenleg lejár: <span class="bold">{{$user->get_uk_last_deposit()|date_format:"%Y.%m.%d"}}</span>
Az egyenleg lejár: <span class="bold">{strtotime("+1 month",strtotime($user->get_uk_last_deposit()))|date_format:"%Y.%m.%d"}</span>
{else}
<span class="bold">Kérjük, töltse fel egyenlegét!</span>
{/if}
@@ -140,7 +140,7 @@
{/if}
<div class="row">
<div class="list_item line_height14 bigger_space money_deposit">
<div class="list_item line_height14 bigger_space money_deposit{if $action->get_de_expired()} expired{/if}">
<span class="size20 bold">
{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]}
@@ -150,10 +150,16 @@
befizetés: {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_sum(true)} Ft
</div>
<div class="side_block">
{assign var="discount" value=""}
<span class="bold" style="font-size: 20px;">{if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft</span><br>{$discount}
</div>
{if !$action->get_de_expired()}
<div class="side_block">
{assign var="discount" value=""}
<span class="bold" style="font-size: 20px;">{if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft</span><br>{$discount}
</div>
{else}
<div class="side_block">
<span style="font-size: 20px;">Lejárt: {$action->get_de_money_deposit()->get_mod_expire_date()|date_format:"%Y.%m.%d"}</span>
</div>
{/if}
</div>
{/if}