7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	e443495a7e	Remove reference to deleted stylesheet	2013-12-17 12:48:44 +11:00
Rohan Mitchell	f1f3d7a99c	Remove duplicate migration	2013-12-13 16:01:36 +11:00
Rohan Mitchell	5c744c7295	Move enterprises_distributor_info_rich_text_feature styles into central files	2013-12-13 16:01:36 +11:00
Will Marshall	222ed20361	Defaulting to bulk products	2013-12-13 15:57:32 +11:00
Will Marshall	63349c7c9a	Fixing some breaking bugs in the refactored mailer	2013-12-13 15:40:23 +11:00
Will Marshall	f6af9e78ac	Adding destroy ability to enterprise users	2013-12-13 15:40:23 +11:00
Will Marshall	92b3d496a4	Fixing the bugherd script to use the production one	2013-12-13 15:40:23 +11:00
Will Marshall	12743850b4	Removing a chili, refactoring order mailer	2013-12-13 15:40:22 +11:00
Rohan Mitchell	124b6df75d	Show undated order cycles on index page	2013-12-13 14:51:43 +11:00
Rohan Mitchell	1084862139	When product variant unit is changed, remove related option values from variants	2013-12-13 12:08:51 +11:00
Will Marshall	6e36142809	Making some changes to the data on the products inventory page	2013-12-13 11:39:45 +11:00
Rohan Mitchell	60a3e06c5b	Reformat	2013-12-13 11:10:08 +11:00
Rohan Mitchell	f2269654ff	Set option type on product when variant unit changed	2013-12-13 11:07:57 +11:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +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	71a5d84a1d	Filtering the products to the current order cycle	2013-12-11 15:06:07 +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
Will Marshall	4db8f755bf	Getting an order cycle update function in place like a boss	2013-12-11 12:42:02 +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	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	3013870bd6	Merge branch 'master' into product-amount-units ... Conflicts: config/ng-test.conf.js	2013-12-06 14:33:59 +11:00
Rohan Mitchell	6956eb3f94	Basic styling for variant unit fields on BPE	2013-12-06 14:30:38 +11:00
Rohan Mitchell	8f6f37355c	Can set variant_unit_name when unit type is not items	2013-12-06 14:25:19 +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	4e1a1825e6	Fix incorrect prefix on track-product	2013-12-06 13:14:55 +11:00
Rohan Mitchell	b21263e1c0	Display text field for variant_unit_name	2013-12-06 12:06:16 +11:00
Rohan Mitchell	e70513b06c	Remove off-canvas class for landing page, allowing it to scroll	2013-12-06 11:47:07 +11:00
Rohan Mitchell	3adeed1fa0	Update attr name	2013-12-06 11:11:19 +11:00
Will Marshall	b806947e7b	Merge branch 'master' into darkswarm	2013-12-06 11:08:17 +11:00
Rohan Mitchell	fdc98ba24c	Convert Karma config file to v0.10 compatible format ... Conflicts: config/ng-test.conf.js	2013-12-06 11:07:32 +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	a4edacc138	Change to double quotes for spec names	2013-12-06 10:41:28 +11:00
Rohan Mitchell	d9d6d48ede	Centralise ctrl calls	2013-12-06 10:14:38 +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
Will Marshall	3cda12b8dd	Refactoring the order cycle partials	2013-12-05 16:31:12 +11:00
Will Marshall	165513fdea	Adding some feature tests for the basic products page	2013-12-05 16:30:59 +11:00
Will Marshall	3f4f5143ff	Refactoring the order cycle partials	2013-12-05 16:30:39 +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	f07fb8d533	Make variant unit fields attr_accessible	2013-12-05 15:16:52 +11:00