37 Commits

Author	SHA1	Message	Date
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Rohan Mitchell	3f8d470d23	When admin associates user with an order, look up last used address	2015-12-11 13:06:59 +11:00
Rohan Mitchell	ae3061df80	All orders specs use JS	2015-12-11 13:06:59 +11:00
Rohan Mitchell	e33ede0ec2	Include order cycle status in new order form	2015-12-11 13:06:58 +11:00
Rohan Mitchell	76d4fbccf9	Use select2 for order cycle selection	2015-12-11 13:06:58 +11:00
Rohan Mitchell	222b390b31	Fix error display	2015-12-11 13:06:57 +11:00
Rohan Mitchell	3419198635	Disable distributors that do not have an order cycle	2015-12-11 13:06:57 +11:00
Rohan Mitchell	1026b81d0c	Do not show order cycle choice until distributor is chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	c74463404d	Only show order cycle options that include the chosen distributor	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2081744cf6	Fix spec	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2daceb1111	Angularise new order form	2015-12-11 13:06:57 +11:00
Rohan Mitchell	e20d8d3e95	Merge branch 'master' into folklabs-producer-emails	2015-11-11 14:20:25 +11:00
Rohan Mitchell	8e1bade355	Move adjustment specs to their own spec file	2015-11-11 11:53:04 +11:00
Rohan Mitchell	5a29311137	Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax	2015-11-11 11:53:04 +11:00
Rohan Mitchell	81a6e07d5c	Admin can remove tax on an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	727ecae62b	Admin can modify a taxed adjustment on an order	2015-11-11 11:53:04 +11:00
Rohan Mitchell	83c0093665	Admin can include tax when creating an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	94e1264aef	Add rspec-retry for inconsistently failing spec	2015-10-29 16:01:39 +11:00
Maikel Linke	e25805aa78	Restoring all changes of the last combined branch ... This reverts commit 1e55e8a907.	2015-09-10 15:03:13 +10:00
Maikel Linke	1e55e8a907	Reverting all changes of the last combined branch ... The production server hangs on certain requests. To rule out a code bug, we revert to the last deployed version.	2015-09-10 12:50:40 +10:00
Maikel Linke	47d239ee3a	fix for intermittent capybara click failure ... This fix might have to be applied at more places. We will see what CI says...	2015-09-09 17:08:42 +10:00
Rohan Mitchell	af04c61528	Add rspec-retry for intermittently failing spec	2015-08-05 13:35:53 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rohan Mitchell	8c2adb2a05	Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue	2014-11-01 12:11:50 +11:00
Rob Harrington	ed91cd6463	Make sure d1 != d2	2014-09-24 20:48:52 +10:00
Rob Harrington	544e6e074a	Stop being lazy	2014-09-19 14:38:59 +10:00
Rob Harrington	22e61d9834	TEMP: spit out variables in failing oc spec	2014-09-16 23:47:34 +10:00
Rob H	143545da0d	Try newer syntax to fix spec failing on CI	2014-09-12 23:41:26 +10:00
Rohan Mitchell	2660ffd459	Fix duplicate enterprise role	2014-08-16 16:33:07 +10:00
Rohan Mitchell	75a59eb5cc	Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.	2014-07-16 11:26:22 +10:00
Rohan Mitchell	6dfd26ac69	order_with_totals_and_distribut{or,ion}	2014-07-16 10:33:23 +10:00
Rob H	3bf36f0e55	Fix orders specs which fail because of new admin orders submenu	2014-01-30 14:06:32 +08:00
Rohan Mitchell	6a5d819fa6	Enterprise manager can create an order	2013-08-27 10:05:55 +10:00
Rohan Mitchell	4f8014306e	Admin can't change distributor or order cycle once order has been finalized	2013-08-23 14:00:31 +10:00
Rohan Mitchell	2cab83cb29	Admin create order can set distributor and order cycle	2013-08-23 14:00:31 +10:00
Rohan Mitchell	7ea1122833	Make spec naming consistent	2013-08-12 10:13:31 +10:00