1844 Commits

Author	SHA1	Message	Date
Rohan Mitchell	f3fa5edb9d	Add simple variant proxy	2014-11-21 13:49:09 +11:00
Rohan Mitchell	f9b4c07219	Add initial VariantOverride model with price lookup	2014-11-21 13:49:09 +11:00
Rohan Mitchell	bf6d0a2beb	Port remaining specs to BulkProducts service specs	2014-11-21 08:41:41 +11:00
Rohan Mitchell	5eb40261a8	Port clone products specs to BulkProducts service specs	2014-11-21 08:41:41 +11:00
Rohan Mitchell	221e9344fd	Port fetch products specs to BulkProducts service specs	2014-11-21 08:41:41 +11:00
Rohan Mitchell	387d25b8f2	WIP: More extracting BulkProducts-specific specs to their own file	2014-11-21 08:41:41 +11:00
Rohan Mitchell	7e2c979c96	WIP: Extracting BulkProducts-specific specs to their own file	2014-11-21 08:41:41 +11:00
Rohan Mitchell	7e4d337773	Extract DisplayProperties to a service ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee	2014-11-21 08:41:41 +11:00
Rohan Mitchell	29e49b67cc	In BPE, rename producer and category JSON attrs to producer_id and category_id ... Conflicts: spec/features/admin/bulk_product_update_spec.rb	2014-11-21 08:41:41 +11:00
Rohan Mitchell	021cca4fca	Stylistic changes	2014-11-21 08:41:41 +11:00
Rob Harrington	d9d6b7bee4	Adding filtering to Users and Enterprises report	2014-11-14 16:36:22 +11:00
Rob Harrington	79a83ee206	Adding users and enterprises report, controller action and template	2014-11-14 16:36:22 +11:00
Rob Harrington	66a3410087	WIP: Adding new report to ability spec	2014-11-14 16:36:22 +11:00
Rob Harrington	65a5960fcc	WIP: Add route for User and Enterprise report	2014-11-14 16:36:22 +11:00
Rohan Mitchell	43bac4079f	Show hubs that are not ready for checkout so that we can view SEFH - Sample :/	2014-11-13 15:21:02 +11:00
Rob Harrington	6b21bbdf74	Reconfirmation email sends to the right address	2014-11-12 15:20:51 +11:00
Rob Harrington	ee2ee5dba7	Adding an enterprise welcome email	2014-11-12 15:20:51 +11:00
Rob Harrington	e1823212d6	Reconfirmation email not required when we already know about new email address for enterprise	2014-11-06 21:19:22 +11:00
Rob Harrington	898af0a55e	Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice	2014-11-06 21:19:21 +11:00
Rob Harrington	74642c3825	Update checkout helper spec to reflect Rohan's changes	2014-11-06 21:18:20 +11:00
Rohan Mitchell	cbb968d87f	Pass checkout form to controller method	2014-11-06 18:29:48 +11:00
Rohan Mitchell	75b250d3fe	When submitting checkout, if field is invalid, show errors	2014-11-06 18:29:48 +11:00
Rob Harrington	93e3d87fcb	Errors on bulk update for enterprise index do not allow user to list all enterprises	2014-11-06 11:01:44 +11:00
Rohan Mitchell	1506b10d8f	Fix brittle spec	2014-11-05 16:08:45 +11:00
Rohan Mitchell	fdbb274667	Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout	2014-11-05 14:29:36 +11:00
Rohan Mitchell	8c2adb2a05	Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue	2014-11-01 12:11:50 +11:00
Rohan Mitchell	15b05de7f2	Fix specs: Distributors require shipping and payment method	2014-11-01 10:42:38 +11:00
Rohan Mitchell	0cf4e01dde	Fix specs: Expect proper query chain	2014-11-01 10:39:29 +11:00
Rohan Mitchell	0d05c7163d	Use factory shortcut for creating shipping and payment methods	2014-10-31 16:26:13 +11:00
Rohan Mitchell	f5b20b7afc	Give distributors a payment and shipping method where required	2014-10-31 16:02:43 +11:00
Rohan Mitchell	e2d88e615b	Fix broken spec	2014-10-31 16:00:28 +11:00
Rohan Mitchell	8488b8e469	When user has selected a hub that is not ready for checkout, unselect it	2014-10-31 15:02:58 +11:00
Rohan Mitchell	7aefa05efd	Fix specs broken by requirement for valid shipping and payment method	2014-10-31 14:48:08 +11:00
Rohan Mitchell	abeabd5b1c	Add Enterprise#ready_for_checkout?	2014-10-31 14:04:43 +11:00
Rohan Mitchell	94d50f220f	Display an error message to admin when there are hubs in order cycles that are not ready for checkout	2014-10-31 12:22:02 +11:00
Rohan Mitchell	9f43146e47	Payment methods need to be available, too	2014-10-31 12:22:02 +11:00
Rohan Mitchell	f0d3b987d4	Show hubs as unavailable when they do not have available payment and shipping methods	2014-10-31 12:22:02 +11:00
Rohan Mitchell	1d9a3f33e0	Order cycle distributors must have shipping and payment methods	2014-10-31 12:22:02 +11:00
Rohan Mitchell	433806aca8	Remove unused helpers and standardise naming	2014-10-31 12:22:02 +11:00
Rob Harrington	65d13e0490	Show error messages on enterprise index page	2014-10-30 13:02:16 +11:00
Rob Harrington	977c508833	Make enterprise limit error messages more specific	2014-10-30 13:02:16 +11:00
Rafael Schouten	095dd28505	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork	2014-10-25 18:53:46 +11:00
Rafael Schouten	feff4fd46f	fix reports taxons and specs	2014-10-25 18:51:03 +11:00
Rafael Schouten	6f1c90ea25	add toxons to prodcut reports	2014-10-25 17:09:23 +11:00
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rob Harrington	a157528974	Adding specs for single ent dash and remove product ability for profiles	2014-10-24 15:27:08 +11:00
Rob Harrington	8b819539e7	Fixing specs	2014-10-24 14:52:59 +11:00
Rob Harrington	96516a8ff3	User can switch between trialling a shopfront and not trialling a shopfront	2014-10-24 14:12:47 +11:00
Rob Harrington	e1cf5ceb57	Can set producer_profile_only using welcome page	2014-10-23 16:42:00 +11:00
Rob Harrington	d94ca0174a	Registration process sets sells to 'unspecified'	2014-10-23 16:42:00 +11:00