15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Rohan Mitchell	458f91ef91	Add feature spec helper to select distributor and order cycle	2014-01-08 11:31:44 +11:00
Rohan Mitchell	2f98888acd	Remove active model serializers gem	2014-01-08 11:31:05 +11:00
Will Marshall	5e041a6f4f	Uncommenting the old OP code	2014-01-08 10:35:27 +11:00
Rohan Mitchell	70e16433d3	Spec for reusing existing option values	2014-01-08 10:16:38 +11:00
Rohan Mitchell	2fec16af5d	Merge branch 'master' into product-amount-units	2014-01-07 16:00:06 +11:00
Will Marshall	06ab4d5384	Patching some further regression bugs	2014-01-07 15:28:11 +11:00
Rohan Mitchell	894f86350e	Fix megalitre unit specification	2014-01-07 15:17:32 +11:00
Will Marshall	936d80b2c5	Removing a redundant test: no longer show current distributor and order cycle	2014-01-07 15:16:36 +11:00
Rohan Mitchell	042e8386ab	Refactor: Extract methods to simplify	2014-01-07 15:16:36 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Rohan Mitchell	9e6fa4d22d	Add spec for small values	2014-01-07 15:02:55 +11:00
Rohan Mitchell	ebae76375f	Fix specs to work with unit_value stored in base units, scale units correctly for output	2014-01-07 14:57:30 +11:00
Rohan Mitchell	5a1249e249	When value is blank, display description only	2014-01-07 12:19:48 +11:00
Rohan Mitchell	35d0bf6219	Generate option value values and units for weight, volume and items	2014-01-07 12:07:54 +11:00
Will Marshall	32c7682da2	Removing the serializers to fix regression issues	2014-01-07 11:12:44 +11:00
Will Marshall	641b7dcdf4	Removing the image serializer, causing regression bugs	2014-01-07 11:05:10 +11:00
Will Marshall	8e0a7d9072	Pretties, fixing the email validation issue with admin authentication steps	2014-01-07 11:04:40 +11:00
Rohan Mitchell	ef6c08408b	Generate option value name - value and description	2014-01-07 10:57:58 +11:00
Rohan Mitchell	9e956ebec6	Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.	2014-01-07 10:36:19 +11:00
Rohan Mitchell	6a4c112cf2	Rename option_type_for_variant_unit to variant_unit_option_type	2014-01-07 10:31:53 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08:00
Will Marshall	9677ec7159	Starting to build mixins	2014-01-06 16:27:41 +11:00
Will Marshall	1264af584c	Removing a pointless test	2014-01-06 15:56:28 +11:00
Will Marshall	dd1b3311d7	Removing all the old order populator stuff	2014-01-06 15:23:21 +11:00
Rob H	49b9b8f635	Add messages to BPE interface for cases when 0 or > 500 products are found	2014-01-05 19:17:50 +08:00
Rob H	2e56d7a551	Can remove filters from BPE	2014-01-05 17:53:32 +08:00
Rob H	fb9fd5089a	WIP: Adding a hard filter to BPE works	2014-01-05 17:04:27 +08:00
Rob H	6445275530	Basic layout changes for BPE page	2014-01-05 00:37:36 +08:00
Rob H	a6d7044dfd	WIP: Adding basic UI for applying hard filtering to BPE	2014-01-04 19:21:10 +08:00
Rob H	7ef358a476	Add basic hard filter adding js infrastructure for BPE	2014-01-04 16:44:00 +08:00
Rob H	687332d2b0	Add loading splash to BPE	2014-01-04 15:50:26 +08:00
Rob H	c6222f2180	BPE pagination works with filtering	2014-01-02 15:22:10 +08:00
Rob H	6b865aa38c	Display BPE update message correctly	2014-01-02 13:10:06 +08:00
Rob H	ef78609049	Prevent page being orphaned when changing page size in BPE	2013-12-26 19:37:21 +08:00
Rob H	2df0545819	Fix some outstanding updating issues in BPE	2013-12-23 23:09:19 +08:00
Rob H	3372f1d605	BPE page nav using page numbers	2013-12-23 17:19:38 +08:00
Rob H	ffbfbffb28	WIP: Add basic page nav controls to BPE	2013-12-23 09:22:31 +08:00
Rob H	06995bd3c6	Add controls to alter the number of products displayed for BPE	2013-12-22 17:31:27 +08:00
Rob H	530d38c7d0	Add basic pagination informaion to BPE	2013-12-22 16:58:48 +08:00
Will Marshall	49c2cc3696	Getting in the tab navigation	2013-12-20 14:23:14 +11:00
Will Marshall	0db7eae7f8	Getting images working	2013-12-20 11:49:08 +11:00
Will Marshall	751e98443f	Removing LOADS of code	2013-12-19 16:47:27 +11:00
Will Marshall	e20120b9ca	Fixing a syntax error	2013-12-19 16:05:35 +11:00
Will Marshall	985cebb44a	Massaging the form to push orders to the cart: some refactoring still required	2013-12-19 15:51:51 +11:00
Will Marshall	1048bab303	Patching up some edge cases	2013-12-19 14:20:16 +11:00
Will Marshall	87cef4edcc	Reverting previous commit	2013-12-19 12:29:21 +11:00
Will Marshall	aaa2999ee1	Dropping our override of ActionMailer	2013-12-19 11:58:21 +11:00
Will Marshall	37f8ce68fb	Adding one additional mailer test	2013-12-19 11:58:08 +11:00
Will Marshall	b5dd921a81	Our feature spec is breaking but we'll work that out	2013-12-19 10:44:47 +11:00