152 Commits

Author	SHA1	Message	Date
Rohan Mitchell	29235cd2cb	Merge branch 'master' into product-amount-units ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee spec/spec_helper.rb	2014-01-14 15:34:05 +11:00
Rohan Mitchell	a30e46d747	Do not delete variant options_text when saving/refreshing products	2014-01-14 11:40:58 +11:00
Rohan Mitchell	9442b7b5dc	On save, scale from chosen unit to base unit (eg. mL to L)	2014-01-14 11:13:19 +11:00
Rohan Mitchell	c43b56f3f8	On load, scale from base unit to chosen unit (eg. g to kg)	2014-01-14 10:16:21 +11:00
Rohan Mitchell	22ec6aa852	Add comment	2014-01-10 15:59:38 +11:00
Rohan Mitchell	9c28b5baae	Fix product lists not matching when saving changes to product unit+values fields	2014-01-10 15:43:45 +11:00
Rob H	aff35e5749	Remove unused toggle-column-list directive	2014-01-10 01:08:03 +08:00
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	894f86350e	Fix megalitre unit specification	2014-01-07 15:17:32 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08: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	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	530d38c7d0	Add basic pagination informaion to BPE	2013-12-22 16:58:48 +08:00
Rohan Mitchell	03aa5604e5	Reorder columns on BPE	2013-12-12 10:52:17 +11:00
Rohan Mitchell	a67c7b808d	Do not set unit value or description on variant when unpacked field is undefined	2013-12-12 10:50:03 +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	5e086af27a	Update product variant_unit_name when variant unit is items	2013-12-06 13:16:33 +11:00
Rohan Mitchell	3adeed1fa0	Update attr name	2013-12-06 11:11:19 +11:00
Rohan Mitchell	62ca121db2	Rename directives to avoid using the ng namespace, which is reserved for angular core	2013-12-06 10:49:06 +11:00
Rohan Mitchell	84fe6706a2	Make 'Items' option appear in variant_unit field on BPE	2013-12-05 15:50:08 +11:00
Rohan Mitchell	8af7c57a88	Pack variant_unit fields back into products and dirtyProducts. These fields can now round-trip to the server.	2013-12-05 15:16:52 +11:00
Rohan Mitchell	e3043cc6ae	Rename prepareProductsForSubmit to submitProducts	2013-12-05 15:16:52 +11:00
Rohan Mitchell	fefea54375	Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale.	2013-12-05 15:16:52 +11:00
Rohan Mitchell	2115e33189	Use == instead of is	2013-12-05 15:16:52 +11:00
Rohan Mitchell	0a07f38f15	Load and display variant_unit on BPE page	2013-12-05 15:16:52 +11:00
Rohan Mitchell	2a989652cb	Use ||=	2013-12-05 15:16:52 +11:00
Rohan Mitchell	d552e84302	Tweak formatting	2013-12-05 15:16:52 +11:00
Rohan Mitchell	a8668e24e3	Finish converting bulk product update to coffeescript	2013-12-05 15:16:51 +11:00
Rohan Mitchell	634dd52a80	WIP: Convert bulk product update to coffeescript. 3 tests failing.	2013-12-05 15:16:51 +11:00
Will Marshall	0ac9bfd898	Moving our fix for the broken Spree function into our own JS	2013-11-29 14:24:56 +11:00
Rohan Mitchell	5386fa72cc	Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises	2013-10-30 17:00:05 +11:00
Rohan Mitchell	5c9c96e174	Do not error if order cycle loads before enterprises	2013-10-24 13:40:27 +11:00
Rohan Mitchell	12061fd485	Order cycle admin does not allow save until page is loaded	2013-10-23 14:59:50 +11:00
Rohan Mitchell	b8320a9bb6	Rename some directives and internal login details	2013-10-19 09:45:38 +11:00
Rohan Mitchell	ea17e475a6	When viewing enterprise fees, only show those for the enterprise I select	2013-10-18 14:44:01 +11:00
Rohan Mitchell	a6877c6981	Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page.	2013-10-16 10:37:09 +11:00
Rohan Mitchell	1d4198d402	Removing a supplier exchange removes variants from distribution	2013-09-30 09:46:39 +10:00
Rob H	08eb865469	Increase pagination size for products in BPE, resolves #14	2013-09-20 13:25:07 +05:45