930 Commits

Author	SHA1	Message	Date
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
Will Marshall	0cfc0efe32	Overriding the broken _destroy partial so failure to destroy is shown as intended	2013-11-29 12:32:47 +11:00
Will Marshall	13e991d02d	Changing favicon	2013-11-28 16:52:54 +11:00
Will Marshall	7784a6ef44	Adding a default value of NOW to available_on on Products	2013-11-28 16:41:46 +11:00
Will Marshall	dec33ebda4	Fixing the HTML in the admin section	2013-11-28 16:13:13 +11:00
Will Marshall	69459847ca	Fixing some responsiveness issues on the home page	2013-11-28 15:42:00 +11:00
Will Marshall	7742fdc27a	Adding a better homepage login function	2013-11-28 15:01:57 +11:00
Will Marshall	7bc754a598	Adding filtering to the products page	2013-11-28 13:44:21 +11:00
Will Marshall	d39cb74d06	Merge branch 'customers'	2013-11-22 16:55:11 +11:00
Will Marshall	27f99d1383	Working version of Customers reports without filters	2013-11-22 16:53:57 +11:00
Will Marshall	fbe0e2cc29	Basic plumbing for the Customers in place	2013-11-22 16:22:44 +11:00
Will Marshall	b3bf3a8378	Adding the plumbing for Customers reports, and one tiny refactor to products	2013-11-22 14:56:57 +11:00
Rohan Mitchell	4898460132	Fix failing spec with table reorder, lambda-fy scopes that use time	2013-11-22 14:00:04 +11:00
Rohan Mitchell	94c33e5f45	Colour order cycle rows based on their status	2013-11-22 11:31:04 +11:00
Rohan Mitchell	459b2c1050	Add #upcoming? and #open? to OrderCycle	2013-11-22 11:15:12 +11:00
Rohan Mitchell	3a2394675f	Rename OrderCycle#expired? to #closed?	2013-11-22 11:08:42 +11:00
Rohan Mitchell	5ad63d08f3	Add some more open/close time scopes to order cycles	2013-11-22 10:57:33 +11:00
Rohan Mitchell	f75879bec1	Put order cycle variants in a tooltip	2013-11-22 10:03:49 +11:00
Will Marshall	c695bafe69	Reworking the way the Reports works so we have more granular control over what shows	2013-11-21 16:45:59 +11:00
Rohan Mitchell	b101a37dad	Rearrange columns	2013-11-21 14:42:28 +11:00
Rohan Mitchell	dfcf567f26	Sort payment methods by name	2013-11-21 14:42:28 +11:00
Will Marshall	612a80ec15	A little refactoring, some comment removal	2013-11-21 14:28:23 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00
Will Marshall	6a11b2685f	Controller plumbing for Product & Inventory report	2013-11-20 13:58:01 +11:00
Will Marshall	5772fa9589	Boilerplate for the new Product and Inventory report, sans any functionality	2013-11-20 10:34:18 +11:00