15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	e6c7acdff3	Add soft-delete method to variant	2014-06-12 14:59:26 +10:00
Rob H	4e98ee6e56	Remove sidebar from admin edit shipping methods	2014-06-12 14:48:36 +10:00
summerscope	8acbfba873	Change z index of icon so it sits behind fixed menu at top	2014-06-12 13:03:39 +10:00
Will Marshall	901cde73df	Adding not-null constraint	2014-06-12 12:58:40 +10:00
Rob H	be6a043aac	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-12 12:58:40 +10:00
Rob H	0b1b260527	Adding dynamic text to display as placeholder	2014-06-12 12:58:39 +10:00
Rob H	7782745663	Add fields for variant display name and display as to bpe	2014-06-12 12:58:39 +10:00
Rob H	fa567ac607	Change variant name to display name	2014-06-12 12:58:10 +10:00
Rob H	9f681bd1ef	Use display_as as option value for variant when it is present	2014-06-12 12:57:56 +10:00
Rob H	721aeea130	OptionValueNamer spec refactor	2014-06-12 12:57:20 +10:00
Rob H	248c38fd2c	Adding name and display_as fields to variants	2014-06-12 12:56:44 +10:00
Rob H	1a91b5a728	Move option value naming logic into separate lib class	2014-06-12 12:55:53 +10:00
Rob H	3b1411283a	Merge branch 'master' into units	2014-06-12 12:13:44 +10:00
summerscope	176735544b	Changing class name to remove ofn- from naming convention which call the icon font styling	2014-06-12 12:12:25 +10:00
Rob H	c09aeeee8f	Recalculate option values on variants when product variant unit is changed	2014-06-12 12:11:20 +10:00
Will Marshall	349ba112d0	Fixing map issues, adding a nice pretty loader	2014-06-12 11:50:28 +10:00
Will Marshall	48e2c3512f	Patching a minor bug in cart emptying	2014-06-12 11:49:55 +10:00
Rohan Mitchell	4e6f07de8a	WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times	2014-06-12 11:49:55 +10:00
Rob H	c2109026ca	Add js spec for option value namer	2014-06-12 11:49:55 +10:00
Rohan Mitchell	71020a14ef	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-12 11:49:54 +10:00
Rob H	d9a5b02415	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-12 11:49:54 +10:00
Rohan Mitchell	908f7871bb	Orders and fulfilment report handles order cycles with nil opening or closing times	2014-06-12 11:49:54 +10:00
Rob H	5f8ed01475	Adding dynamic text to display as placeholder	2014-06-12 11:49:54 +10:00
Rob H	f688461e84	Add fields for variant display name and display as to bpe	2014-06-12 11:49:53 +10:00
Rob H	970b5f3061	Change variant name to display name	2014-06-12 11:49:53 +10:00
Rob H	2c78d537fa	Use display_as as option value for variant when it is present	2014-06-12 11:49:52 +10:00
Rob H	227c10288d	OptionValueNamer spec refactor	2014-06-12 11:49:52 +10:00
Rob H	c915c5fe78	Adding name and display_as fields to variants	2014-06-12 11:49:52 +10:00
Rob H	e9f2a8f2cd	Move option value naming logic into separate lib class	2014-06-12 11:49:52 +10:00
Rob H	c21342b82e	Adding all fields to new admin product spec	2014-06-12 11:49:51 +10:00
summerscope	860360d81e	Change map container name to remove ofn- which refers to icon font styling	2014-06-12 11:34:01 +10:00
Rohan Mitchell	a6e3dd65fe	WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times	2014-06-11 20:39:34 +10:00
Rob H	4d01b55963	Merge branch 'master' into units	2014-06-11 14:21:23 +10:00
Rob H	d8f1153817	Add js spec for option value namer	2014-06-11 14:21:13 +10:00
Rohan Mitchell	177e03eae2	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-11 13:19:14 +10:00
Rob H	8e960c817a	Merge branch 'master' into units	2014-06-11 12:43:40 +10:00
Rob H	44f4ee822c	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-11 12:41:51 +10:00
Rohan Mitchell	12809438ac	Orders and fulfilment report handles order cycles with nil opening or closing times	2014-06-11 10:33:59 +10:00
Will Marshall	82da4d3911	Fixing the taxon icons to support le svgs	2014-06-10 15:52:27 +10:00
Will Marshall	74b3c026d2	Merging in maps	2014-06-10 14:54:12 +10:00
Will Marshall	75f1bf4f54	Merging in master	2014-06-10 14:53:49 +10:00
Will Marshall	373f698676	Adding loading infrastructure	2014-06-10 14:52:27 +10:00
Will Marshall	94b7601d73	Patching authorization tests	2014-06-10 14:01:25 +10:00
Will Marshall	21b6e91913	Moving OFN flash to fixed block	2014-06-10 12:29:31 +10:00
Will Marshall	e806ffdd1a	Merge branch 'maps'	2014-06-10 11:17:14 +10:00
Will Marshall	4d7fa8b1bf	Removing payments when emptying order	2014-06-10 11:15:04 +10:00
Will Marshall	dbf4f503a9	Restoring my clever flash refactoring	2014-06-10 11:14:52 +10:00
Will Marshall	c07809d328	Rescoping the accordion as well	2014-06-10 11:14:52 +10:00
Rohan Mitchell	dc60409c85	Move paid column next to order totals	2014-06-10 10:31:53 +10:00
Will Marshall	c8520cedbb	Fixing another merge issue	2014-06-06 17:26:58 +10:00