277 Commits

Author	SHA1	Message	Date
Will Marshall	82c29683d6	Disabling enter on the search	2014-03-19 11:06:18 +11:00
Will Marshall	a8547a9e64	Adjustments toggling	2014-03-19 10:45:40 +11:00
Will Marshall	96ce982ea3	Reworking the checkout into Darkswarm, patching up tests	2014-03-18 15:58:22 +11:00
Will Marshall	c01b198f95	Minor tweaks	2014-03-14 15:34:18 +11:00
Will Marshall	f1f501c7ee	Getting the total price into Javascript as well	2014-03-14 13:15:42 +11:00
Will Marshall	fc4f108724	Adding tests and views to handle changing shipping prices	2014-03-14 12:59:37 +11:00
Will Marshall	1ba720481f	Finally fixing the same as billing address checkbox?	2014-03-13 11:41:46 +11:00
Will Marshall	7c50e1a41d	Fixing up the specs	2014-03-12 17:17:07 +11:00
Will Marshall	a1ed951931	Default shipping address same as billing address, rendering data panel for pickup info	2014-03-12 15:08:59 +11:00
Will Marshall	3ec80aaaa3	Styling improvements to the popups for producers	2014-03-12 15:08:59 +11:00
Rohan Mitchell	4d8a23346c	Fix bug: Unselecting product variant unit in BPE doesn't save	2014-03-12 12:35:52 +11:00
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	904a25fd18	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-06 16:48:30 +11:00
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Rohan Mitchell	922d817748	Product list view: For product with variants, show product price as min(variant prices)	2014-03-05 16:16:42 +11:00
Will Marshall	7d0fdead7a	Refactoring the way we default shipping_method_id	2014-03-05 15:49:47 +11:00
Will Marshall	3c108d3366	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-05 15:31:41 +11:00
Will Marshall	19350eeade	Adding the 'same as billing address' JS	2014-03-05 12:29:49 +11:00
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +11:00
Will Marshall	4daeac0b14	Removing JMigrate warnings	2014-02-27 16:15:06 +11:00
Will Marshall	c1cdf3e331	Removing some dud debugging stuff, fiddling with the checkout spec	2014-02-27 16:11:17 +11:00
Will Marshall	91a8e1c071	Fixing a Javascript bug	2014-02-27 14:47:33 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Rob H	1f569e4be1	Add loading splash to BOM	2014-02-22 14:49:19 +11:00
Rob H	1b10bf53c0	WIP: BOM loads with orders filtered by default date restrictions	2014-02-22 11:33:36 +11:00
Rob H	5ec7a10e16	Add date filter fields to BOM	2014-02-21 14:01:33 +11:00
Rohan Mitchell	f88b930137	Extract unit_value_with_description into unit_description only when a string starting with a number is provided	2014-02-19 13:32:17 +11:00
Will Marshall	6a861de1e1	Reworking the checkout form some more	2014-02-18 14:50:50 +11:00
Will Marshall	ece7caa14a	Moving Darkswarm to new Angular version	2014-02-18 14:00:23 +11:00
Will Marshall	3024007bd3	Reworking our page structure to work better with Angular controllers	2014-02-18 13:51:39 +11:00
Rohan Mitchell	547f46fbc9	Deal with unit_value of zero correctly - do not treat as nil	2014-02-18 10:32:36 +11:00
Will Marshall	3c696b6762	Adding payment method switching	2014-02-14 13:30:28 +11:00
Will Marshall	4704e927e3	Form toggling! Fuck yeah	2014-02-14 11:31:27 +11:00
Will Marshall	25916caeb4	Starting on Angular models for Checkout, pretties	2014-02-13 16:14:11 +11:00
Rohan Mitchell	701896be95	BPE: Add variant and save it to server. Edit the saved variant.	2014-02-13 11:52:44 +11:00
Rohan Mitchell	4d24fec6fb	BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants.	2014-02-13 09:26:07 +11:00
Rohan Mitchell	4aa43cfbe0	Set the master unit value for a product without variants	2014-02-12 13:57:49 +11:00
Rohan Mitchell	b2ad6c7d57	Filter products for submit includes master variant	2014-02-11 19:23:27 +11:00
Rohan Mitchell	e845c0dc06	Remove derived attributes from master variant	2014-02-11 19:20:46 +11:00
Rohan Mitchell	0b255ed1e9	Pack the master variant before sending to the server	2014-02-11 19:19:12 +11:00
Rohan Mitchell	c7c70252d0	ofnTrackProduct and ofnTrackVariant accept nested properties as arguments	2014-02-11 19:13:11 +11:00
Rob H	17456ebf2e	BOM: only fetch completed orders	2014-02-07 15:29:31 +11:00
Will Marshall	cec0ad8a83	Adding ze boilerplate	2014-02-07 13:55:25 +11:00
Rohan Mitchell	33691085bd	Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity.	2014-02-06 13:51:08 +11:00
Rob H	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Rob H	58d1bf0092	BOM: can update quantities of line_items	2014-01-31 11:57:57 +08:00
Rob H	d679c7ac30	BOM dataSubmitter service changes class of relevant element based on response	2014-01-31 11:38:38 +08:00