1970 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	21154a9455	Convert bulk product update spec to coffeescript	2013-12-05 15:16:52 +11:00
Rohan Mitchell	cee54b4785	Convert Karma config file to v0.10 compatible format	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
Rohan Mitchell	1b63546a9e	Master variants are valid without unit value or description	2013-12-05 15:16:51 +11:00
Rohan Mitchell	4c72170742	Remove unnecessary require	2013-12-05 15:16:51 +11:00
Rohan Mitchell	0bae3e58b8	Add product units and amount fields to product and variant models, add validations	2013-12-05 15:16:51 +11:00
Will Marshall	7e9f389900	Getting the order cycles dropdown rendering correctly	2013-12-05 15:15:15 +11:00
Will Marshall	ec72e9137a	We can now hit the index page	2013-12-05 15:07:46 +11:00
Will Marshall	4543e08872	Renaming everything to Shop	2013-12-05 13:40:05 +11:00
Will Marshall	f525b7aea1	Adding the distributors controller	2013-12-04 15:58:25 +11:00
Will Marshall	720d66b379	Merge branch 'master' into ui_setup	2013-12-04 14:28:20 +11:00
Will Marshall	578651ddae	forcing SSL in staging	2013-12-04 14:26:22 +11:00
Will Marshall	9876a5f27b	Merge branch 'master' into ui_setup	2013-12-04 14:13:06 +11:00
Will Marshall	0032a806b5	Further work on Darkswarm	2013-12-04 14:12:13 +11:00