1764 Commits

This Branch

This Branch

All Branches

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	0bfa36056e	removing some dud Angular crud	2014-02-26 16:15:53 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Will Marshall	7708bc9f99	Patching up our shipping selection so there's always a default	2014-02-26 15:48:23 +11:00
Rohan Mitchell	adf4c0e387	Sort enterprises by name on enterprise fees admin page	2014-02-26 15:38:41 +11:00
Rohan Mitchell	f7e1befc75	Spec fees_for only sums per-item fees	2014-02-26 15:16:30 +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
Rohan Mitchell	b720a1d8f2	EnterpriseFee.clear_all_adjustments_on_order clears adjustments from per-order fees	2014-02-26 14:33:28 +11:00
Rohan Mitchell	9dec40703a	Find exchanges with any of a number of variants	2014-02-26 13:49:10 +11:00
Rohan Mitchell	5057e236a9	Find enterprise fees with per-order calculators	2014-02-26 13:48:51 +11:00
Rohan Mitchell	890af85d30	Create per-order adjustments with EnterpriseFeeApplicator	2014-02-26 13:28:05 +11:00
Rohan Mitchell	75c8da1774	Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees	2014-02-26 12:07:38 +11:00
Rohan Mitchell	febbe087e9	Find EnterpriseFees with per-item calculators	2014-02-26 10:39:39 +11:00
Rohan Mitchell	da8a8e8a1a	Rename method	2014-02-21 15:49:10 +11:00
Rohan Mitchell	08009d4020	Extract application of enterprise fees as adjustments into its own class	2014-02-21 15:48:58 +11:00
Will Marshall	6b75e8c9ef	Switching to f_form_for and :bill_address	2014-02-21 15:19:12 +11:00
Will Marshall	a162f4a108	Adding some spec tweaks	2014-02-21 15:17:18 +11:00
Will Marshall	04ac6f466c	Forcing the class of Country	2014-02-21 15:15:06 +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	97a6a812b8	Fix product listing appearing on RHS of page on Firefox	2014-02-19 13:44:31 +11:00
Rohan Mitchell	6d1a202800	Fix grammar	2014-02-19 13:32:57 +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
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	fb42724430	Remove entire field div instead of just the text field	2014-02-19 11:56:10 +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
Rohan Mitchell	b0cb19e370	Do not show master options text (eg. '1kg') when product has variants	2014-02-18 16:45:57 +11:00
Will Marshall	adb58bc059	Moving from @order to current_order to keep DRY	2014-02-18 15:07:00 +11:00
Will Marshall	6a861de1e1	Reworking the checkout form some more	2014-02-18 14:50:50 +11:00
Rohan Mitchell	4ee4ea7c60	Fix mismatch between client and server variants (ordering issue)	2014-02-18 14:02:17 +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	19e31a264d	Tidying footer contact details	2014-02-14 15:49:16 +11:00
Will Marshall	502dba1b3f	Fixing bug #281	2014-02-14 15:35:40 +11:00
Will Marshall	134d9831fe	Fixing bug #271	2014-02-14 15:34:55 +11:00
Will Marshall	e9178570e9	Committing order summary. NO TESTS YET	2014-02-14 15:18:03 +11:00
Will Marshall	09d8e19c35	DRYING UP MY VIEWS	2014-02-14 14:43:50 +11:00
Will Marshall	a6d58aa498	Partializing and adding yield blocks	2014-02-14 14:40:58 +11:00
Will Marshall	5c498735b0	Moving from new to edit	2014-02-14 14:26:31 +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	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
Will Marshall	7f58007c45	Adding some fields to Shipping Methods	2014-02-13 16:12:42 +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
Will Marshall	2425de8c98	Basic form implementation	2014-02-13 11:40:52 +11:00