452 Commits

Author	SHA1	Message	Date
Rob H	29ba0ccc97	Initialise BPE page with 'Available On' column hidden	2014-01-10 00:46:42 +08:00
Rob H	ee2da3e008	Toggle new view controls on BPE	2014-01-10 00:26:54 +08:00
Rohan Mitchell	c396c2a21f	Improve speed of BPE specs	2014-01-09 12:37:43 +11:00
Rohan Mitchell	420ff37562	Provide explicit ordering for intermittently failing spec	2014-01-09 12:09:50 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rob H	ac17502046	Fix test	2014-01-08 12:30:32 +08:00
Rohan Mitchell	c08c42b087	Fix inconsistent test fails - insignificant ordering	2014-01-08 15:11:46 +11:00
Will Marshall	e5514920c8	Fixing up the error messages in our specs	2014-01-08 15:11:23 +11:00
Will Marshall	e0c352d135	Merge branch 'master' into darkswarm ... Conflicts: spec/features/admin/products_spec.rb	2014-01-08 14:49:47 +11:00
Rohan Mitchell	c42d741d3d	Remove browse product specs for removed feature	2014-01-08 14:41:06 +11:00
Rohan Mitchell	dd16934496	Remove redundant serializer spec, reinstate creation of order distribution charges	2014-01-08 13:22:34 +11:00
Rohan Mitchell	df53a14d4b	Remove specs that are no longer relevant - distribution selection on product page no longer present	2014-01-08 11:51:26 +11:00
Rohan Mitchell	eda4f241e2	Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests	2014-01-08 11:39:05 +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
Will Marshall	936d80b2c5	Removing a redundant test: no longer show current distributor and order cycle	2014-01-07 15:16:36 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Will Marshall	8e0a7d9072	Pretties, fixing the email validation issue with admin authentication steps	2014-01-07 11:04:40 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08: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	a6d7044dfd	WIP: Adding basic UI for applying hard filtering to BPE	2014-01-04 19:21:10 +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	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	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	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
Will Marshall	6d124b3275	Failing tests, forcing the orders close text to change	2013-12-18 16:12:06 +11:00
Will Marshall	a3dfe1b147	Working on the HTML structure, variants etc	2013-12-18 12:26:34 +11:00
Will Marshall	7ea9cf6862	Adding price to serializer	2013-12-17 15:45:06 +11:00
Rohan Mitchell	9f47ff64fa	Update spec now that bulk product edit is the default product edit view	2013-12-17 15:29:25 +11:00
Will Marshall	67fcf0f534	Fixing up the feature specs	2013-12-17 15:26:49 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00
Will Marshall	63349c7c9a	Fixing some breaking bugs in the refactored mailer	2013-12-13 15:40:23 +11:00
Rohan Mitchell	124b6df75d	Show undated order cycles on index page	2013-12-13 14:51:43 +11:00
Will Marshall	6e36142809	Making some changes to the data on the products inventory page	2013-12-13 11:39:45 +11:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Rohan Mitchell	42d3947861	Set unit value and description on variants	2013-12-12 10:14:05 +11:00
Rohan Mitchell	33f06f5eff	Display unit value and description for variants in BPE	2013-12-06 15:57:37 +11:00
Rohan Mitchell	385a80a305	Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field. ... This reverts commit 8f6f37355c.	2013-12-06 14:38:46 +11:00
Rohan Mitchell	8f6f37355c	Can set variant_unit_name when unit type is not items	2013-12-06 14:25:19 +11:00