Overview
Comment:Humm listGroupedWithFees is actually expecting an int now, that's why it was changed that way, so let's make it clearer, and stick to a boolean for the form
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: 15f737c9844268ea75b0a3a33fcbe82b3fe1f03dde21841aaea32eaf5f73ab6e
User & Date: bohwaz on 2023-02-04 00:35:32
Other Links: manifest | tags
Context
2023-02-06
22:22
Pre-select CSV column if label matches as well check-in: 80fda314c3 user: bohwaz tags: trunk, stable
2023-02-04
00:35
Humm listGroupedWithFees is actually expecting an int now, that's why it was changed that way, so let's make it clearer, and stick to a boolean for the form check-in: 15f737c984 user: bohwaz tags: trunk, stable
2023-02-03
11:41
Disable assertions in Windows build check-in: 1c6718a683 user: bohwaz tags: trunk
Changes

Modified src/www/admin/services/user/_form.php from [d1a85482e5] to [b8dd314a46].

8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

if (!defined('\Garradin\ROOT')) {
	die();
}

assert(isset($tpl, $form_url, $create));

$current_only = (bool) f('past_services');

// If there is only one user selected we can calculate the amount
$single_user_id = isset($users) && count($users) == 1 ? key($users) : null;
$copy_service ??= null;
$copy_service_only_paid ??= null;
$users ??= null;

$grouped_services = Services::listGroupedWithFees($single_user_id, $current_only);

if (!count($grouped_services)) {
	$current_only = false;
	$grouped_services = Services::listGroupedWithFees($single_user_id, $current_only);
}

if (!isset($count_all)) {
	$count_all = Services::count();
}

$has_past_services = count($grouped_services) != $count_all;







|







|



|







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

if (!defined('\Garradin\ROOT')) {
	die();
}

assert(isset($tpl, $form_url, $create));

$current_only = !f('past_services');

// If there is only one user selected we can calculate the amount
$single_user_id = isset($users) && count($users) == 1 ? key($users) : null;
$copy_service ??= null;
$copy_service_only_paid ??= null;
$users ??= null;

$grouped_services = Services::listGroupedWithFees($single_user_id, (int)$current_only);

if (!count($grouped_services)) {
	$current_only = false;
	$grouped_services = Services::listGroupedWithFees($single_user_id, (int)$current_only);
}

if (!isset($count_all)) {
	$count_all = Services::count();
}

$has_past_services = count($grouped_services) != $count_all;