Commit Graph

541 Commits

Author SHA1 Message Date
Maikel Linke
bd19bf5f3c Refactoring filter selectors
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.

For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Maikel Linke
d5aea1b00d Taxon filter for group producers 2016-01-20 13:32:08 +11:00
Rohan Mitchell
71569324f4 Serialise cart updates - do not submit another until the previous has completed 2016-01-07 13:53:37 +11:00
Maikel Linke
261a464b50 Fixing display of shop list in group producer modal 2015-12-04 10:37:55 +11:00
Maikel Linke
0505a45de5 Invalidate I18n asset if locale changes 2015-11-05 12:47:15 +11:00
Maikel Linke
df34f6ef8e using default_locale for precompiled assets 2015-10-22 10:50:29 +11:00
Maikel Linke
5f80043857 using translate filter instead of root scope function with parameters 2015-10-09 10:21:26 +11:00
Maikel Linke
e9d1cf6eb5 using translate filter instead of root scope function 2015-10-08 18:09:11 +11:00
Maikel Linke
8b40d094ee new translate filter and updated specs for js translations 2015-10-07 15:47:51 +11:00
Maikel Linke
bd737ef727 I18n object file for karma 2015-10-01 16:38:47 +10:00
Maikel Linke
31e7ca9fa2 locale data as js asset 2015-10-01 15:54:46 +10:00
Maikel Linke
0eed8b4578 better testing of existence of I18n 2015-10-01 14:16:59 +10:00
Maikel Linke
ae96541112 Internationalisation of Javascript views 2015-10-01 11:13:45 +10: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
6a2af09006 rounding decimal quantities in shopfront 2015-09-04 16:15:02 +10:00
Maikel Linke
0895bd8647 Non-integer values cannot be entered into shop front quantities 2015-09-03 17:42:26 +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
679531fe2a Prompt for clear cart when order cycle changes 2015-07-31 16:56:08 +10:00
Rohan Mitchell
eb6dcba396 Clear localstorage in Cart.clear() 2015-07-31 16:56:08 +10:00
Rohan Mitchell
9c9051498b Rename ofnEmptiesCart to ofnChangeHub 2015-07-31 16:56:08 +10:00
Rohan Mitchell
5688cfd1dd WIP: Rename ofnEmptiesCart to ofnChangeHub 2015-07-31 16:56:08 +10:00
Rohan Mitchell
fc409c97bf Decouple ofn-empties-cart directive from hub-choice navigation 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
bf2bd403a4 Clear variants when order cycle changed, not when products are initially loaded 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
3a9b13b55e Reorder methods 2015-07-31 16:56:07 +10:00
Continuous Integration
858a613ba2 Auto-merge from CI [skip ci] 2015-07-17 11:48:16 +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
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
5b93ac2ae1 Remove unneeded injections, consistent spacing 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
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
06c5ffb427 Wrap geocode callback in ., fixing inconsistent updates 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
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
5b5c56064e Hide distance matches when there are name matches. Show with a link. 2015-07-10 17:45:16 +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
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