Overview
Comment:Make it clear that you cannot know what is left to pay when accounting is disabled
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA3-256: c63582a8197f78bfc3206316a94f337f8c18551b7e3e16bbc33bf0942e076946
User & Date: bohwaz on 2023-05-16 12:28:09
Other Links: branch diff | manifest | tags
Context
2023-05-16
13:27
Spell out number: don't include decimals if it's zero check-in: 8b4975e5d6 user: bohwaz tags: dev
12:28
Make it clear that you cannot know what is left to pay when accounting is disabled check-in: c63582a819 user: bohwaz tags: dev
2023-05-15
17:34
UserTemplate: provide configuration for user fields by default check-in: b50954e2e7 user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Entities/Services/Fee.php from [550e36a6a6] to [50d2be14e4].

153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
			'paid' => [
				'label' => 'Payé ?',
				'select' => 'su.paid',
				'order' => 'su.paid %s, su.date %1$s',
			],
			'paid_amount' => [
				'label' => 'Montant payé',
				'select' => 'SUM(l.credit)',
			],
			'date' => [
				'label' => 'Date',
				'select' => 'su.date',
			],
		];








|







153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
			'paid' => [
				'label' => 'Payé ?',
				'select' => 'su.paid',
				'order' => 'su.paid %s, su.date %1$s',
			],
			'paid_amount' => [
				'label' => 'Montant payé',
				'select' => 'CASE WHEN tu.id_service_user IS NOT NULL THEN SUM(l.credit) ELSE NULL END',
			],
			'date' => [
				'label' => 'Date',
				'select' => 'su.date',
			],
		];

Modified src/templates/services/fees/details.tpl from [0e5953fbc6] to [0dfeccf52f].

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
	{foreach from=$list->iterate() item="row"}
		<tr>
			{if $can_action}
			<td class="check">{input type="checkbox" name="selected[]" value=$row.id_user}</td>
			{/if}
			<th>{link href="!users/details.php?id=%d"|args:$row.id_user label=$row.identity}</th>
			<td>{if $row.paid}<b class="confirm">Oui</b>{else}<b class="error">Non</b>{/if}</td>
			<td class="money">{$row.paid_amount|raw|money_currency}</td>
			<td>{$row.date|date_short}</td>
			<td class="actions">
				{linkbutton shape="user" label="Toutes les activités de ce membre" href="!services/user/?id=%d"|args:$row.id_user}
				{linkbutton shape="alert" label="Rappels envoyés" href="!services/reminders/user.php?id=%d"|args:$row.id_user}
			</td>
		</tr>
	{/foreach}







|







26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
	{foreach from=$list->iterate() item="row"}
		<tr>
			{if $can_action}
			<td class="check">{input type="checkbox" name="selected[]" value=$row.id_user}</td>
			{/if}
			<th>{link href="!users/details.php?id=%d"|args:$row.id_user label=$row.identity}</th>
			<td>{if $row.paid}<b class="confirm">Oui</b>{else}<b class="error">Non</b>{/if}</td>
			<td class="money">{if null === $row.paid_amount}{icon shape="delete" title="Aucune écriture n'est liée à cette inscription"}{else}{$row.paid_amount|raw|money_currency}{/if}</td>
			<td>{$row.date|date_short}</td>
			<td class="actions">
				{linkbutton shape="user" label="Toutes les activités de ce membre" href="!services/user/?id=%d"|args:$row.id_user}
				{linkbutton shape="alert" label="Rappels envoyés" href="!services/reminders/user.php?id=%d"|args:$row.id_user}
			</td>
		</tr>
	{/foreach}
48
49
50
51
52
53
54




55
56
57
</table>

{if $can_action}
</form>
{/if}

{$list->getHTMLPagination()|raw}






{include file="_foot.tpl"}







>
>
>
>



48
49
50
51
52
53
54
55
56
57
58
59
60
61
</table>

{if $can_action}
</form>
{/if}

{$list->getHTMLPagination()|raw}

<p class="help">
	Les lignes indiquant {icon shape="delete" title="Aucune écriture n'est liée à cette inscription"} comme montant payé signifient qu'aucune écriture comptable n'a été associée à cette inscription. De ce fait, le montant restant à payer ne peut être calculé.
</p>


{include file="_foot.tpl"}