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.

Sign up for GitHub

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

Jump to bottom

Feature/pbrh+ 45 confirm returned item #203

Merged
merged 10 commits into from
Jan 4, 2023
Merged

Feature/pbrh+ 45 confirm returned item #203

merged 10 commits into from
Jan 4, 2023

Conversation

olschulz
Copy link
Collaborator

@olschulz olschulz commented Jan 3, 2023 •
edited
Loading

Fixes #45

Description (what might a PO or reviewer want to know?)

  • Notify the lender upon accepting or declining the item return
  • remove the item from the system upon declining the item return

PR checklist

  • dev-branch has been merged into local branch to resolve conflicts
  • tests and linter have passed AFTER local merge
  • localization is supported (Guide)
  • another dev reviewed and approved
  • if feature-Branch: Teams PO has approved (show via e.g. screenshots/screencapture/live demo)

@tkv29
Copy link
Collaborator

tkv29 commented Jan 4, 2023

error appears when you decline a return while another person is on the waitlist

@tkv29 tkv29 self-requested a review January 4, 2023 22:55
tkv29
tkv29 approved these changes Jan 4, 2023
View reviewed changes
Copy link
Collaborator

@tkv29 tkv29 left a comment

Choose a reason for hiding this comment

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

lgtm

@tkv29 tkv29 merged commit c0c9ebe into dev Jan 4, 2023
@olschulz olschulz deleted the feature/pbrh+-45-confirm-returned-item branch January 5, 2023 10:10
antonneubauer pushed a commit that referenced this pull request Jan 6, 2023
@olschulz @antonneubauer
Feature/pbrh+ 45 confirm returned item (#203)
d42253f 
* write tests and hate ruby on rails

* fix factory bots

* fucking errors

* fix last tests and add more locale translations

* rubocop

* fix crash when another user is on waitlist

* fix waitlist notifications not being shown correctly

Co-authored-by: Julian <julian@DESKTOP-I3NQ0TP>
antonneubauer added a commit that referenced this pull request Jan 6, 2023
@antonneubauer
Revert "Feature/pbrh+ 45 confirm returned item (#203)"
3836499 
This reverts commit d42253f.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkv29 tkv29 tkv29 approved these changes

@jannikhuschka jannikhuschka Awaiting requested review from jannikhuschka

@MariusDoe MariusDoe Awaiting requested review from MariusDoe

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Confirm Returned Item
2 participants
@olschulz @tkv29