Add "Pick up" vs "Delivery" for Distributions #1818
Conversation
Pulling from rubyforgood/diaper
scooter-dangle
added
Ruby For Good 2020 Virtual
db/migrate/20200906185544_add_delivery_method_to_distribution.rb
Outdated
Show resolved
Hide resolved
edwinthinks
left a comment
edwinthinks
left a comment
There was a problem hiding this comment.
Hey @daynew -- sorry for the late review. I think this is a great start. I noticed that there are a few other places that we'll want to change before merging in (this can be in another PR into this one).
When you click on the events in the calendar, it brings you to a page that includes pick-up related text. I think we'll need to update the logic on this page.
Apologies, I didn't realize that there was another page that would need to get updated.
db/migrate/20200906185544_add_delivery_method_to_distribution.rb
Outdated
Show resolved
Hide resolved
I have updated the screenshots which address the pages you linked. Let me know if the language is okay. |
albertchae
left a comment
albertchae
left a comment
There was a problem hiding this comment.
LGTM, but will let @edwinthinks make the final call since he reviewed a lot of it before
| <div class="row mb-2"> | ||
| <div class="col-sm-7"> | ||
| <% content_for :title, "Distribution Pick-Ups - #{current_organization.name}" %> | ||
| <% content_for :title, "Distribution Schedule - #{current_organization.name}" %> |
There was a problem hiding this comment.
We should probably rename this file too, but that can be a separate PR
There was a problem hiding this comment.
@albertchae sounds good. Could either of you create the issue to handle that and label it as tech-debt after this has been merged in?
There was a problem hiding this comment.
Finally got around to creating this issue. #1942
|
|
||
| # TODO: This should probably be in the Request resource specs, not Distribution | ||
| context "When creating a distrubition from a request" do | ||
| context "When creating a distribution from a request" do |
Merge with rubyforgood/diaper
…xisting Distributions
daynew
force-pushed
the
issue-1803-add-delivery-option
branch
from
4f8d457 to
a61dbba
Compare
daynew
force-pushed
the
issue-1803-add-delivery-option
branch
from
a61dbba to
f9ecb7f
Compare
edwinthinks
left a comment
edwinthinks
left a comment
There was a problem hiding this comment.
Looks good! There are just a few copy changes I can make:
"Your Distribution Has Changed" to "Your Distribution Date Has Changed"
| <div class="row mb-2"> | ||
| <div class="col-sm-7"> | ||
| <% content_for :title, "Distribution Pick-Ups - #{current_organization.name}" %> | ||
| <% content_for :title, "Distribution Schedule - #{current_organization.name}" %> |
There was a problem hiding this comment.
@albertchae sounds good. Could either of you create the issue to handle that and label it as tech-debt after this has been merged in?
4 participants
Resolves #1803
Description
When a distribution of materials is scheduled, we want to be able to record how the materials will be delivered. Are the materials being picked up at the bank? Is the bank delivering the materials to the partner organization? Distributions will now be marked as either "Delivery" or "Pick up".
delivery_methodcolumn to the Distribution model.Follow up work
Type of change
How Has This Been Tested?
Screenshots
/diaper_bank/distributions
/diaper_bank/distributions/22
/diaper_bank/distributions/22/edit
/diaper_bank/distributions/pick_ups
/diaper_bank/distributions/pickup_day?filters[during]=2020-09-10