Overview
Comment:Fix error message when trying to add a duplicate service for user
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: 787bae113c15edabcc9f71f7dd96cde45bdf0e64
User & Date: bohwaz on 2020-12-05 11:20:15
Other Links: branch diff | manifest | tags
Context
2020-12-05
13:19
Allow opening balance from non-existent year check-in: a9c0870ccc user: bohwaz tags: dev
11:20
Fix error message when trying to add a duplicate service for user check-in: 787bae113c user: bohwaz tags: dev
11:14
Fix issues in user export when list is empty, and fix CSV export when iterator is empty check-in: 586553935d user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Entities/Services/Service_User.php from [6dbdf76a1e] to [d694479106].

34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
	];

	protected $_service, $_fee;

	public function selfCheck(): void
	{
		$this->paid = (bool) $this->paid;
		$this->assert(!DB::getInstance()->test(self::TABLE, 'id_user = ? AND id_service = ? AND date = ? AND id != ?', $this->id_user, $this->id_service, $this->date->format('Y-m-d'), $this->id), 'Cette activité a déjà été enregistrée pour ce membre et ce jour');
	}

	public function importForm(?array $source = null)
	{
		if (null === $source) {
			$source = $_POST;
		}







|







34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
	];

	protected $_service, $_fee;

	public function selfCheck(): void
	{
		$this->paid = (bool) $this->paid;
		$this->assert(!$this->exists() && !DB::getInstance()->test(self::TABLE, 'id_user = ? AND id_service = ? AND date = ?', $this->id_user, $this->id_service, $this->date->format('Y-m-d')), 'Cette activité a déjà été enregistrée pour ce membre et cette date');
	}

	public function importForm(?array $source = null)
	{
		if (null === $source) {
			$source = $_POST;
		}