Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +10:00

..

customers_report.rb

On customer reports, do not show orders through a hub that the current user does not manage

2014-06-19 10:35:32 +10:00

distribution_change_validator.rb

Rename OrderCycle#distributed_variants_by to variants_distributed_by

2013-11-15 14:34:05 +11:00

enterprise_fee_applicator.rb

Allow enterprise fee with no tax category

2015-03-06 12:12:33 +11:00

enterprise_fee_calculator.rb

Do not show zero fees

2014-07-31 15:36:26 +10:00

enterprise_injection_data.rb

Only load activated relatives for EnterpriseInjectionData

2015-05-29 12:08:21 +10:00

feature_toggle.rb

Enable order cycles by default

2013-11-29 10:49:33 +11:00

group_buy_report.rb

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

integrity_checker.rb

Add reactive integrity test that soft-deleted variants are removed from order cycles

2014-06-12 14:59:27 +10:00

locking.rb

Change locking to use postgres syntax, fixes 'must be first statement in transaction' error

2015-02-20 11:31:39 +11:00

model_class_from_controller_name.rb

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

option_value_namer.rb

Adding 'Total Units' field to supplier report

2014-08-07 14:21:01 +10:00

order_and_distributor_report.rb

Fix indentation

2015-05-15 12:17:16 +10:00

order_cycle_form_applicator.rb

Fix OrderCycleFormApplicator specs

2015-04-29 15:00:22 +10:00

order_cycle_management_report.rb

Fix whitespace issues

2015-03-12 12:17:15 +11:00

order_cycle_permissions.rb

Fixing bug on OC interface that prevented hubs from pulling their own products through

2015-06-03 16:18:44 +08:00

order_grouper.rb

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

permissions.rb

Adding visible products method to permissions

2015-05-20 15:53:10 +10:00

products_and_inventory_report.rb

inventory report: filter was broken because filter_to_order_cycle returned nil

2015-06-03 15:11:32 +10:00

referer_parser.rb

Handle invalid referer URLs

2015-06-05 12:43:49 +10:00

sales_tax_report.rb

Consistency in tax calculations, remove some unneeded local vars

2015-03-25 16:31:15 +11:00

scope_product_to_hub.rb

Fix auto-reload nerfing scope_xx_to_hub

2015-01-12 14:24:15 +11:00

scope_variant_to_hub.rb

Fix auto-reload nerfing scope_xx_to_hub

2015-01-12 14:24:15 +11:00

spree_api_key_loader.rb

Assigning @spree_api_key for store

2014-09-19 18:31:33 +10:00

user_balance_calculator.rb

Extract most everything to private methods - neatly groups concerns together

2015-01-09 11:28:39 +11:00

users_and_enterprises_report.rb

Adding visible to user and enterprises report, and sorting by confirmation date

2015-01-29 10:46:44 +11:00

xero_invoices_report.rb

Add column for whether the order has been paid for

2015-05-15 16:55:52 +10:00