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

Partners with both service areas and addresses appear on individual partner page but not on index page #1385

Merged
merged 5 commits into from
Jul 19, 2022
Merged

Partners with both service areas and addresses appear on individual partner page but not on index page #1385

merged 5 commits into from
Jul 19, 2022

Conversation

ivankocienski
Copy link
Contributor

@ivankocienski ivankocienski commented Jul 18, 2022 •
edited by huly-for-github bot
Loading

Fixes #1346

  • On Partners index page: only show partners that have physical addresses (filter out Partners with any service areas)
  • On Partners show page: show all markers from physical addresses and service areas

@ivankocienski ivankocienski requested a review from kimadactyl July 18, 2022 11:08
@kimadactyl
Copy link
Member

Test failing but otherwise looks good

@kimadactyl
Copy link
Member

Ah actually can you just check that both acceptance criteria are done please? I'm not sure the index page one is done.

@ivankocienski
Filter for partners with no service areas
0fb10e4 
Refactored get_map_markers to be more readable and it also supports
Events directly.

Tests covering get_map_markers helper method
@ivankocienski
Tidy up of code
2f11c60 
Removed get_map_markers_from_events.
Removed some dead code from MapMarkerConcern
@ivankocienski ivankocienski requested a review from kimadactyl July 18, 2022 16:36
@kimadactyl kimadactyl merged commit 50b40d4 into main Jul 19, 2022
@kimadactyl kimadactyl deleted the ik-1346-partner-map-with-service-areas branch July 19, 2022 08:57
@kimadactyl kimadactyl changed the title Partners with service areas appear on maps Partners with both service areas and addresses appear on individual partner page but not on index page Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kimadactyl kimadactyl Awaiting requested review from kimadactyl

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

Successfully merging this pull request may close these issues.

Show maps on partners with addresses and service areas
2 participants
@ivankocienski @kimadactyl