1793 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +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	8b840388c8	Merge branch 'master' into checkout	2014-03-04 15:25:42 +11:00
Will Marshall	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	74238b111e	Fixing the order spec	2014-02-28 15:19:57 +11:00
Rohan Mitchell	6934cf236f	Update Rails	2014-02-28 14:34:14 +11:00
Will Marshall	4087d08e8e	Removing a save and open page call	2014-02-28 13:53:58 +11:00
Will Marshall	1d5addb06e	Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses	2014-02-28 13:41:02 +11:00
Will Marshall	86a8b926f3	Adding conditions to the autopopulator for shipping address	2014-02-28 11:53:45 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Will Marshall	6e05bd63c6	Pending a test that currently breaks	2014-02-27 16:29:03 +11:00
Will Marshall	d6c71d5416	Fixing a nil bug in the referrer handling on login	2014-02-27 16:24:10 +11:00
Will Marshall	4a6c00e592	Removing bangs from stub since it's totes deprecated	2014-02-27 16:15:42 +11:00
Will Marshall	d7921462eb	Removing save and open page call	2014-02-27 16:15:13 +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	19fa7200f3	Fixing the login redirection issue	2014-02-27 14:47:56 +11:00
Will Marshall	91a8e1c071	Fixing a Javascript bug	2014-02-27 14:47:33 +11:00
Will Marshall	18f92fbff5	Fixing a nil.id bug	2014-02-27 14:04:04 +11:00
Will Marshall	e92d21ec4e	Patching a scoping bug that broke ALL the tests	2014-02-27 11:44:36 +11:00
Rohan Mitchell	8bb742b3f2	Alphabetise suppliers when adding new product	2014-02-27 11:33:02 +11:00
Rohan Mitchell	3196e28d88	Admin can assign units to a product	2014-02-27 11:29:39 +11:00
Rohan Mitchell	353d2a4d9c	Do not error when creating variant for product without non-unit option type	2014-02-27 11:28:07 +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
Rob H	41c61b3b12	BOM date filters work	2014-02-22 15:51:14 +11:00
Rob H	1f569e4be1	Add loading splash to BOM	2014-02-22 14:49:19 +11:00
Rob H	83e228dc63	Display message when no matching orders found for BOM	2014-02-22 11:48:24 +11:00
Rob H	1b10bf53c0	WIP: BOM loads with orders filtered by default date restrictions	2014-02-22 11:33:36 +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
Rob H	5ec7a10e16	Add date filter fields to BOM	2014-02-21 14:01:33 +11:00
Rohan Mitchell	97a6a812b8	Fix product listing appearing on RHS of page on Firefox	2014-02-19 13:44:31 +11:00