435 Commits

Author	SHA1	Message	Date
Rob Harrington	61969f5c84	Ensure CustomersController#update.json gives an appropriate response ... pendingChanges submits an empty string when a field is blank (rather than undefined)	2016-06-16 22:42:53 +10:00
Rob Harrington	7028fbe288	Find current_customer via current_distributor and current_user rather than current_order ... Moving available_payment_methods to enterprises_helper, as per available_shipping_methods	2016-05-28 00:31:59 +10:00
Rob Harrington	607b674c57	Refactoring tag rule logic, placing in TagRuleApplicator lib class	2016-05-27 16:25:10 +10:00
Rob Harrington	e32e3ddf70	Applying FilterOrderCycles rules in the frontend	2016-05-27 16:25:10 +10:00
Rob Harrington	1cb51b5c71	CodeClimate fixes for filter-products branch	2016-05-27 16:23:26 +10:00
Rob Harrington	302bdfd628	Implementing FilterProducts rules in the frontend	2016-05-27 16:23:26 +10:00
Rob Harrington	1d8719b474	Default column visibility can be set per user using ColumnPreferences model	2016-05-25 08:10:20 +10:00
Rob Harrington	6a610ff7a4	Merge remote-tracking branch 'origin/master' into uk/trial-length	2016-05-20 12:22:47 +10:00
Rob Harrington	1d7308bf5d	More intuitive logic for minimum billable turnover	2016-04-29 18:03:32 +10:00
Rohan Mitchell	f691636c75	Fix spec	2016-04-27 14:47:45 +10:00
Rohan Mitchell	a26266159c	Fix timing issue: change in client-side value during server update	2016-04-22 10:47:20 +10:00
Rohan Mitchell	06d7665bf9	Prospective fix for intermittent spec fail	2016-04-21 09:54:56 +10:00
Rohan Mitchell	3dcfa810fd	Display out of stock banner when viewing cart directly	2016-04-21 09:36:23 +10:00
Rohan Mitchell	9b3139dba9	When there's an out of stock product in the cart, visiting the shopfront returns user to the cart	2016-04-21 09:36:23 +10:00
Rohan Mitchell	dac90c8003	Fix specs	2016-04-21 09:36:23 +10:00
Rohan Mitchell	35117f7af4	Show a modal when available stock levels have reduced	2016-04-21 09:36:23 +10:00
Rohan Mitchell	fee0f90a1b	After adding products to cart, return status of cart and available stock levels	2016-04-21 09:36:22 +10:00
Lynne Davis	6884f5533e	Missing Specs	2016-04-15 16:56:09 +01:00
Lynne Davis	abfb8149d9	Adding configurable Shop Trial Length in business model	2016-04-15 16:51:07 +01:00
Maikel Linke	48f1794d70	Allow admin user to create customers	2016-04-15 14:34:29 +10:00
Maikel Linke	831df0b222	Create and delete customers in admin interface ... Removed Customers service and extended CustomerResource.	2016-04-15 11:12:22 +10:00
Rohan Mitchell	59b564c4be	Report job queue status via API	2016-04-13 16:48:24 +10:00
Rob Harrington	bf72864c2b	Tag Rules can be deleted	2016-04-01 19:48:25 +11:00
Rob Harrington	4c2552e0bf	Enterprise users can create tag rules	2016-04-01 19:48:25 +11:00
Rohan Mitchell	422061f137	Merge branch 'master' into products-caching ... Conflicts: app/controllers/shop_controller.rb app/models/enterprise_fee.rb app/models/order_cycle.rb app/models/variant_override.rb db/schema.rb lib/open_food_network/products_renderer.rb spec/lib/open_food_network/products_renderer_spec.rb	2016-03-03 09:42:52 +11:00
Rohan Mitchell	e16ca82e76	Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.	2016-03-02 12:10:22 +11:00
Rob Harrington	77e74c5642	OC Coordinators can opt to restrict products in an order cycle to those in their inventory only	2016-03-02 12:10:22 +11:00
Rob Harrington	f06d909c23	WIP: Adding infrastructure to show/hide variants + overrides using inventory items	2016-03-02 12:10:22 +11:00
Rohan Mitchell	b0207f2b49	Clean up specs	2016-02-24 15:05:01 +11:00
Rohan Mitchell	0d5d015d88	Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.	2016-02-24 15:05:01 +11:00
Rob Harrington	669642292b	Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub	2016-01-15 09:07:51 +11:00
Rob Harrington	4103ed0ba7	Combining variant override controller specs	2016-01-15 09:07:51 +11:00
Rob Harrington	607a66b6c6	WIP: Fixing a few broken VO specs	2016-01-15 09:07:50 +11:00
Steve Pettitt	e423e890e0	Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly	2016-01-15 09:07:50 +11:00
Rob Harrington	94785d4157	Fixing authorization for VariantOverridesController#bulk_reset	2016-01-15 09:07:49 +11:00
Steve Pettitt	0ee078e232	Added toggle to enable/disable reset stock. Updated specs	2016-01-15 09:07:48 +11:00
Steve Pettitt	2921958788	Variant override controller spec added	2016-01-15 09:07:48 +11:00
Rob Harrington	3b7700131c	Specify controller specs as such	2016-01-15 09:07:47 +11:00
Rob Harrington	64cd52e067	Adding SKU and on demand to a few VO specs	2016-01-13 18:49:34 +11:00
Rob Harrington	521f227f74	Adding sku and on_demand to VariantOverride	2016-01-13 18:49:33 +11:00
Rohan Mitchell	a27e593924	Fix deprecation notices	2016-01-07 10:51:39 +11:00
Rob Harrington	4b5e33d5b0	Implementing new permissions for producers in reports_controller_spec	2015-12-17 14:21:30 +11:00
Rob Harrington	f49722ba90	Fixing broken BMC specs	2015-12-16 19:18:58 +11:00
Rob Harrington	ca3c464fda	Reorganising busines model config settings, moving account invoice tax rate in busines model config settings	2015-12-16 19:18:57 +11:00
Rob Harrington	044e423543	Adding update logic to business model config controller	2015-12-16 19:18:57 +11:00
Rob Harrington	e20b06bb97	Adding basic route and controller for business model configuration	2015-12-16 19:18:56 +11:00
Rob Harrington	c91f1301f0	Adding preferences to enterprises for sorting of order cycles in shopfront list	2015-12-16 11:55:23 +11:00
Continuous Integration	b7edf5e046	Auto-merge from CI [skip ci]	2015-12-16 10:58:03 +11:00
Rohan Mitchell	a3874d42af	Spec moved to OpenFoodNetwork::LastUsedAddress	2015-12-11 13:25:40 +11:00
Rohan Mitchell	60e971ad63	Take variant overrides into account for price when admin adds line item to order	2015-12-11 13:06:57 +11:00