2477 Commits

Author	SHA1	Message	Date
Maikel Linke	415dac3ae3	Updating spec for new Login label	2015-08-28 21:12:56 +10:00
Maikel Linke	8b6f5b4a99	Updating spec for new Login label	2015-08-28 18:37:24 +10:00
Maikel Linke	ced254919a	Updating JS spec	2015-08-27 14:54:46 +10:00
Maikel Linke	adc20e9e4e	Handling tax categories without tax rates	2015-08-21 15:16:00 +10:00
Continuous Integration	03627e2ef2	Auto-merge from CI [skip ci]	2015-08-21 13:41:02 +10:00
Rohan Mitchell	3e5028b6b9	Revise lettuceshare report - combine grower and cert cols, add column headings	2015-08-16 11:06:52 +08:00
Rohan Mitchell	170799f65f	Add permission for hub enterprise users to use xero report #628	2015-08-07 13:37:37 +10:00
Rohan Mitchell	3eea002a0c	Put rspec-retry on flaky specs	2015-08-07 11:06:16 +10:00
Rohan Mitchell	6f4dc6943e	Add first cut of LettuceShare report	2015-08-07 10:37:59 +10:00
Rohan Mitchell	af04c61528	Add rspec-retry for intermittently failing spec	2015-08-05 13:35:53 +10:00
Continuous Integration	14900655df	Auto-merge from CI [skip ci]	2015-08-05 12:18:31 +10:00
Rohan Mitchell	be66769999	SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.	2015-08-05 11:05:29 +10:00
Rohan Mitchell	eca25a2564	Make coordinator fees apply to all variants, not just those with exchange fees	2015-07-31 16:57:47 +10:00
Rohan Mitchell	faa1d0d1c5	When cart clear is declined, revert order cycle selection change	2015-07-31 16:56:08 +10:00
Rohan Mitchell	b97bbae00e	Remove old selenium-related test helper, remove unused param on handle_js_confirm	2015-07-31 16:56:08 +10:00
Rohan Mitchell	09b4b3e659	When order cycle is changed, clear the cart	2015-07-31 16:56:08 +10:00
Rohan Mitchell	012a210782	Add method to clear cart	2015-07-31 16:56:08 +10:00
Rohan Mitchell	7caebb11e2	Clear variants registry before reloading products - fixes fees not updating when changing order cycle	2015-07-31 16:56:08 +10:00
Rohan Mitchell	ee65452de3	Add method to clear variants registry	2015-07-31 16:56:08 +10:00
Rohan Mitchell	734b2fc766	Merge branch 'master' into redesign-cms	2015-07-31 14:59:33 +10:00
Rohan Mitchell	5559231245	Fix date spec error	2015-07-31 14:59:05 +10:00
Continuous Integration	8d041f5e7a	Auto-merge from CI [skip ci]	2015-07-29 12:03:03 +10:00
Continuous Integration	32d3d0f912	Auto-merge from CI [skip ci]	2015-07-28 14:03:29 +10:00
Rohan Mitchell	9ffc97f8b6	Fix controller spec for extraction of report controller logic	2015-07-24 14:10:04 +10:00
Rohan Mitchell	fffc35d9ed	Revert "Add a blank row after summary row in all reports" ... This reverts commit b0dd765181.	2015-07-24 12:40:42 +10:00
Rohan Mitchell	b0dd765181	Add a blank row after summary row in all reports	2015-07-23 14:05:59 +10:00
Rohan Mitchell	a90666467a	Add helper support to Reports DSL	2015-07-23 11:45:19 +10:00
Rohan Mitchell	cc9d0defca	Use class attributes instead of class variables to avoid leakage between subclasses	2015-07-23 11:04:36 +10:00
Rohan Mitchell	142e1d6d9a	Report outputs rules as array for use by OrderGrouper	2015-07-23 10:46:20 +10:00
Rohan Mitchell	1d39fb4438	Report rules can define a summary row	2015-07-23 10:37:47 +10:00
Rohan Mitchell	07eb857a8d	Report can define nested rules	2015-07-23 10:24:10 +10:00
Rohan Mitchell	66f64fc413	Report can define basic rules	2015-07-23 10:08:38 +10:00
Rohan Mitchell	c7a1ca29f4	Report can define and retrieve columns	2015-07-23 09:52:59 +10:00
Rohan Mitchell	0a5e8fe629	Report class can define and retrieve header	2015-07-23 09:36:09 +10:00
Rohan Mitchell	e4a4cdd915	Rewrite alias_method_chain to use super. Ahhhhh :)	2015-07-17 16:06:50 +10:00
Rohan Mitchell	66b4eb4c5d	Move Spree::Preferences::Configuration patches into superclass FileConfiguration	2015-07-17 16:06:50 +10:00
Rohan Mitchell	0e67a116b6	Admin can upload logo for ContentConfig	2015-07-17 16:06:49 +10:00
Rohan Mitchell	1234b35199	Add file handling to Spree::Preferences::Configuration	2015-07-17 16:06:49 +10:00
Continuous Integration	858a613ba2	Auto-merge from CI [skip ci]	2015-07-17 11:48:16 +10:00
Rohan Mitchell	2ef0196200	Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness	2015-07-16 10:06:34 +10:00
Rohan Mitchell	f3ae812f2b	Update cart when max_quantity value changes, not just quantity	2015-07-16 10:05:19 +10:00
Rohan Mitchell	904a3a5bd4	When add to cart fails, retry every 3 seconds, with no limit of the number of retries	2015-07-16 10:05:19 +10:00
Rohan Mitchell	de7f3a9e5c	When an on-demand variant has overridden stock levels, make it not on-demand	2015-07-16 10:05:07 +10:00
Rohan Mitchell	7424e93133	Merge branch 'proximity-search'	2015-07-15 17:31:22 +10:00
Lynne Davis	f21f57a42c	Additions for packing reports, sans refactoring	2015-07-15 14:44:49 +10:00
Lynne Davis	c168dec14b	Adding packing reports as required by the UK contingent	2015-07-15 14:44:49 +10:00
Rohan Mitchell	0ab75fe2ea	Take the first name match from the post-filter results to avoid matching off a result the user can't see	2015-07-10 17:45:17 +10:00
Rohan Mitchell	e5c42c0e54	Tidyup	2015-07-10 17:45:16 +10:00
Rohan Mitchell	f154a02c86	Add filter for enterprises within a radius	2015-07-10 17:45:16 +10:00
Rohan Mitchell	7f2508eeaa	When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup	2015-07-10 17:45:15 +10:00