Order Cycle Management Reports

[lin-d-hop]

Added a few things in this PR, expanding out the Order Cycle management Report section:

1. For the payment methods report I added a Balance field using the User Balance Calculator
2. I added a second report of delivery methods. This report is not yet complete, waiting on a field for frozen/chilled items.

How do I stop the merge commits (see below) from showing up on every PR? Do I actually have to cherry-pick each pull request? Seems a cumbersome way to handle this.

[lin-d-hop]

ok @pmackay told me i need to rebase after a fetch upstream. So hopefully that answers the last question. In the meantime do I need to cherry-pick out those commits into a new branch? :-/

[RohanM]

Rebasing would solve this problem. The workflow you could use might be something like this:

# Code code code
$ git fetch upstream
$ git rebase upstream/master

# Ready to create a PR
$ git push origin my-branch

# From here on, don't rebase or merge in upstream

Once you've pushed your branch to a remote server, it's bad juju to rebase it, since rebasing rewrites the history of commits, and it's very messy to reconcile them. At that point, when developing a PR, I think the best way to go is to stay on that version of master, and allow whoever's merging the PR to deal with the merge.

[RohanM]

In the meantime, probably the best way is to cherry-pick into a new branch and open a new PR.

[RohanM]

This method is getting really long. That makes it harder to scan, and it's a code smell that suggests that it's time to break it up into component parts. I'd consider extracting two methods, payment_method_row(order) and delivery_row(order). Then this method can be shortened to something like:

if is_payment_methods?
  orders.map { |o| payment_method_row o }
else
  orders.map { |o| delivery_row o }
end

[lin-d-hop]

Replaced by #317