954 Commits

Author	SHA1	Message	Date
Rohan Mitchell	2fec16af5d	Merge branch 'master' into product-amount-units	2014-01-07 16:00:06 +11:00
Rohan Mitchell	894f86350e	Fix megalitre unit specification	2014-01-07 15:17:32 +11:00
Rohan Mitchell	042e8386ab	Refactor: Extract methods to simplify	2014-01-07 15:16:36 +11:00
Rohan Mitchell	ebae76375f	Fix specs to work with unit_value stored in base units, scale units correctly for output	2014-01-07 14:57:30 +11:00
Rohan Mitchell	5a1249e249	When value is blank, display description only	2014-01-07 12:19:48 +11:00
Rohan Mitchell	35d0bf6219	Generate option value values and units for weight, volume and items	2014-01-07 12:07:54 +11:00
Rohan Mitchell	ef6c08408b	Generate option value name - value and description	2014-01-07 10:57:58 +11:00
Rohan Mitchell	9e956ebec6	Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.	2014-01-07 10:36:19 +11:00
Rohan Mitchell	6a4c112cf2	Rename option_type_for_variant_unit to variant_unit_option_type	2014-01-07 10:31:53 +11:00
Rohan Mitchell	e443495a7e	Remove reference to deleted stylesheet	2013-12-17 12:48:44 +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
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
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	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
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	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	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	0ac9bfd898	Moving our fix for the broken Spree function into our own JS	2013-11-29 14:24:56 +11:00