Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 881
Titeladded new other message if ! superadmin, Your customer account was cancelled on :date...
Beschreibung
Statusmerged
Created at 2023-09-13T11:49:00.664Z
Updated at 2023-09-25T14:08:35.532Z
Source branchfeature/LL-1625-text-adjustment-info-in-subscription-cancellation
Target branchdevelop
AuthorMarkus Gerlach
AssigneeGregor Gabriel

Discussion notes

assigned to @gabrielg Sascha Immig 2023-09-18T07:58:15.999Z
falsche Prüfung: es ist `if (auth()->user()->client)` zu wählen, da hier der Client-Kontext wichtig ist Gregor Gabriel 2023-09-20T07:17:01.919Z
Generell heißt es im Ticket: > **Bitte diese Meldung auch im Katalog (Übersicht und Trainings-Detailseite) für Kunden-Nutzer anzeigen. ** Der Test wurde aber nur im Client-Controller geändert Gregor Gabriel 2023-09-20T07:19:35.740Z
changed this line in version 2 of the diff Markus Gerlach 2023-09-20T10:34:40.778Z
added 1 commit
  • 5f9aefa0 - update if for client user cancelled_at message
Compare with previous version
Markus Gerlach 2023-09-20T10:34:41.855Z
added 1 commit
  • 2c3fc4b8 - training courses and presence also receive messages
Compare with previous version
Markus Gerlach 2023-09-20T15:15:07.612Z
Bitte sauberes Englisch: ("... now still ..." ist nicht korrekt.) `'Your customer account was cancelled on :date. You can still archive your data and export the reports to store them for your records. Bookings of trainings is no longer possible.',` Sascha Immig 2023-09-22T07:23:22.326Z
Bitte den 6x verwendeten Code in ein Template packen und das dann 6x include Gregor Gabriel 2023-09-22T10:04:27.476Z
added 1 commit
  • d05dabf5 - Message packed into a template and then added via include
Compare with previous version
Markus Gerlach 2023-09-22T10:42:27.644Z
bitte `@include('includes.client_cancelled_message')` verwenden Gregor Gabriel 2023-09-25T09:03:16.836Z
bitte `@include('includes.client_cancelled_message')` verwenden Gregor Gabriel 2023-09-25T09:03:39.203Z
bitte `@include('includes.client_cancelled_message')` verwenden Gregor Gabriel 2023-09-25T09:04:13.667Z
bitte `@include('includes.client_cancelled_message')` verwenden Gregor Gabriel 2023-09-25T09:04:41.751Z
bitte `@include('includes.client_cancelled_message')` verwenden Gregor Gabriel 2023-09-25T09:05:16.422Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:50.960Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:51.174Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:51.306Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:51.450Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:51.598Z
changed this line in version 5 of the diff Markus Gerlach 2023-09-25T10:18:51.864Z
resolved all discussions Markus Gerlach 2023-09-25T10:18:51.965Z
added 1 commit
  • ea55be89 - update english message translation, include template instead of full code
Compare with previous version
Markus Gerlach 2023-09-25T10:18:52.989Z
Hier fehlt noch eine Sache. Wenn `auth()->user()->client->cancelled_at->gt(now)` gilt, dann ist die Kündigung noch nicht wirksam und der User sollte einen anderen Text präsentiert bekommen: z.B.: `'Your customer account is considered deleted from the :date. When this date is reached, you can still archive user data and export reports to save them for your records. Training bookings are no longer possible.'` Gregor Gabriel 2023-09-25T10:31:04.354Z
Sascha reicht hier ein allgemeiner Text - also alles ok Gregor Gabriel 2023-09-25T10:53:32.965Z
resolved all discussions Gregor Gabriel 2023-09-25T10:53:41.176Z
changed this line in version 6 of the diff Markus Gerlach 2023-09-25T11:13:53.567Z
resolved all discussions Markus Gerlach 2023-09-25T11:13:53.728Z
added 1 commit
  • fb35615e - added message if cancelled_at->gt(now)
Compare with previous version
Markus Gerlach 2023-09-25T11:13:54.247Z
merged Gregor Gabriel 2023-09-25T14:08:35.882Z

Merge Commits

Title Id Author Created at Message
added new other message if ! superadmin, Your customer account was cancelled on :date... 1ccdd152421e0fb10265e3dc44f2e9c2761f5af5 gerlachm 2023-09-13T10:53:33.000Z added new other message if ! superadmin, Your customer account was cancelled on :date...
training courses and presence also receive messages 2c3fc4b88ea2c38ccf4067d94adf62536e2e01db gerlachm 2023-09-20T15:15:03.000Z training courses and presence also receive messages
update if for client user cancelled_at message 5f9aefa0bcf93a87762b2ccc52f66f4df1340866 gerlachm 2023-09-20T10:34:37.000Z update if for client user cancelled_at message added message to catalog, group, organization and training booking site
Message packed into a template and then added via include d05dabf5ed7ccbfa0dc31d09142c312220a8ee53 gerlachm 2023-09-22T10:42:22.000Z Message packed into a template and then added via include
update english message translation, include template instead of full code ea55be89ebe1e626f29738d5dd11a8d67c4db25f gerlachm 2023-09-25T10:18:46.000Z update english message translation, include template instead of full code
added message if cancelled_at->gt(now) fb35615eb6362b762dc603c2e364b5fd4112ec38 gerlachm 2023-09-25T11:13:46.000Z added message if cancelled_at->gt(now)