369 Commits

Author	SHA1	Message	Date
Will Marshall	e92d21ec4e	Patching a scoping bug that broke ALL the tests	2014-02-27 11:44:36 +11:00
Will Marshall	85606b2a0d	Merge branch 'master' into checkout	2014-02-27 10:41:39 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Will Marshall	f5a3167fac	Patching up the form and update to get form submission working	2014-02-26 15:12:35 +11:00
Rohan Mitchell	11fb6c96a1	Charge per-order fees on orders exactly once	2014-02-26 14:34:30 +11:00
Will Marshall	a162f4a108	Adding some spec tweaks	2014-02-21 15:17:18 +11:00
Will Marshall	b6b5c2889e	Reworking checkout to use f_form_for, show validation, better controller layout	2014-02-21 14:31:03 +11:00
Rohan Mitchell	6d1a202800	Fix grammar	2014-02-19 13:32:57 +11:00
Rohan Mitchell	acbf1ed680	Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI	2014-02-19 13:12:52 +11:00
Rohan Mitchell	3f9f24157c	Do not show unit value or description when product does not have a unit-related option type	2014-02-19 12:07:53 +11:00
Rohan Mitchell	3024bbbeb5	Edit unit value and description of variant	2014-02-19 11:56:37 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Will Marshall	adb58bc059	Moving from @order to current_order to keep DRY	2014-02-18 15:07:00 +11:00
Will Marshall	3024007bd3	Reworking our page structure to work better with Angular controllers	2014-02-18 13:51:39 +11:00
Will Marshall	a722320ece	Patching up the tests for new content	2014-02-14 13:43:23 +11:00
Will Marshall	3c696b6762	Adding payment method switching	2014-02-14 13:30:28 +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
Will Marshall	871637c4af	NO CAN HAZ EMPTY CART PAGE	2014-02-12 12:31:37 +11:00
Will Marshall	b11533a629	Renaming ShopController to Shop::ShopController	2014-02-07 16:52:18 +11:00
Will Marshall	7af1d72ef9	Working login and signup forms for checkout, specs, redirect back to checkout on success	2014-02-07 16:07:18 +11:00
Will Marshall	63f85fef0e	Starting to get in the login stuff	2014-02-07 14:34:49 +11:00
Will Marshall	cec0ad8a83	Adding ze boilerplate	2014-02-07 13:55:25 +11:00
Will Marshall	b1118735ec	One CSS change, adding a test for le price adjustments	2014-02-07 11:09:47 +11:00
Will Marshall	2bb004ebaa	Adding notes field to products	2014-02-04 14:11:32 +11:00
Will Marshall	934f1eb196	Re-arranging product page into partials, redoing price display	2014-02-04 11:24:27 +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	3beb633ed9	BOM: 'update-pending' class removed when value is init value	2014-01-31 11:24:14 +08:00
Rob H	7dbb7a5c2c	BOM: applying ofnLineItemUpdAttr directive to quantity field, tracks changes with update-pending class	2014-01-31 11:17:27 +08:00
Rob H	a5ffdbb1ba	Display quantity in field for BOM	2014-01-31 10:48:28 +08:00
Rob H	3bf36f0e55	Fix orders specs which fail because of new admin orders submenu	2014-01-30 14:06:32 +08:00
Will Marshall	c270473c93	Patching up the shopping spec	2014-01-22 14:36:31 +11:00
Will Marshall	803f653d39	Cleaning up handling of the page when no order cycle is selected	2014-01-22 14:25:41 +11:00
Will Marshall	7737a5da1d	Patching some regressed tests, getting in some responsive layout	2014-01-22 13:38:07 +11:00
Will Marshall	17c6321c8b	Adding some basic collapse/expand for variants in Shop	2014-01-22 11:55:57 +11:00
Rohan Mitchell	6d2f77b308	Fix report spec	2014-01-22 10:16:45 +11:00
Will Marshall	8879181a27	Adding promo image to about panel	2014-01-21 16:56:00 +11:00
Will Marshall	aec5894c70	Adding a promo image to enterprises	2014-01-21 16:32:55 +11:00
Will Marshall	8cc18e8db4	Fixing the shopping spec to conform to the new format of dates	2014-01-21 15:42:11 +11:00
Rob H	b9a3031663	Line item delete button works	2014-01-19 21:46:11 +08:00
Rob H	02f8917722	Add delete button to BOM page	2014-01-18 21:00:54 +08:00
Rob H	701b5aceb4	Add 'All' option to supplier and distributor filters	2014-01-18 14:26:07 +08:00
Rob H	79631ebb8e	Add distributor filter to BOM	2014-01-18 12:48:52 +08:00
Rob H	680b5c8a42	Add supplier filter to BOM	2014-01-18 11:13:32 +08:00
Rob H	6c1d149397	Add columns for quantity and max to BOM	2014-01-17 18:26:30 +08:00
Rob H	0e861d98af	Add column for variant description to BOM	2014-01-17 17:32:29 +08:00
Rob H	d6b4f8129c	Match supplier of each line item with the list fetched from server	2014-01-17 17:14:05 +08:00