265 Commits

Author	SHA1	Message	Date
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rohan Mitchell	4fb30f2942	When removing outgoing exchanges, do not removing variants from other outgoing exchanges	2014-09-12 12:50:04 +10:00
Rob H	cc65faadd0	Specing out enterprise registration service properly	2014-09-12 11:48:17 +10:00
Rohan Mitchell	a6556f3a4f	Fix broken JS specs	2014-09-12 11:12:35 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
Rob H	800eecea33	Fix failing bulk specs	2014-09-11 17:10:58 +10:00
Rohan Mitchell	c43c35601b	Set product.largeImage in JS, use for product modal	2014-09-05 15:10:16 +10:00
Rohan Mitchell	57af658e7c	For OC, fetch all enterprises we have access to, including those via E2E relationships	2014-09-05 15:10:13 +10:00
Rohan Mitchell	913c167fdf	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-09-05 15:10:12 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rohan Mitchell	5ef13d3c5a	Change 'add products to OC' permission into the more general 'add enterprise to OC'	2014-08-28 10:09:50 +10:00
Rohan Mitchell	b4e89ad2c0	Convert enterprise relationship permission to string presentation	2014-08-25 13:27:01 +10:00
Rohan Mitchell	b35c5e902f	Fix broken JS specs	2014-08-19 16:47:51 +10:00
Rob H	6b73eb435c	Add js specs for providers controller	2014-08-08 17:47:51 +10:00
Rob H	5fea15e8a9	Better error reporting for failed save on BPE	2014-08-08 14:05:54 +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	e76c2a215a	Fix BPE spec around supplier conversion in filtering	2014-08-08 14:05:52 +10:00
Rob H	59a3fe11ad	Fix taxon service specs	2014-08-08 14:05:52 +10:00
Rob H	2f5b5e7ee5	Inject taxons into BPE	2014-08-08 14:05:52 +10:00
Rob H	aaddccfae4	Injecting producer information into BPE	2014-08-08 14:05:51 +10:00
Rob H	27e992ebcb	Staggered loading of products in BPE	2014-08-08 14:05:51 +10:00
Rob H	e02a742597	WIP: Removing requirment for refresh of products on BPE	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	c30d7fe72a	Fix broken JS specs	2014-08-08 09:56:55 +10:00
Rohan Mitchell	769e8410cc	Fix checkout total display	2014-08-07 14:53:30 +10:00
Rohan Mitchell	fc95e088df	Show collapsed price breakdown	2014-07-30 14:59:16 +10:00
Rohan Mitchell	77b279ca97	Stub base_price and fees on variant serializer. Calculate basePricePercentage on variant.	2014-07-30 14:34:05 +10:00
Rohan Mitchell	1ac5b79aeb	Fix failing JS specs	2014-07-30 14:33:36 +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
Rob H	9055a441fd	Removing trailing whitespace	2014-07-24 10:28:28 +10:00
Rob H	37c16fb20c	Add shipping method js infrastructure for angularising admin enterprises page	2014-07-24 10:16:54 +10:00
Rob H	2200392031	Angularising Admin enterprises form	2014-07-24 10:16:54 +10:00
Will Marshall	b25def810c	Working version of the cart integration	2014-07-18 14:56:15 +10:00
Rohan Mitchell	7db2aff398	Generate variantUnitOptions - DRY	2014-07-18 14:10:42 +10:00
Will Marshall	a3d402ad53	Moving variants to a service, backreferencing and linking	2014-07-18 13:59:34 +10:00
Rohan Mitchell	04eca9591b	Derive unitScales from unitNames	2014-07-18 12:39:16 +10:00
Rohan Mitchell	ab1628681e	Call VariantUnitManager directly	2014-07-18 12:39:16 +10:00
Rohan Mitchell	8d5f953f78	Extract getScale from BOM controller to VariantUnitManager, extract specs as well	2014-07-18 12:39:16 +10:00
Will Marshall	562f8dbd4e	Starting to restructure data injection	2014-07-18 11:21:51 +10:00
Rohan Mitchell	6c59ffc16f	Switch to class case for OptionValueNamer	2014-07-18 10:06:13 +10:00
Rohan Mitchell	989a14fa37	Change KL to kL, update specs for ML to kL change	2014-07-17 16:16:08 +10:00
Will Marshall	541fe9ec37	Switching Checkout service to use CurrentOrder	2014-07-17 14:26:54 +10:00
Will Marshall	158bdd145f	All the new serializers and some specs	2014-07-17 14:23:09 +10:00
Will Marshall	547d9f9f5c	Moving payment methods and shipping methods into their own services	2014-07-17 14:19:39 +10:00
Will Marshall	2b1ab53d8e	Fixing regressions and refactoring our tests	2014-07-16 16:00:44 +10:00
Will Marshall	eb8f59d65b	Tests for the taxon filtering	2014-07-04 15:19:45 +10:00
Will Marshall	f335b6a576	Taxon selectors and show/hide behaviour	2014-07-04 14:09:53 +10:00
Will Marshall	487b8616c0	Adding dereferencing to taxons and reducing our data-set	2014-07-04 13:51:22 +10:00
Will Marshall	55bf59ba96	adding by producer id filtering	2014-07-04 13:51:22 +10:00