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

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

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

account_invoice_spec.rb

WIP: Adding AccountInvoice model to more robustly record information about enterprise user invoices

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

adjustment_metadata_spec.rb

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

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

billable_period_spec.rb

Associating billable periods with the relevant adjustment, and moving labelling logic to model

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

cart_spec.rb

Fixing up a couple of regressions

2014-07-29 13:46:38 +10:00

customer_spec.rb

Completed orders require a customer, add association logic

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

distributor_shipping_method_spec.rb

Code cleanups

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

enterprise_caching_spec.rb

Caching address and touching enterprise on save

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

enterprise_fee_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

enterprise_group_spec.rb

Merge branch 'master' into redesign

2015-05-29 15:20:21 +10:00

enterprise_relationship_spec.rb

Enterprise relatives include self where appropriate for serialized injection data

2015-06-15 19:45:29 +08:00

enterprise_spec.rb

When enterprise is deleted, delete relationships

2015-07-10 09:42:09 +10:00

exchange_spec.rb

Merge branch 'master' into folklabs-producer-emails

2015-05-29 17:36:11 +10:00

model_set_spec.rb

fixing a bunch of tests

2015-02-12 16:36:18 +11:00

order_cycle_spec.rb

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

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

product_distribution_spec.rb

Comment out intermittently failing spec - we intend to remove product distributions soon anyway

2014-08-07 17:20:38 +10:00

suburb_spec.rb

Suburb auto-complete functionality for the new landing page.

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

variant_override_spec.rb

Fetch indexed variant overrides in one go

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