Overview
Comment:Fix [1e6f556480cd56c987e2a17bdde968c0e54ac5ea] paid amount didn't include the decimal point
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: 822638372b4296a92d981164db4e9cc110b193910694cf729ad90f8370c37a0d
User & Date: bohwaz on 2021-09-14 22:49:03
Other Links: manifest | tags
Context
2021-09-15
09:53
Fix quota left when used space is larger than available quota check-in: 6a458d25de user: bohwaz tags: trunk, stable
2021-09-14
22:49
Fix [1e6f556480cd56c987e2a17bdde968c0e54ac5ea] paid amount didn't include the decimal point check-in: 822638372b user: bohwaz tags: trunk, stable
22:41
Fix [5d0f7e9c9b42206046988b61a7deba6f8036d5d4] don't throw an error when a field doesn't exist anymore, just ignore it check-in: 937de7a7cc user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Entities/Services/Fee.php from [0f3df37a82] to [7491493b33].

166
167
168
169
170
171
172





173
174
175
176
177
178
179
		$conditions = sprintf('su.id_fee = %d AND su.paid = 1 AND (su.expiry_date >= date() OR su.expiry_date IS NULL)
			AND m.id_category NOT IN (SELECT id FROM users_categories WHERE hidden = 1)', $this->id());

		$list = new DynamicList($columns, $tables, $conditions);
		$list->groupBy('su.id_user');
		$list->orderBy('date', true);
		$list->setCount('COUNT(DISTINCT su.id_user)');





		return $list;
	}

	public function unpaidUsersList(): DynamicList
	{
		$list = $this->paidUsersList();
		$conditions = sprintf('su.id_fee = %d AND su.paid = 0 AND m.id_category NOT IN (SELECT id FROM users_categories WHERE hidden = 1)', $this->id());







>
>
>
>
>







166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
		$conditions = sprintf('su.id_fee = %d AND su.paid = 1 AND (su.expiry_date >= date() OR su.expiry_date IS NULL)
			AND m.id_category NOT IN (SELECT id FROM users_categories WHERE hidden = 1)', $this->id());

		$list = new DynamicList($columns, $tables, $conditions);
		$list->groupBy('su.id_user');
		$list->orderBy('date', true);
		$list->setCount('COUNT(DISTINCT su.id_user)');

		$list->setExportCallback(function (&$row) {
			$row->paid_amount = $row->paid_amount ? Utils::money_format($row->paid_amount, '.', '', false) : null;
		});

		return $list;
	}

	public function unpaidUsersList(): DynamicList
	{
		$list = $this->paidUsersList();
		$conditions = sprintf('su.id_fee = %d AND su.paid = 0 AND m.id_category NOT IN (SELECT id FROM users_categories WHERE hidden = 1)', $this->id());