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

[Kingston] Container work #4892

Merged
merged 10 commits into from May 8, 2024
Merged

[Kingston] Container work #4892

merged 10 commits into from May 8, 2024

Conversation

dracos
Copy link
Member

@dracos dracos commented Mar 21, 2024

For https://github.com/mysociety/societyworks/issues/4199 (newly updated)
[skip changelog]

@dracos dracos changed the title [Kingston] [Kingston] Container work Mar 21, 2024
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

Attention: Patch coverage is 91.76030% with 22 lines in your changes are missing coverage. Please review.

Project coverage is 82.59%. Comparing base (4afb9b8) to head (4c4efdd).

Files Patch % Lines
perllib/FixMyStreet/Cobrand/Sutton.pm 88.00% 7 Missing and 2 partials ⚠️
perllib/FixMyStreet/Cobrand/Kingston.pm 94.73% 4 Missing and 4 partials ⚠️
perllib/FixMyStreet/Roles/CobrandSLWP.pm 83.33% 4 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4892      +/-   ##
==========================================
+ Coverage   82.56%   82.59%   +0.03%     
==========================================
  Files         392      392              
  Lines       30517    30647     +130     
  Branches     4819     4845      +26     
==========================================
+ Hits        25196    25313     +117     
- Misses       3882     3892      +10     
- Partials     1439     1442       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dracos dracos requested a review from davea March 22, 2024 09:14
@dracos dracos force-pushed the sutton-capita-payment branch 2 times, most recently from 7a793e6 to 6cc4a9c Compare March 22, 2024 11:56
@dracos dracos force-pushed the kingston-replacement-payment branch from d53bea1 to f96a234 Compare March 22, 2024 13:01
@dracos dracos changed the base branch from sutton-capita-payment to sutton-container-change-size March 25, 2024 08:43
perllib/FixMyStreet/Cobrand/Kingston.pm Outdated Show resolved Hide resolved
@dracos dracos force-pushed the kingston-replacement-payment branch from f96a234 to 9c54ea5 Compare March 28, 2024 16:16
@dracos dracos changed the base branch from sutton-container-change-size to sutton-capita-payment March 28, 2024 16:17
@dracos dracos force-pushed the kingston-replacement-payment branch from 9c54ea5 to 6fa876a Compare April 7, 2024 21:26
@dracos dracos force-pushed the kingston-replacement-payment branch from 6fa876a to 47bdef4 Compare April 8, 2024 11:04
@dracos dracos force-pushed the kingston-replacement-payment branch from 47bdef4 to c217117 Compare April 10, 2024 13:26
@dracos dracos force-pushed the kingston-replacement-payment branch 2 times, most recently from 5c33293 to 835690c Compare April 16, 2024 13:45
@dracos dracos changed the base branch from sutton-capita-payment to master April 25, 2024 12:29
@dracos dracos force-pushed the kingston-replacement-payment branch from 835690c to 2aaea7c Compare April 29, 2024 13:34
@dracos dracos requested a review from davea April 29, 2024 13:34
@dracos
Copy link
Member Author

dracos commented Apr 29, 2024

Hi @davea, Parts of this you've already looked at, but has been rejigged due to changes in requirements (see updated issue). I've tried to make this most straightforward to implement by first stripping out all the extra bits that would no longer be needed (so just removals there), then add payments and how-many-live there (you've already reviewed those), then multiple bins (which you had reviewed, but now is for replacements as well as new as the damaged/missing is gone), then lastly the new change capacity (which is similar to the Sutton but done differently due to the extra questions/flow). Shout if you have any questions.

@dracos dracos force-pushed the kingston-replacement-payment branch from 2aaea7c to 7fbcb7d Compare April 30, 2024 11:47
Copy link
Member

@davea davea left a comment

Choose a reason for hiding this comment

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

Looks good!

templates/web/kingston/waste/biggest_bin_allowed.html Outdated Show resolved Hide resolved
@dracos dracos force-pushed the kingston-replacement-payment branch 2 times, most recently from fa1530e to 9e410b6 Compare May 2, 2024 20:29
dracos added 4 commits May 7, 2024 22:36
This could happen if someone picks a quantity but then changes their
mind and unticks the box. Nothing uses the quantity without checking
the container first.
Leaving only a sole-container replacement form, that always treats bin
as Deliver/Missing.
@dracos dracos force-pushed the kingston-replacement-payment branch from 64b6812 to 95d15ca Compare May 7, 2024 21:45
dracos added 5 commits May 8, 2024 07:36
The bin being requested depends upon the answer.
This adds a removals page where people can say how many bins they want
removing also; it then uses this information to work out what needs
sending to the backend.
@dracos dracos force-pushed the kingston-replacement-payment branch from 95d15ca to 4c4efdd Compare May 8, 2024 06:37
@dracos dracos merged commit 4c4efdd into master May 8, 2024
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants