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
|
dc95167f15
|
Adding bits missed from the last commit.
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
|
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
|
28b8e0b0c8
|
Update distance matches when filter settings change
|
2015-07-10 17:45:17 +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
|
669c9911fe
|
Fix profile display
|
2015-07-10 17:45:17 +10:00 |
|
Rohan Mitchell
|
6e6d2566d9
|
Do not show distance when zero
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
6816df5f72
|
Do not show 'Closest to...' heading when no query entered
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
5b93ac2ae1
|
Remove unneeded injections, consistent spacing
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
dcf98ee29f
|
Fix enterprises no results for producers
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
7d340d5084
|
Update taxon search to only display taxons from enterprises on the page
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
0eb6d9aaed
|
Disable animate-repeat on shops listing entirely - previous fix was not 100% successful
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
d8dfb5b5ee
|
Move most filters back out into view - they now respond to filter preference changes
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
07e6a204f3
|
Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes.
https://github.com/angular/angular.js/issues/4490
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
06c5ffb427
|
Wrap geocode callback in ., fixing inconsistent updates
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
673635fdcb
|
Show no results message at correct times
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
64bc7404dc
|
Region-bias geocoder results
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
651afc34cb
|
Notify enterprise change by broadcast
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
e5c42c0e54
|
Tidyup
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
5f8826533d
|
Limit distance matches to those within 50 km
|
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
|
46792a4111
|
Style results tables
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
5b5c56064e
|
Hide distance matches when there are name matches. Show with a link.
|
2015-07-10 17:45:16 +10:00 |
|
Rohan Mitchell
|
794c9558bb
|
Show name matches only when at least one is present. Show accurate closest-to target.
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
eba0a12d29
|
Extract filtering into controller
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
7fd4815904
|
Split results into name matches and distance matches
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
97c9504344
|
Extract hubs table into partial
|
2015-07-10 17:45:15 +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
|
6e3ca3f90f
|
Make Geo.distanceBetween take either a LatLng or a locatable at either parameter
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
744beaa26a
|
Perform shops search by proximity instead of plain string match
|
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
|
80bb6c36e3
|
Rename file
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
a61e96c316
|
Generalise Geocoder service to Geo, add distanceBetween method
|
2015-07-10 17:45:15 +10:00 |
|
Rohan Mitchell
|
ddf1bb90ea
|
Add geocoder service
|
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
|
4cc8eb90fc
|
Refactor code for brevity
|
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
|
d67b34c2bd
|
Remove deprecated about_us page and add redirect
|
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 |
|