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
|
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 |
|
Rohan Mitchell
|
d0d9e9e367
|
Flag enterprises whose name matches a query
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
befcc37456
|
Fix bug in distanceBetween, update docs, deal with null queries
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
9fb7c47c73
|
Enterprises can calculate their distances from a location via geocode lookup
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
197c99349d
|
Add error checking to client-side permalink service
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
73b90dba10
|
Shift legacy redirect further down routes to avoid stomping /enterprises/check_permalink
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
8deb4ef9d4
|
When encountering StaleObjectError when checking out, retry
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
d0b7a0795d
|
Fix 500 when bulk updating order cycles with no data
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
3f8235593a
|
When enterprise is deleted, delete relationships
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
c5c3051f98
|
Re-enable future spec
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
4f2389e257
|
Remove legacy enterprises views - index, suppliers, distributors, show
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
d9f4a92648
|
Do not use with_products_require_tax_category in around filters - Spree::Config has caching which isn't shared between contexts
|
2015-06-24 14:52:17 +10:00 |
|
Rohan Mitchell
|
bc11140a40
|
Make config reset for all tests more robust. Add cache isolation for parallel specs.
|
2015-06-24 14:02:45 +10:00 |
|
Rohan Mitchell
|
7a36e92592
|
Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes_optimise-shopfront
|
2015-06-24 10:09:35 +10:00 |
|
Rohan Mitchell
|
2d79177bb5
|
When a registering an enterprise with a non-unique name, display an error message.
|
2015-06-24 10:08:34 +10:00 |
|
Rohan Mitchell
|
f51a9679f2
|
Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
|
2015-06-19 11:34:41 +10:00 |
|
Rohan Mitchell
|
89a571d497
|
Fix spec coupled to variant overrides
|
2015-06-18 16:05:35 +10:00 |
|
Rohan Mitchell
|
ff4ee16f06
|
Fix currency issues, changed logo path
|
2015-06-18 15:38:46 +10:00 |
|
Rohan Mitchell
|
aa0a031fa0
|
Fetch indexed variant overrides in one go
|
2015-06-18 15:03:24 +10:00 |
|
Rohan Mitchell
|
dd2f6d6430
|
Extract VariantOverride fetching into ScopeVariantToHub#scope
|
2015-06-18 14:45:40 +10:00 |
|
Rohan Mitchell
|
7cc2bc4fde
|
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
|
2015-06-18 13:11:11 +10:00 |
|
Rohan Mitchell
|
6ed9a2620c
|
Use indexed_fees_for for product price
|
2015-06-18 13:07:52 +10:00 |
|
Rohan Mitchell
|
c5526c78d9
|
Make enterprise name unique
|
2015-06-17 15:01:46 +10:00 |
|
Rohan Mitchell
|
faee88c404
|
Merge branch 'master' into redesign
|
2015-06-16 16:57:09 +10:00 |
|
Rohan Mitchell
|
387021929e
|
Merge branch 'master' into rob-github-fixes
|
2015-06-16 15:05:01 +10:00 |
|
Continuous Integration
|
c76021462c
|
Auto-merge from CI [skip ci]
|
2015-06-16 14:12:16 +10:00 |
|
Rob Harrington
|
30af5d4278
|
Enterprise relatives include self where appropriate for serialized injection data
|
2015-06-15 19:45:29 +08:00 |
|
Maikel Linke
|
de1971072e
|
update relationship js spec
|
2015-06-12 17:09:04 +10:00 |
|
Rob Harrington
|
795b2700b4
|
Merge branch 'master' into enterprise-index-revamp
|
2015-06-12 12:47:58 +08:00 |
|
Rohan Mitchell
|
2b763271a7
|
Merge branch 'master' into optimise-shopfront
|
2015-06-12 12:15:20 +10:00 |
|
Rohan Mitchell
|
4f311543ae
|
Merge branch 'master' into enterprise-index-revamp
|
2015-06-12 10:26:11 +10:00 |
|
Rob Harrington
|
eed27ceb31
|
Shipping Method feature specs work with new enteprise user enterprise index
|
2015-06-12 03:10:50 +08:00 |
|