696 Commits

Author	SHA1	Message	Date
Rohan Mitchell	0e6cd30e7e	Edit for clarity	2014-08-19 13:27:45 +10:00
Rohan Mitchell	a858c21296	Enterprise has a type (full, single, profile), editable by admin	2014-08-19 11:37:31 +10:00
Rohan Mitchell	2660ffd459	Fix duplicate enterprise role	2014-08-16 16:33:07 +10:00
Rohan Mitchell	9ddfb1584b	Admin can delete enterprise roles	2014-08-15 16:09:06 +10:00
Rohan Mitchell	95a0bf39f7	Enterprise roles must be unique	2014-08-15 16:09:05 +10:00
Rohan Mitchell	6e17f0aaa2	Admin can create enterprise roles	2014-08-15 16:09:05 +10:00
Rohan Mitchell	1d77812ab8	Admin can list enterprise roles	2014-08-15 16:09:04 +10:00
Rob H	c20369919c	Can change hub after changing pm type	2014-08-09 11:23:05 +10:00
Rob H	a8b823668f	Fix checkout specs failing due to payment method not having hub	2014-08-08 22:40:24 +10:00
Rob H	40d290951c	Fix failing specs related to requiring distributor for payment method	2014-08-08 17:47:51 +10:00
Rob H	f021d260b1	Require payment_methods to be associated with at least one hub	2014-08-08 17:47:50 +10:00
Rob H	d8c1823328	Fix broken specs	2014-08-08 14:05:54 +10:00
Rob H	e6f7f26a95	Add loading gif to BPE, fiddle with interface	2014-08-08 14:05:53 +10:00
Rob H	32c8b9cdcd	Switch Taxons input over to category selection on BPE, clean up interface	2014-08-08 14:05:53 +10:00
Rob H	d27908fd2f	Add ability to reset filters to BPE	2014-08-08 14:05:53 +10:00
Rob H	5f277dae61	Fixing BPE specs related to filtering	2014-08-08 14:05:52 +10:00
Rob H	c139e2fab2	Remove 500 product warning	2014-08-08 14:05:51 +10:00
Rob H	b9f49344b4	BPE: Switch column toggle to dropdown, clean up specs	2014-08-08 14:05:51 +10:00
Rob H	a14c2dbb04	Decouple bpe specs from update process	2014-08-08 14:05:50 +10:00
Rohan Mitchell	16847025dd	Fix bug: local storage was not correctly keyed to user id	2014-08-08 11:14:50 +10:00
Rohan Mitchell	f8c71ced45	Fix display of state_name, after attribute was renamed in serializer	2014-08-07 16:46:57 +10:00
Rohan Mitchell	769e8410cc	Fix checkout total display	2014-08-07 14:53:30 +10:00
Rohan Mitchell	a1dd5dabac	Replace sleep with wait, add cart_dirty spec helper	2014-07-31 11:36:53 +10:00
Will Marshall	20d7484134	Merge branch 'master' into laura_and_will ... Conflicts: app/assets/javascripts/darkswarm/services/order.js.coffee	2014-07-28 13:43:31 +10:00
Will Marshall	9d0919d201	Further minor regressions	2014-07-28 13:41:38 +10:00
Will Marshall	a5f478bde7	Ajax submission of max quantity	2014-07-28 13:33:13 +10:00
Will Marshall	39f9e991ad	Minor regressions and bug fixes	2014-07-28 11:30:35 +10:00
Rohan Mitchell	f73a63e944	Switch spec to better spree paypal express payment method	2014-07-25 13:47:31 +10:00
Will Marshall	2120ab96ca	Fixing bugs and spec regressions	2014-07-24 16:02:10 +10:00
Rob H	7fc80a0975	Fix failing enterprise spec	2014-07-24 11:05:14 +10:00
Rob H	2200392031	Angularising Admin enterprises form	2014-07-24 10:16:54 +10:00
Rohan Mitchell	159d0a9dbe	Remove most references to suburbs - previously used by new_landing_page, no longer used.	2014-07-17 14:26:04 +10:00
Rohan Mitchell	75a59eb5cc	Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.	2014-07-16 11:26:22 +10:00
Rohan Mitchell	6dfd26ac69	order_with_totals_and_distribut{or,ion}	2014-07-16 10:33:23 +10:00
Will Marshall	9f5f319edb	Further patching regression	2014-07-11 17:55:06 +10:00
Will Marshall	a73bc2405d	Fixing one regression	2014-07-11 17:08:39 +10:00
Will Marshall	9d519f5f4b	Fixing a minor test regression	2014-07-10 11:52:32 +10:00
Will Marshall	30d78c8da3	Adding a spec to test a regression	2014-07-09 11:33:36 +10:00
Rob H	3da2461af5	Require shipping methods to have at least one distributor	2014-07-04 14:05:44 +10:00
Will Marshall	f316b8dec5	Adding product modals in new format	2014-06-27 15:15:41 +10:00
Will Marshall	a4e675e675	Refactoring visibility handling	2014-06-26 14:48:46 +10:00
Will Marshall	8862fd555c	Removing ng-animate, changing our enterprise restriction	2014-06-26 14:36:16 +10:00
Will Marshall	4f3d468db6	Dereferencing groups and adding modals to page	2014-06-24 17:15:31 +10:00
Will Marshall	369761ccc5	Minor regression bug	2014-06-24 17:15:31 +10:00
Will Marshall	c09555e380	Tab fixes, new tests, reworking modals	2014-06-24 17:15:31 +10:00
Rob H	9099fca11c	Merge branch 'bug-herd' into working	2014-06-23 22:01:41 +10:00
Rob H	51d3f65934	Remove spree's product tab for all but admin users	2014-06-23 22:01:19 +10:00
Will Marshall	21589fd5b0	Hack patching home page modals	2014-06-20 16:31:49 +10:00
Rob H	1a0a8ec160	Merge branch 'master' into working	2014-06-20 13:54:52 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00