-
Notifications
You must be signed in to change notification settings - Fork 3
Foodcoop adaptations
This fork of Foodsoft has quite some differences with upstream. This page is here to describe them, and track progress. There is another page for Deployment notes.
We'd like to merge these changes into upstream, progress is tracked at #163, which is more or less the successor to this page.
Non-exhaustive list of changes:
- New plugins in
lib/foodsoft_
- Rigorous user-interface changes
- Custom navigation bar, hidden for non-admin tasks
- Signup functionality (in addition to invitation), with automatic creation of ordergroup (feature/plugin_signup)
- Allow to edit ordergroup in user form (feature/edit_ordergroup_with_user)
- Admins can send invitations to multiple members at once (feature/bulk_invite)
- Expansion of some variables in footer and configurable texts
- Margin can be configured per group (feature/group_markup; see also foodcoops#289)
- Order can be sent directly to supplier on closing (feature/mailsupplier)
- Auto-convert spreadsheets using OpenOffice.org
- Use fixed from address (for DMARC compliance) + mail refactor (feature/fixed_mail_from)
- (Use of select2 for more dropdowns, not so important)
Branch beta has additionally:
- Totally redesigned member ordering, where articles from all suppliers are presented by category.
- Payorder plugin, with shopping-cart-like functionality
- Maximum order quantity for articles
- Hierarchical categories (feature/nested_categories)
- Choose price computation model (deposit and tax) (
ArticlePrice
)
Feature-branches where this feature was developed are mentioned in brackes. They were subsequently merged into one of the main foodcoop-adam branches (master or beta). The main branches probably contain additional changes to it (although I've tried to backport patches to the branches). When merging functionality upstream, please take these branches as a starting point only. Also, these branches were developed from one of the main branches in this fork, or from upstream.
The desire is to merge all of this into upstream, with configurable options when applicable.
To find out which commits are on master that aren't on other branches, make sure that you have all feature branches in your checkout of the repository, then run (see also stackoverflow)
for i in `git log --oneline --no-merges master | cut -d' ' -f 1`; do
git branch --contains "$i" | grep -q -v '\smaster$' || git log -n1 --oneline $i;
done
Please see this document (probably outdated by now) as well.