Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

481 Add confirmation checkbox before giving solidarity shifts #482

Conversation

alexusfied
Copy link
Contributor

Confirmation checkbox for giving solidarity shifts added. Also, one solidarity status added, when a users balance is not negative (i.e. they cannot use a solidarity shift)

…ne Solidarity Status added, when a users balance is not negative (i.e. they cannot use a solidarity shift)
@@ -157,6 +174,11 @@
{% blocktranslate with used_solidarity_shifts_current_year=used_solidarity_shifts_current_year %}
<p>There are Solidarity Shifts available for you to use. You used {{ used_solidarity_shifts_current_year }} out of 2 Solidarity Shifts this year</p>
{% endblocktranslate %}
{% elif used_solidarity_shifts_current_year < 2 and user.shift_user_data.get_available_solidarity_shifts and user.shift_user_data.get_account_balance <= 0 %}
{% blocktranslate %}
<p>You cannot receive a Solidarity Shift at the moment</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to add explanation to the user why they cannot receive it?
Plus also the translation is missing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also thought about that. Maybe we could use a tooltip (https://getbootstrap.com/docs/5.3/components/tooltips/#custom-tooltips) that shows some more info when a user hovers over the text?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
{% translate 'One of your banked shifts will be donated as a solidarity shift. Do you want to continue?' %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a German translation of this text?

@alexusfied alexusfied merged commit 6036c3b into SuperCoopBerlin:master Mar 7, 2024
4 checks passed
@alexusfied alexusfied deleted the 481-add-confirmation-checkbox-giving-solidarity branch March 7, 2024 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants