raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,007 Commits 21 Branches 450 Tags
8ee467d2b9d5c9911fbaf6075fa6eb565eb843d4
Commit Graph

6007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
8ee467d2b9 Split variant name into number and unit columns 2015-07-23 12:22:30 +10:00
Rohan Mitchell
5874ecbbef Small tweaks 2015-07-23 12:02:31 +10:00
Rohan Mitchell
dcae584673 Extract bulk coop supplier report into Report DSL 2015-07-23 12:02:24 +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
61a39ea82f Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator 2015-07-22 15:25:12 +10:00
Rohan Mitchell
eabf792238 Amend changes to readme 2015-07-22 13:25:55 +10:00
Myriam
c15e281286 Add command cd openfoodnetwork 
Just added the command to go into the openfoodnetwork folder before bundle install
 2015-07-19 12:39:51 +02:00
Myriam
5f0766cb75 When installing the gems we had only 1.9.2, there were an imprecision with >=1.9.3 or 1.9.x 2015-07-19 12:37:23 +02:00
Myriam
3a0c5bf0c3 I changed the "Get it" link as the git@ one was reserved to people with access rights 2015-07-19 12:09:20 +02: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
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