Overview
Comment:Order fees by cost, then label
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: 77c3e9fa9b48acb35f80296e18369e795bae317b
User & Date: bohwaz on 2020-12-03 22:39:14
Other Links: branch diff | manifest | tags
Context
2020-12-03
23:28
Improve account selector: use keyboard up/down to select an account, only load typed accounts if checkbox is checked check-in: 83b76b9b29 user: bohwaz tags: dev
22:39
Order fees by cost, then label check-in: 77c3e9fa9b user: bohwaz tags: dev
00:36
Install welcome plugin if it exists check-in: 46bc707429 user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Services/Fees.php from [6282a643d2] to [40efe50c3b].

59
60
61
62
63
64
65
66
67
68
		$db = DB::getInstance();
		return $db->get('SELECT f.*,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND expiry_date >= date() AND paid = 1) AS nb_users_ok,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND expiry_date < date()) AS nb_users_expired,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND paid = 0) AS nb_users_unpaid
			FROM services_fees f
			WHERE id_service = ?
			ORDER BY transliterate_to_ascii(label) COLLATE NOCASE;', $this->service_id);
	}
}







|


59
60
61
62
63
64
65
66
67
68
		$db = DB::getInstance();
		return $db->get('SELECT f.*,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND expiry_date >= date() AND paid = 1) AS nb_users_ok,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND expiry_date < date()) AS nb_users_expired,
			(SELECT COUNT(DISTINCT id_user) FROM services_users WHERE id_fee = f.id AND paid = 0) AS nb_users_unpaid
			FROM services_fees f
			WHERE id_service = ?
			ORDER BY amount, transliterate_to_ascii(label) COLLATE NOCASE;', $this->service_id);
	}
}