big changes

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

View File

@@ -78,7 +78,7 @@ if ($this->is_id()) {
FROM
user_kid
LEFT JOIN
money_deposit ON mod_user_kid_uk_id = uk_id
money_deposit ON mod_user_kid_uk_id = uk_id AND mod_expire_date > now() AND mod_deleted = 0
LEFT JOIN
lease ON l_id = mod_lease_l_id
LEFT JOIN
@@ -87,6 +87,7 @@ if ($this->is_id()) {
uk_deleted = 0 AND uk_is_active = 1
AND ((uk_lease = 1 AND mod_id IS NOT NULL)
OR (uk_lease = 0 AND mod_lease_l_id IS NULL))
GROUP BY uk_id
ORDER BY uk_name;
";
$rest_user_assoc_array = $sql->assoc_array($rest_user_query);