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

[Merton] Initial bulky waste functionality #4924

Open
wants to merge 2 commits into
base: merton-ww-initial
Choose a base branch
from

Conversation

dracos
Copy link
Member

@dracos dracos commented Apr 17, 2024

Starts off by renaming the various payment Roles, moving those with no relevance to FixMyStreet under Integrations/Roles directly, and moving the cobrand-based payment roles under FixMyStreet/Roles/Cobrand/. Then adds a new payment integration provider (operates very similarly to the existing SCP one). Then adds the basic bulky waste code for Merton.

For https://github.com/mysociety/societyworks/issues/4270 [skip changelog]

Copy link

codecov bot commented Apr 17, 2024

Codecov Report

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

Project coverage is 82.63%. Comparing base (0c9bf34) to head (f33bc9b).

Files Patch % Lines
perllib/FixMyStreet/Roles/Cobrand/Adelante.pm 68.51% 8 Missing and 9 partials ⚠️
perllib/Integrations/Adelante.pm 90.24% 1 Missing and 3 partials ⚠️
perllib/FixMyStreet/Cobrand/Merton/Waste.pm 90.90% 0 Missing and 1 partial ⚠️
perllib/FixMyStreet/Roles/Cobrand/Echo.pm 80.00% 0 Missing and 1 partial ⚠️
perllib/FixMyStreet/Roles/Cobrand/SLWP.pm 98.57% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@                  Coverage Diff                  @@
##           merton-ww-initial    #4924      +/-   ##
=====================================================
- Coverage              82.64%   82.63%   -0.01%     
=====================================================
  Files                    397      399       +2     
  Lines                  30799    30895      +96     
  Branches                4861     4873      +12     
=====================================================
+ Hits                   25453    25530      +77     
- Misses                  3896     3904       +8     
- Partials                1450     1461      +11     

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

Copy link
Member

@chrismytton chrismytton left a comment

Choose a reason for hiding this comment

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

Code looks good! Couple of comments but they are purely cosmetic 🙂


use_ok 'Integrations::Adelante';

my %sent;
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't seem to be used anywhere, is it still needed?

Comment on lines +742 to +758
wasteworks_config => {
base_price => '6075',
band1_price => '3700',
band1_max => 3,
items_per_collection_max => 6,
per_item_costs => 0,
show_location_page => 'users',
item_list => [
{ bartec_id => '83', name => 'Bath' },
{ bartec_id => '84', name => 'Bathroom Cabinet /Shower Screen' },
{ bartec_id => '85', name => 'Bicycle' },
{ bartec_id => '3', name => 'BBQ' },
{ bartec_id => '6', name => 'Bookcase, Shelving Unit' },
],
},
);
$body->update;
Copy link
Member

Choose a reason for hiding this comment

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

Indentation has gone slightly awry here.

@chrismytton

This comment was marked as outdated.

@MorayMySoc

This comment was marked as outdated.

@chrismytton

This comment was marked as outdated.

@MorayMySoc

This comment was marked as outdated.

@chrismytton chrismytton removed their request for review May 14, 2024 09:07
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.

None yet

3 participants