Overview
Comment:Add date choice to payment form, as requested by @Pierrick
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: e6ea5d218d76caafe6be00123ecdb70069359f5c3f88e9a33b0689ba1ac3e802
User & Date: bohwaz on 2021-07-24 15:25:41
Other Links: manifest | tags
Context
2021-07-24
15:30
Fix stale links, thanks @isabelle check-in: d6c5da0f3d user: bohwaz tags: trunk, stable
15:25
Add date choice to payment form, as requested by @Pierrick check-in: e6ea5d218d user: bohwaz tags: trunk, stable
15:03
Fix LIKE handling to be correct for "begins with" and "ends with" LIKEs, see [28fc79a800036f41] check-in: e214118d85 user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Entities/Services/Service_User.php from [9cb86069a3] to [10de17a459].

111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
		if ($this->fee()->label != $label) {
			$label .= ' - ' . $this->fee()->label;
		}

		$label .= sprintf(' (%s)', (new Membres)->getNom($this->id_user));

		$source['label'] = $label;
		$source['date'] = $this->date->format('d/m/Y');

		$transaction->importFromNewForm($source);
		$transaction->save();
		$transaction->linkToUser($this->id_user, $this->id());

		return $transaction;
	}







<







111
112
113
114
115
116
117

118
119
120
121
122
123
124
		if ($this->fee()->label != $label) {
			$label .= ' - ' . $this->fee()->label;
		}

		$label .= sprintf(' (%s)', (new Membres)->getNom($this->id_user));

		$source['label'] = $label;


		$transaction->importFromNewForm($source);
		$transaction->save();
		$transaction->linkToUser($this->id_user, $this->id());

		return $transaction;
	}

Modified src/templates/services/payment.tpl from [10d2082879] to [1089910a46].

8
9
10
11
12
13
14

15
16
17
18
19
20
21
		<legend>Enregistrer un règlement</legend>

		<dl>
			<dt>Membre sélectionné</dt>
			<dd><h3>{$user_name}</h3></dd>
			<dt><strong>Inscription</strong></dt>
			{input type="checkbox" name="paid" value="1" default=$su.paid label="Marquer cette inscription comme payée"}

			{input type="money" name="amount" label="Montant réglé par le membre" required=1}
			{input type="list" target="acc/charts/accounts/selector.php?targets=%s"|args:$account_targets name="account" label="Compte de règlement" required=1}
			{input type="text" name="reference" label="Numéro de pièce comptable" help="Numéro de facture, de note de frais, etc."}
			{input type="text" name="payment_reference" label="Référence de paiement" help="Numéro de chèque, numéro de transaction CB, etc."}
		</dl>
	</fieldset>








>







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
		<legend>Enregistrer un règlement</legend>

		<dl>
			<dt>Membre sélectionné</dt>
			<dd><h3>{$user_name}</h3></dd>
			<dt><strong>Inscription</strong></dt>
			{input type="checkbox" name="paid" value="1" default=$su.paid label="Marquer cette inscription comme payée"}
			{input type="date" name="date" label="Date" required=1 source=$su}
			{input type="money" name="amount" label="Montant réglé par le membre" required=1}
			{input type="list" target="acc/charts/accounts/selector.php?targets=%s"|args:$account_targets name="account" label="Compte de règlement" required=1}
			{input type="text" name="reference" label="Numéro de pièce comptable" help="Numéro de facture, de note de frais, etc."}
			{input type="text" name="payment_reference" label="Référence de paiement" help="Numéro de chèque, numéro de transaction CB, etc."}
		</dl>
	</fieldset>