Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

open_food_network/calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

.gitkeep

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

account_invoice.rb

Linking billable_periods to the relevant account_invoice upon creation

2015-09-17 22:38:29 +10:00

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

billable_period.rb

Updating the admin account view to show use the new account_invoice model to display data

2015-09-17 22:38:29 +10:00

cart.rb

Fix multicart use of OrderPopulator

2014-01-08 14:13:19 +11:00

content_configuration.rb

Make TOS URL configurable

2015-07-31 14:51:17 +10:00

customer.rb

Completed orders require a customer, add association logic

2015-05-13 12:44:38 +10:00

distributor_shipping_method.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

Adding for_enterprises scope on enterprise fee

2015-04-06 10:24:40 +10:00

enterprise_group.rb

PermalinkGenerator for products

2015-09-16 15:45:10 +10:00

enterprise_relationship_permission.rb

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

enterprise_relationship.rb

Optimise relatives including self - minor improvement

2015-06-16 17:43:13 +10:00

enterprise_role.rb

Enterprise roles must be unique

2014-08-15 16:09:05 +10:00

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Prevent invoices from being sent unless the distributor of an order has set their ABN

2015-10-21 16:23:48 +11:00

exchange_fee.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

Adding an 'involved' scope to exchanges

2015-03-27 15:56:07 +11:00

model_set.rb

Setting both values to blank deletes override

2014-12-12 13:33:14 +11:00

order_cycle_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

order_cycle.rb

WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs

2015-11-05 14:02:04 +11:00

producer_property.rb

Admin can reorder producer properties

2014-06-18 15:28:41 +10:00

product_distribution.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

suburb.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00

variant_override_set.rb

Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs

2015-03-13 10:45:38 +11:00

variant_override.rb

Fetch indexed variant overrides in one go

2015-06-18 15:03:24 +10:00