205 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	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rohan Mitchell	894f86350e	Fix megalitre unit specification	2014-01-07 15:17:32 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +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	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
Will Marshall	1048bab303	Patching up some edge cases	2013-12-19 14:20:16 +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	b3a4d826b8	Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff	2013-12-18 17:05:47 +11:00
Will Marshall	4b7605212e	Adding text trunctation in Angular	2013-12-18 14:45:32 +11:00
Will Marshall	d5081e4cc5	Working on the pretties	2013-12-13 09:19:54 +11: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
Will Marshall	36694822db	Starting to prettify	2013-12-12 10:28:43 +11:00
Rohan Mitchell	42d3947861	Set unit value and description on variants	2013-12-12 10:14:05 +11:00
Will Marshall	8f41078c0c	Reworking our bindings so everything stacks on objects and automagically updates	2013-12-11 15:39:50 +11:00
Will Marshall	bc4f472523	Fixing up the tests with some refactoring	2013-12-11 15:33:57 +11:00
Will Marshall	3903173848	Working reloading of products, changing order cycles, sticky state	2013-12-11 13:36:12 +11:00
Will Marshall	04d8949177	Tweaks to the JS, redirection on the controller	2013-12-11 12:53:50 +11:00
Will Marshall	44fe304efb	Building out and testing our Product and OrderCycle Angular stuff	2013-12-11 12:42:33 +11:00
Rohan Mitchell	33f06f5eff	Display unit value and description for variants in BPE	2013-12-06 15:57:37 +11:00
Will Marshall	63dfa0b696	Getting the test framework set up for Angular, setting up a products fetch stub	2013-12-06 15:24:42 +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
Will Marshall	3670d68265	Correctly failing tests forcing us to build out OrderCycle switching in Angular	2013-12-05 16:48:29 +11:00
Will Marshall	102cb62b60	Starting to build out the Angular.js app	2013-12-05 16:31:22 +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